Closedown

script/Extreme.py

@@ -19,7 +19,7 @@ RANGES = [(B1, B2, -BSTEP),(B2,B1,BSTEP)]
 
 #Pre-actions
 # Here polarization and offsets are set
-'''
+
 if MODE is ["CIRC +", "CIRC -"]:
     caput(OTF_MODE1,MODE)
     caput(OTF_MODE2,MODE)
@@ -30,7 +30,7 @@ caput(OTF_OFF1,OFFSET1) #caput('X11MA-ID1:ENERGY-OFFS', OFFSET)
 caput(OTF_OFF2,OFFSET2) 
 
 wait_channel(OTF_DONE, 1, type = 'i')
-'''
+
 
 # Generating a list of mag. fields (setpoints) needed for the loop
 setpoints = []
@@ -58,11 +58,11 @@ for B in setpoints:
 
     for E in ENERGIES:
         print "Setting energy = ", E
-        #caput(OTF_ESET, E)
-        #wait_channel(OTF_DONE, 1, type = 'i')
+        caput(OTF_ESET, E)
+        wait_channel(OTF_DONE, 1, type = 'i')
         readback2  = energy.read()
-        #if abs(readback2 - E) > 0.1 : # TODO: Check accuracy
-        #    raise Exception('Energy could not be set to the value ' + str(E))
+        if abs(readback2 - E) > 0.1 : # TODO: Check accuracy
+            raise Exception('Energy could not be set to the value ' + str(E))
         sleep( ENERGY_CHANGE_SLEEP ) # Settling time
 
         detector1 = keithley_1a.read() #Keithley1
@@ -75,7 +75,7 @@ for B in setpoints:
         #detector8 = signal_field_analog_x.read() # fieldAnalogX.get() 
         tey_norm = detector1/detector2     
         #trans_norm = detector3/detector2
-        scan.append ([B, E], [readback1, readback2], [detector1, detector2, 1, detector6, detector7, tey_norm])
+        scan.append ([B, E], [readback1, readback2], [detector1, detector2, detector4, detector6, detector7, tey_norm])
 
 scan.end()