script/Regine.py

@@ -86,7 +86,7 @@ if EXPOSURES:
     POSITIONERS = POSITIONERS + [exposure_index()]
     SENSORS = SENSORS  + [exposure()]
     RANGE_E=[0, len(EXPOSURES)-1]
-    
+
     #set_exec_pars(manual_range=RANGE_E, manual_range_y=RANGE_Y)
 
     CUSTOM_PLOT_TYPES[sin]=1
@@ -102,7 +102,7 @@ def gen():
         xpos = CENTER_X + x_step*STEP_SIZE_X + (random.random()-0.5)*NOISE*2*STEP_SIZE_X
         range_y=  range(STEPS_Y, -STEPS_Y-1, -1) if (ZIGZAG and(x_index%2 ==1)) else range(-STEPS_Y, STEPS_Y+1)
         for y_step in range_y:            
-            ypos = CENTER_Y + y_step*STEP_SIZE_Y + (random.random()-0.5)*NOISE*2*STEP_SIZE_Y       
+            ypos = CENTER_Y + y_step*STEP_SIZE_Y + (random.random()-0.5)*NOISE*2*STEP_SIZE_Y        
             if EXPOSURES:
                 range_e=  range(len(EXPOSURES)-1,-1, -1) if (ZIGZAG and(y_index%2 ==1)) else range(len(EXPOSURES))
                 for e in range_e:
@@ -116,8 +116,9 @@ def gen():
     
 try:
     r = vscan(POSITIONERS, SENSORS , gen(), False,\ 
-          SETTLING_TIME, relative=False, zigzag = ZIGZAG, \
-          before_read=before_readout, after_read = after_read, \
+          SETTLING_TIME, relative=False, zigzag = ZIGZAG, initial_move=False, \
+          before_read=before_readout, after_read = after_readout, \
+          manual_range=RANGE_X, manual_range_y=RANGE_Y, \
           compression = COMPRESSION, enabled_plots=ENABLED_PLOTS, \
           keep=False, check_positions=False, plot_types=CUSTOM_PLOT_TYPES)  
     set_return(r)