rename dcm classes

beamlinetools/BEAMLINE_CONFIG/beamline.py

@@ -9,7 +9,7 @@ from beamlinetools.devices.ophydMFLibrary import keithley6485
 from beamlinetools.devices.au import AUmySpot
 
 
-from beamlinetools.devices.dcm_mySpot import DCMmySpot, DCMmySpotNew
+from beamlinetools.devices.dcm_mySpot import DCMmySpot
 from ophyd import EpicsMotor
 
 
@@ -26,7 +26,7 @@ get_ipython().register_magics(BlueskyMagics)
 from ophyd.sim import det1, det2, det3, det4, motor1, motor2, motor, noisy_det   # two simulated detectors
 
 from beamlinetools.devices.accelerator import DetailedAccelerator, TopUpMonitoring
-from beamlinetools.devices.mca import xMap
+from beamlinetools.devices.mca_old import xMap
 
 
 
@@ -37,14 +37,13 @@ from beamlinetools.devices.mca import xMap
 # accelerator.wait_for_connection()
 # next_injection.wait_for_connection()
 
-
 # Keithleys
-print('Connecting to Amperometers')
-ks = 'K64851MF102L:'
-kth00    = keithley6485(ks + '12', name='myspot_keithley0', read_attrs=['readback'], labels={'detectors'})
-kth00.wait_for_connection()
-kth01    = keithley6485(ks + '14', name='myspot_keithley1', read_attrs=['readback'], labels={'detectors'})
-kth01.wait_for_connection()
+# print('Connecting to Amperometers')
+# ks = 'K64851MF102L:'
+# kth00    = keithley6485(ks + '12', name='myspot_keithley0', read_attrs=['readback'], labels={'detectors'})
+# kth00.wait_for_connection()
+# kth01    = keithley6485(ks + '14', name='myspot_keithley1', read_attrs=['readback'], labels={'detectors'})
+# kth01.wait_for_connection()
 
 # motors
 # print('Connecting to motors')
@@ -67,9 +66,16 @@ dcm.p.set_mono_type()
 
 # Mirrors
 
-# Detectors
+# Detectorscurrent
 # mca = MCA('dxpXMAP:', name='mca')
 
 print('Connecting to mca')
-mca = xMap('dxpXMAP:', name='mca', read_attrs=['mca1.spectrum', 'mca2.spectrum', 'mca1.rois.roi0'])
-mca.wait_for_connection()
\ No newline at end of file
+mca_old = xMap('dxpXMAP:', name='mca_old', read_attrs=['mca1.spectrum', 'mca2.spectrum', 'mca1.rois.roi0'])
+mca_old.wait_for_connection()
+
+from beamlinetools.devices.mca import MyEpicsMCA
+mca= MyEpicsMCA('dxpXMAP:', name="mca")
+
+from beamlinetools.devices.mca import ExafsDet
+
+ex_det = ExafsDet(mca.ch1.roi0.count, lt=mca.ch1.lifetime, name="ex_det")

beamlinetools/devices/dcm_mySpot.py

@@ -38,7 +38,7 @@ mono_table = {'Si111':
                  'cr2vetrCorr':0.0020}
             }
 
-class DCMmySpotNew(PseudoPositioner):
+class DCMEnergyHeight(PseudoPositioner):
     ''' This class implements apertures with four blades (top, bottom, left, right)
     and four pseudo motors (htop,hoffset,vgap,voffset)
     '''
@@ -138,7 +138,7 @@ class DCMmySpot(Device):
     cr2yaw         = Cpt(EpicsMotor, 'l0202004', labels={"dcm"})
     monobr_encoder = Cpt(EpicsSignalRO, 'IK1380002', labels={"dcm"})
 
-    p = Cpt(DCMmySpotNew, "", labels={"dcm"})
+    p = Cpt(DCMEnergyHeight, "", labels={"dcm"})
 
     current_mono="Si111"