This commit is contained in:
gac-x11ma
2020-12-15 15:20:00 +01:00
parent caccd1e648
commit b707f89f2b
9 changed files with 277 additions and 210 deletions
+3 -4
View File
@@ -10,7 +10,6 @@ if get_exec_pars().source == CommandSource.ui:
NUMBER_SCANS =1
RANGES = [[500.0, 1000.0, 100.0]]
DRY_RUN = get_dry_run()
SAVE_DIAGS = True
if SWITCH_POL:
@@ -44,7 +43,7 @@ frames=[]
class SyncEnergy(Writable):
def write(self,pos):
if not DRY_RUN:
if not get_dry_run():
put_energy(pos)
else:
print "Energy=" + str(pos)
@@ -82,7 +81,7 @@ set_device_alias(averager, "Image") #Set display name
sensors.append(averager) #sensors.append(eiger.getDataMatrix())
#Initialize vartiables
if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
if not get_dry_run() and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
open_vg10()
#put_id_offset(1, OFFSET_ID_1) #offset on ID1
@@ -120,7 +119,7 @@ finally:
if AVERAGE>1:
for i in range(len(rois)):
rois[i].parent.monitored = False # Remove listeners on the image
if not DRY_RUN and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
if not get_dry_run() and str(get_setting("AUTO_SWITCH_VALVE")).lower() == "true":
close_vg10()
restore_eiger()
print "Running time: " + str(time.time() - start)