added XMCD

iexcode/instruments/Octupole.py

@@ -77,11 +77,11 @@ def Octupole_init(*userName,**kwargs):
 
     else:
         user_name = iex.BL.mda.user_name()
-    
+        print('else statement:',user_name)
 
 
     #update for default scanRecord advanced parameters
-    iex.BL.mda.log('Octupole',user_name,_Octupole_log_dictionary)
+    iex.BL.mda.log=Logfile('Octupole',user_name,_Octupole_log_dictionary)
 
     #global detectors
     mesh = SRS("29ide:scaler1.S2", '29idd:A4')
@@ -155,16 +155,28 @@ def _Octupole_detector_dictionary(**kwargs):
         41:"29ide:scaler1.S8",
     }
     xmcd_raw={
-        51:"29ide:m11.RBV",
-        52:"29ide:m12.RBV",
-        53:"29ide:m13.RBV",
-        54:"29ide:m14.RBV",
-        55:"29ide:m15.RBV",
+        51:"29ide:4step:sig1:A",
+        52:"29ide:4step:sig2:A",
+        53:"29ide:4step:sig3:A",
+        54:"29ide:4step:sig4:A",
+        55:"29ide:4step:sig1:B",
+        56:"29ide:4step:sig2:B",
+        57:"29ide:4step:sig3:B",
+        58:"29ide:4step:sig4:B",
+    }
+    xmcd_norm={
+        61:"29ide:userTran3.I",
+        62:"29ide:userTran3.J",
+        63:"29ide:userTran3.K",
+        64:"29ide:userTran3.L",
+        65:"29ide:userTran3.M",
+        66:"29ide:userTran3.N",
     }
     #hkl are listed just a place holders, they are filled in by thier scanning functions
     det_dict.update(sample_temp)
     det_dict.update(scalers)
     det_dict.update(xmcd_raw)
+    det_dict.update(xmcd_norm)
     if kwargs['add_vortex']:
         det_dict.update(vortex)