diff --git a/script/local.py b/script/local.py index 38422f8c..f7cf3381 100644 --- a/script/local.py +++ b/script/local.py @@ -344,22 +344,27 @@ def wait_beam(): print "Beam ok" def is_scienta_sampling(): - global SENSORS - sample_scienta = False - for dev in ["Scienta.spectrum","EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix", "Counts"]: - if dev in SENSORS: - sample_scienta = True - break - for dev in [Scienta.spectrum,EnergyDistribution, AngleDistribution, Scienta.dataMatrix, Counts]: - if dev in SENSORS: - sample_scienta = True - break - return sample_scienta - + try: + global SENSORS + sample_scienta = False + for dev in ["Scienta.spectrum","EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix", "Counts"]: + if dev in SENSORS: + sample_scienta = True + break + for dev in [ # Scienta.spectrum, + EnergyDistribution, AngleDistribution, Scienta.dataMatrix, Counts]: + if dev in SENSORS: + sample_scienta = True + break + return sample_scienta + except: + print sys.exc_info() + def before_readout(): sample_scienta = is_scienta_sampling() wait_beam() trig_keithleys() + print sample_scienta if sample_scienta: trig_scienta() else: @@ -429,12 +434,15 @@ def adjust_sensors(): #Device aliases for data files set_device_alias(Scienta.dataMatrix, "ScientaImage") + +### NOT AVAILABLE IN NEW DRIVER #set_device_alias(Scienta.spectrum, "ScientaSpectrum") #set_device_alias(Scienta.channelBegin, get_diag_name(Scienta.channelBegin)) #set_device_alias(Scienta.channelEnd, get_diag_name(Scienta.channelEnd)) #set_device_alias(Scienta.sliceBegin, get_diag_name(Scienta.sliceBegin)) #set_device_alias(Scienta.sliceEnd, get_diag_name(Scienta.sliceEnd)) #set_device_alias(Scienta.numChannels, get_diag_name(Scienta.numChannels)) + set_device_alias(Scienta.numSlices, get_diag_name(Scienta.numSlices)) set_device_alias(Scienta.lowEnergy, get_diag_name(Scienta.lowEnergy)) set_device_alias(Scienta.centerEnergy, get_diag_name(Scienta.centerEnergy))