Closedown

2016-03-08 15:40:57 +01:00
parent f21d5abd41
commit 8489b556b6
11 changed files with 15 additions and 10 deletions
@@ -13,4 +13,5 @@ RELATIVE (BOOLEAN)
 #set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator])
 #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
 adjust_sensors()
+set_adc_averaging()
 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)
@@ -11,4 +11,5 @@ RELATIVE (BOOLEAN)
                                       
 #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
 adjust_sensors()
+set_adc_averaging()
 lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout)
@@ -7,6 +7,7 @@ LATENCY (double)
 """

 adjust_sensors()
+set_averaging()
 #set_preference(Preference.PLOT_TYPES,{'ImageEnergyDistribution':1})

 if len(VECTOR[0]) == 2:
@@ -34,6 +34,8 @@ try:
        Scienta.stepSize.write(vars[1])
        Scienta.setIterations(1)

+        set_averaging()
+
        #iterations done in script
        xdata = None
        ydata = None