debugging octupole

iexcode/instruments/IEX_VPU.py

@@ -172,6 +172,7 @@ def ID_mode_set(ID_mode):
     """
     writes the desired mode to the correct ID pv
     """
+    ID_mode = ID_mode.upper()
     if ID_mode in ID_mode_list():
         ID_state = ID_mode_list().index(ID_mode)
         caput(ID_pvs()['mode_val'],ID_state,wait=True,timeout=18000)

iexcode/instruments/Kappa.py

@@ -415,7 +415,7 @@ def _kappa_log_dictionary():
         "mesh":(mesh.current,".2f"),
         "det_name":(Kappa_Detector.get()[0],"s"),
         "mpa_HV":(MPA.HV_get(),".0f"),
-        "m3r_centroid":(m3r_centroid(),".0f"),
+        "m3r_centroid":(m3r_centroid()[0],".0f"),
     }
     return d
 

iexcode/instruments/Octupole.py

@@ -66,6 +66,8 @@ def Octupole_init(*userName,**kwargs):
 
     #endstation
     iex.BL = Beamline_Config('Octupole',kwargs['scan_ioc'],kwargs['xrays'],kwargs['mode'],Octupole_Motors)
+    iex.BL.safe_state = Octupole_safe_state
+    iex.BL.endstation_get = Octupole_get_all
 
     #setting folders
     if kwargs['set_folders']:
@@ -363,7 +365,7 @@ def _Octupole_log_dictionary():
         "TA":(caget(Octupole_extra_pvs()['TA']),".2f"),
         "tey_current":(tey.current_Amp,".2f"),
         "mesh_current":(mesh.current_Amp,".2f"),
-        "m3r_centroid":(m3r_centroid(),".0f") , 
+        "m3r_centroid":(m3r_centroid()[0],".0f") , 
     }
     return d