use new dcm

beamlinetools/BEAMLINE_CONFIG/beamline.py

 # Workarounds/patches
 from ophyd.signal import EpicsSignalBase
-EpicsSignalBase.set_defaults(timeout=10.0, connection_timeout=10.0)
+EpicsSignalBase.set_defaults(timeout=2.0, connection_timeout=2.0)
 
 from bessyii_devices.ring import Ring
 
@@ -9,7 +9,7 @@ from beamlinetools.devices.ophydMFLibrary import keithley6485
 from beamlinetools.devices.au import AUmySpot
 
 
-from beamlinetools.devices.dcm_mySpot import DCMmySpot
+from beamlinetools.devices.dcm_mySpot import DCMmySpot, DCMmySpotNew
 from ophyd import EpicsMotor
 
 
@@ -31,37 +31,40 @@ from beamlinetools.devices.mca import xMap
 
 
 # Ring
-print("Loading Accelerator")
-accelerator = DetailedAccelerator("", name="accelerator")
-next_injection = TopUpMonitoring("", name="next_injection")
-accelerator.wait_for_connection()
-next_injection.wait_for_connection()
+# print("Loading Accelerator")
+# accelerator = DetailedAccelerator("", name="accelerator")
+# next_injection = TopUpMonitoring("", name="next_injection")
+# accelerator.wait_for_connection()
+# next_injection.wait_for_connection()
 
 
 # Keithleys
-print('Connecting to Amperomenters')
-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 Amperomenters')
+# 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')
-hgx = EpicsMotor("DCM1OS2L:l0204007", name='hgx')
-hgx.wait_for_connection()
-mz = EpicsMotor("DCM1OS2L:l0206004", name='mz')
-mz.wait_for_connection()
+# print('Connecting to motors')
+# hgx = EpicsMotor("DCM1OS2L:l0204007", name='hgx')
+# hgx.wait_for_connection()
+# mz = EpicsMotor("DCM1OS2L:l0206004", name='mz')
+# mz.wait_for_connection()
 
 # Monochromator
 print('Connecting to DCM')
 dcm = DCMmySpot("DCM1OS2L:", name='dcm')
 dcm.wait_for_connection()
 
+dcmn = DCMmySpotNew("DCM1OS2L:", name='dcm')
+dcmn.wait_for_connection()
+dcm.p.set_mono_type()
 # Apertures
-print('Connecting to Slit3')
-slit3 = AUmySpot("DCM1OS2L:", name='slit3')
-slit3.wait_for_connection()
+# print('Connecting to Slit3')
+# slit3 = AUmySpot("DCM1OS2L:", name='slit3')
+# slit3.wait_for_connection()
 # Pinhole
 
 # Mirrors
@@ -69,6 +72,6 @@ slit3.wait_for_connection()
 # Detectors
 # mca = MCA('dxpXMAP:', name='mca')
 
-print('Connecting to mca')
-mca = xMap('dxpXMAP:', name='mca', read_attrs=['mca1.spectrum', 'mca2.spectrum'])
-mca.wait_for_connection()
\ No newline at end of file
+# print('Connecting to mca')
+# mca = xMap('dxpXMAP:', name='mca', read_attrs=['mca1.spectrum', 'mca2.spectrum'])
+# mca.wait_for_connection()
\ No newline at end of file