diff --git a/script/HoloScan.py b/script/HoloScan.py index 8165c6dd..4991158c 100644 --- a/script/HoloScan.py +++ b/script/HoloScan.py @@ -11,5 +11,6 @@ RELATIVE (BOOLEAN) #set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator]) -set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) -ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = AfterReadout) \ No newline at end of file +#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) +adjust_sensors() +ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout) \ No newline at end of file diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py index 7d0f6efc..13dfff6a 100644 --- a/script/ManipulatorScan.py +++ b/script/ManipulatorScan.py @@ -10,4 +10,5 @@ RELATIVE (BOOLEAN) """ #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) -lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = AfterReadout) \ No newline at end of file +adjust_sensors() +lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout) \ No newline at end of file diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index 1887bb91..ce0deb2f 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -6,7 +6,8 @@ SENSORS (list) LATENCY (double) """ -set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) +adjust_sensors() +#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) if len(VECTOR[0]) == 2: #FIXED @@ -15,4 +16,4 @@ else: #SWEPT writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy) -vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = AfterReadout) +vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = after_readout)