diff --git a/config/variables.properties b/config/variables.properties index 2588fa16..56823025 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Mon May 31 17:13:04 CEST 2021 +#Mon May 31 18:31:00 CEST 2021 LastRunDate=210531 -FileSequentialNumber=7427 -DaySequentialNumber=11 +FileSequentialNumber=7434 +DaySequentialNumber=18 diff --git a/script/HoloFlyScan.py b/script/HoloFlyScan.py index b1cbbe0f..223c6f13 100644 --- a/script/HoloFlyScan.py +++ b/script/HoloFlyScan.py @@ -31,6 +31,7 @@ SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent adjust_sensors() set_adc_averaging() set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) +set_exec_pars(compression=True) # time per scienta acquisition in seconds time1 = time.time() diff --git a/script/HoloScan.py b/script/HoloScan.py index f3520d74..1c7d0cc5 100644 --- a/script/HoloScan.py +++ b/script/HoloScan.py @@ -16,6 +16,7 @@ ZIGZAG (BOOLEAN) adjust_sensors() set_adc_averaging() set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) +set_exec_pars(compression=True) try: ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, \ diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py index 4259b968..7fa8c1fb 100644 --- a/script/ManipulatorScan.py +++ b/script/ManipulatorScan.py @@ -14,6 +14,7 @@ FLY_SCAN (BOOLEAN) adjust_sensors() set_adc_averaging() set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) +set_exec_pars(compression=True) try: if FLY_SCAN: diff --git a/script/ManipulatorXYScan.py b/script/ManipulatorXYScan.py index 49449ef4..abbf0697 100644 --- a/script/ManipulatorXYScan.py +++ b/script/ManipulatorXYScan.py @@ -31,6 +31,7 @@ RELATIVE = True adjust_sensors() set_adc_averaging() +set_exec_pars(compression=True) try: lscan(MOTOR, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=before_readout, after_read = after_readout) diff --git a/script/ManipulatorYZFlyScan.py b/script/ManipulatorYZFlyScan.py index 1e00deb3..6cbfda3d 100644 --- a/script/ManipulatorYZFlyScan.py +++ b/script/ManipulatorYZFlyScan.py @@ -25,6 +25,7 @@ SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent adjust_sensors() set_adc_averaging() +set_exec_pars(compression=True) # time per scienta acquisition in seconds time1 = time.time() diff --git a/script/ManipulatorYZScan.py b/script/ManipulatorYZScan.py index 5d4a325b..ce3c9bb2 100644 --- a/script/ManipulatorYZScan.py +++ b/script/ManipulatorYZScan.py @@ -25,6 +25,7 @@ RELATIVE = False adjust_sensors() set_adc_averaging() #set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) +set_exec_pars(compression=True) try: ascan(MOTORS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, before_read=before_readout, after_read = after_readout) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index df50fab6..022f5083 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -82,6 +82,7 @@ CLOSE_SHUTTER_AT_END = True # --- DO NOT EDIT BELOW THIS LINE! --- set_exec_pars(keep=False) +set_exec_pars(compression=True) def check_region(region): """ diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index 16a48c94..03d3e190 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -27,6 +27,7 @@ else: adjust_sensors() set_adc_averaging() set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) +set_exec_pars(compression=True) try: vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=before_readout, after_read = after_readout) diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index f9d7f02e..5b230aa6 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -23,6 +23,7 @@ for cur_range in range(len(ranges)): ar = [round(r.min / r.vars[1]) * r.vars[1], round(r.max / r.vars[1]) * r.vars[1]] adjusted_ranges.append(ar) +set_exec_pars(compression=True) set_exec_pars(open = True) create_metadata_datasets()