Closedown

This commit is contained in:
x03daop
2016-06-14 15:09:24 +02:00
parent 7121e282da
commit 610ab473b7
3 changed files with 6 additions and 3 deletions
+2 -2
View File
@@ -13,8 +13,6 @@ if MODE == "swept":
Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept)
else:
Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed)
adjust_sensors()
set_adc_averaging()
if len(VECTOR[0]) == 2:
#FIXED
@@ -26,6 +24,8 @@ else:
Scienta.highEnergy.write(VECTOR[0][2])
writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy)
adjust_sensors()
set_adc_averaging()
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
try:
+1
View File
@@ -63,6 +63,7 @@ try:
wait_beam()
trig_scienta()
spectrum_array = Scienta.spectrum.read()
spectrum_array[0]=10
if beam_ok:
break
if ydata is None:
+3 -1
View File
@@ -252,7 +252,9 @@ def set_adc_averaging():
AuxCurrentAveraging.write(value)
AuxVoltageAveraging.write(value)
def adjust_sensors():
def adjust_sensors():
#Updating ranges from Scienta
Scienta.update()
global SENSORS
if SENSORS is not None:
# Move integration to end