weekly commit

iexcode/instruments/Kappa.py

@@ -197,7 +197,7 @@ def kappa_motor_detectors():
     return motors
 def tth_detector_dictionary():
     detNums={
-        'tthdet':15
+        'tthdet':15,
         'd3':33,
         'd4':34,
         'mpa':30

iexcode/instruments/Kappa_det.py

@@ -2,7 +2,7 @@ from time import sleep
 from epics import caget, caput
  
 import iexcode.instruments.cfg as iex
-from iexcode.instruments.Kappa import tth_detector_dictionary
+#from iexcode.instruments.Kappa import tth_detector_dictionary
 ##############################################################################################################
 ################################            Kappa detector class             ##############################
 ##############################################################################################################

iexcode/instruments/Octupole.py

@@ -581,9 +581,10 @@ def scanhys(field_start,field_stop, field_step,**kwargs):
     kwargs.setdefault('execute',True)
     
     print('Field scan from {} V to {} V n step {}'.format(str(field_start),str(field_stop),str(field_step)))
-
-    field_val = '29ide:userTran5.D'
-    field_rbv = '29ide:userTran4.O'
+    field(field_start)
+    sleep(1)
+    field_val = '29ide:userTran5.C'
+    field_rbv = '29ide:userTran4.P'
     kwargs.update({"positioner_num":1})
     scan_fillin(field_val,field_rbv,field_start,field_stop,field_step,**kwargs)
     
@@ -592,6 +593,9 @@ def scanhys(field_start,field_stop, field_step,**kwargs):
         scan_go(**kwargs)
         #clean up after scan
         scaler_cts(verbose=False)
+    
+    sleep(3)
+    field(0)
 
 ##############################################################################################################
 ##############################        Octupole  XMCD Scan Set Up        ##############################

iexcode/macros/hkl_iex.py

@@ -703,7 +703,7 @@ def scanhkl_E(hv_list, hkl=get_hkl(),ID_tracking=False,**kwargs):
     kwargs.setdefault('positioner_settling_time',0.2)
     kwargs.setdefault('positioner_after_scan',"STAY")
     kwargs.setdefault('mono_offset',0)
-    kwargs.setdefault('write_file',True)
+    kwargs.setdefault('write_file',False)
     
     # caget beamline parameters:
     scanIOC = scan_ioc()
@@ -782,13 +782,13 @@ def scanhkl_E(hv_list, hkl=get_hkl(),ID_tracking=False,**kwargs):
         scan_go(**kwargs)
     
         # Setting everything back on the scanRecord
-        scanhkl_reset()
+        scanhkl_reset(**kwargs)
         
  # to be saved in text file like scanhkl:
     if kwargs['write_file']:
         return FileNum,mytable_hv.tolist(),mytable_ID.tolist(),mytable_omega.tolist(),mytable_chi.tolist() ,mytable_phi.tolist() ,mytable_tth.tolist() 
         
-def scanhkl_reset():
+def scanhkl_reset(**kwargs):
     """
     puts the scan record back after an scanhkl and scanhkl_E
     """