diff --git a/software/diag/clrchxpcr.py b/software/diag/clrchxpcr.py index 27affc4444bdfcda105266abf1a6b380aece53fc..792e85b6b753dbafb7a8f729a611416645319efb 100755 --- a/software/diag/clrchxpcr.py +++ b/software/diag/clrchxpcr.py @@ -29,6 +29,7 @@ #=============================================================================== # last changes: # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -50,28 +51,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/clrerr.py b/software/diag/clrerr.py index 15423a0a5b4de4033011a44d2feec3f7ff8981f0..b35e1f719b963ee7933f942cc4bcea64ac11b137 100755 --- a/software/diag/clrerr.py +++ b/software/diag/clrerr.py @@ -36,6 +36,7 @@ # 2014-05-02 Theodor Stana File created # 2017-02-02 M. Suminski Updated mem map to match v4 gateware, # renamed from setsr.py to seterr.py +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -57,28 +58,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/getsr.py b/software/diag/getsr.py index 47ffb5e05708e11ebcdfadfe876e033c46c1d32c..bafb3245f892ad9dc3448ce0463ea0ee401141aa 100755 --- a/software/diag/getsr.py +++ b/software/diag/getsr.py @@ -31,6 +31,7 @@ # 2014-05-02 Theodor Stana Changed to print the bits of the SR # in turn. # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -49,28 +50,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/mantrig.py b/software/diag/mantrig.py index 398e9c92a07623a8048e5380f10f8b971c425089..4ee810996c47ee6841def4f21bf7efdaccc5b5e8 100755 --- a/software/diag/mantrig.py +++ b/software/diag/mantrig.py @@ -29,6 +29,7 @@ #=============================================================================== # last changes: # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -50,28 +51,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/rdchxpcr.py b/software/diag/rdchxpcr.py index 27a58ff319cb89a1f1de9ed8ef45a771dcaba288..cea671de97537b388126ed527ebe7f448dba2d0a 100755 --- a/software/diag/rdchxpcr.py +++ b/software/diag/rdchxpcr.py @@ -29,6 +29,7 @@ #=============================================================================== # last changes: # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -50,10 +51,12 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() diff --git a/software/diag/seterr.py b/software/diag/seterr.py index 134b10a06eff39bf9a9ebda31ecd869380340c5e..9ef6c76347322a1a8ff1301ec1a7faf23fbfe4bd 100755 --- a/software/diag/seterr.py +++ b/software/diag/seterr.py @@ -36,6 +36,7 @@ # 2014-05-02 Theodor Stana File created # 2017-02-02 M. Suminski Updated mem map to match v4 gateware, # renamed from setsr.py to seterr.py +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -57,28 +58,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/therm.py b/software/diag/therm.py index 7bca516e5524ffac19a8e3f98703f00c5415a7ff..c31682cb76ea3d8236bed672bc0840f210168902 100755 --- a/software/diag/therm.py +++ b/software/diag/therm.py @@ -31,6 +31,7 @@ # last changes: # 2017-02-02 M. Suminski Updated to work with gateware v4 # (read regs storing UID & temperature) +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -56,28 +57,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/timetag/getlatestts.py b/software/diag/timetag/getlatestts.py index b2115c39307b905f723d58d8eddbaf66bc9099ec..4ecb62e26b83b5934a2f01d6d7d6f59ff25b6e81 100755 --- a/software/diag/timetag/getlatestts.py +++ b/software/diag/timetag/getlatestts.py @@ -30,6 +30,7 @@ # last changes: # 2014-08-18 Theodor Stana File created # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -48,28 +49,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/timetag/rdtb.py b/software/diag/timetag/rdtb.py index 7bd8f49a35d599abd775d915b0b5db6695f80f16..6a995b843932ccb613a01a077ed81beca76aa7ca 100755 --- a/software/diag/timetag/rdtb.py +++ b/software/diag/timetag/rdtb.py @@ -29,6 +29,7 @@ #=============================================================================== # last changes: # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -48,28 +49,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/timetag/tsget.py b/software/diag/timetag/tsget.py index 9ef6f313d32ab259128be4f835bf4fbc68f11bf8..3cb0a6a41890b37274a55c3780030c4b31d6b5d4 100755 --- a/software/diag/timetag/tsget.py +++ b/software/diag/timetag/tsget.py @@ -28,6 +28,7 @@ #=============================================================================== # last changes: # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -47,28 +48,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/diag/timetag/tsset.py b/software/diag/timetag/tsset.py index c9ffffdd67ebba0fc6fa5414878a54b1cbf89853..aa2f8a2a6ba6a08e8b02b02449f0e71a1d848ce1 100755 --- a/software/diag/timetag/tsset.py +++ b/software/diag/timetag/tsset.py @@ -29,6 +29,7 @@ #=============================================================================== # last changes: # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -49,28 +50,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = testelma.get_bid(slot) diff --git a/software/multiboot/multiboot.py b/software/multiboot/multiboot.py index 3d5d9724329ab1f8e831845edd579fa6e72ef138..e79841fca06cc910c95a773a309f7555b18bcac0 100755 --- a/software/multiboot/multiboot.py +++ b/software/multiboot/multiboot.py @@ -42,6 +42,7 @@ #=============================================================================== # last changes: # 2013-08-13 Theodor Stana File created +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -72,30 +73,15 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT else: ip = raw_input("ELMA crate IP or hostname : ") user = raw_input("ELMA crate user name : ") pwd = raw_input("ELMA crate password : ") + slot = int(raw_input("ELMA crate slot number : ")) elma = EI2C(ip, user, pwd) elma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except ValueError as e : - print ("%s is not a valid integer." % e.args[0].split(": ")[1]) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Print which board is detected in the selected slot bid = elma.get_bid(slot) diff --git a/software/pulsetest/clrchcnt.py b/software/pulsetest/clrchcnt.py index 54dac8be5298f31e9288edaf03f2a9ae356b812b..29678850bbb03223058a19583ba68bdcd4be91a5 100755 --- a/software/pulsetest/clrchcnt.py +++ b/software/pulsetest/clrchcnt.py @@ -12,24 +12,10 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Get board ID and gateware version, fail if incorrect bloid = testelma.read(slot, 0x00) fwvers = testelma.read(slot, 0x04) & 0xFF diff --git a/software/pulsetest/pulsetest.py b/software/pulsetest/pulsetest.py index c83d055c5a3a38b571d49bbfef9428ca0b16b058..0d810c1c4152d7b03db034a6b76e7a1f773ad52b 100755 --- a/software/pulsetest/pulsetest.py +++ b/software/pulsetest/pulsetest.py @@ -29,6 +29,7 @@ # last changes: # 2014-07-02 Theodor Stana Setting the frequency to 0 Hz does not # enable the channel +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -85,24 +86,10 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Get board ID and gateware version, fail if incorrect bloid = testelma.read(slot, 0x00) fwvers = testelma.read(slot, 0x04) & 0xFF diff --git a/software/pulsetest/rdchcnt.py b/software/pulsetest/rdchcnt.py index f27d99fe747bdc036e79f51487010ced3922cafb..e723f09f4893ef2c702466cfc616b994827f5495 100755 --- a/software/pulsetest/rdchcnt.py +++ b/software/pulsetest/rdchcnt.py @@ -12,24 +12,10 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Get board ID and gateware version, fail if incorrect bloid = testelma.read(slot, 0x00) fwvers = testelma.read(slot, 0x04) & 0xFF diff --git a/software/regtest/regtest.py b/software/regtest/regtest.py index 3833bdab70d986cd908438ce4452451b8b621d17..5dd9ab4914b2cb226386bbd7055b4d6f2949ca45 100755 --- a/software/regtest/regtest.py +++ b/software/regtest/regtest.py @@ -37,6 +37,7 @@ # last changes: # 2013-08-13 Theodor Stana File created # 2014-03-06 Theodor Stana Added description above +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - #=============================================================================== @@ -58,24 +59,10 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT testelma = EI2C(ip, user, pwd) testelma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Ask how long to run the test print "How long would you like to run the test?" while 1: @@ -130,7 +117,7 @@ if __name__ == "__main__": f.write("Nr. slots: %d\n" % nrslots) f.write("Runtime: %d hrs, %d mins, %d s\n" % (hrs, mins, secs)) f.write("------------------------------------------------------------\r\n") - f.write("%s: starting test\r\n" % time.strftime("%Y-%m-%d-%Hh%Mm%Ss", time.localtime())) + f.write("%s: starting test\r\n" % time.strftime("%Y-%m-%d-%Hh%Mm%Ss", time.localtime())) print "%s: starting test" % time.strftime("%Y-%m-%d-%Hh%Mm%Ss", time.localtime()) f.write("------------------------------------------------------------\r\n") diff --git a/software/regupdate/regupdate.py b/software/regupdate/regupdate.py index 15e41f0de8c847e6277176bb46fb4d072b3aa9b3..491eea8739d52c151e2de3fc5471bd7bf9c8ea2a 100755 --- a/software/regupdate/regupdate.py +++ b/software/regupdate/regupdate.py @@ -31,6 +31,7 @@ # last changes: # 2014-08-25 Theodor Stana File created # 2017-02-02 M. Suminski Updated mem map to match v4 gateware +# 2017-02-17 M. Suminski Use SLOT configuration from ei2cdefine #=============================================================================== # TODO: - It was not tested with gateware v4, there are now separate counters # for TTL and blocking pulses. Blocking pulse counters are not handled. @@ -50,24 +51,10 @@ if __name__ == "__main__": ip = ei2cdefine.HNAME user = ei2cdefine.USER pwd = ei2cdefine.PWD + slot = ei2cdefine.SLOT elma = EI2C(ip, user, pwd) elma.open() - # Ask for slot number - while 1: - try: - slot = raw_input("Slot no.: ") - slot = int(slot) - break - except TypeError as e: - print("Please input a decimal slot number.") - except SlotError as e: - print(e.strerror) - except KeyboardInterrupt: - sys.exit(); - except: - print("Unexpected error: ", sys.exc_info()[0]) - # Ask how long to run the test print("") print("How long would you like to run the test?")