past p21736 Cr-MX Weik 2024-06-07 changes

channels/bs_channels.py

@@ -9,8 +9,8 @@ from slic.core.acquisition.detcfg import DetectorConfig
 
 # TODO: JF settings regarding raw conversion, compression, etc.
 detectors = [
-    "JF16T03V01",
+#    "JF16T03V01",
-#    "JF17T16V01",
+    "JF17T16V01",
 ]
 
 # ALLOWED_PARAMS = dict(
@@ -29,7 +29,12 @@ detectors = [
 
 detectors = DetectorConfig(detectors)
 # detectors_with_config["JF16T03V01"]['save_dap_results'] = True
-# detectors_with_config["JF16T03V01"]['remove_raw_files'] = True
+
+#detectors["JF16T03V01"]['remove_raw_files'] = True
+#detectors["JF16T03V01"]['factor'] = 0.2 # Some useful compromise to save space.
+#detectors["JF16T03V01"]['adc_to_energy'] = True 
+#detectors["JF16T03V01"]['compression'] = True
+
 # detectors_with_config["JF16T03V01"]['disabled_modules'] = [0, 1] # bottom module:0, middle module:1, top module:2
 
 #detectors["JF17T16V01"]['disabled_modules'] = [0, 1, 2, 3, 
@@ -46,7 +51,7 @@ detectors = DetectorConfig(detectors)
 
 
 detectors_MX = DetectorConfig()
-detectors_MX.add("JF17T16V01", adc_to_energy=True, compression=True, crystfel_lists_laser=True, double_pixels_action="mask", factor=12.08, remove_raw_files=True, save_dap_results=True, geometry=False)
+detectors_MX.add("JF17T16V01", adc_to_energy=True, compression=True, crystfel_lists_laser=True, double_pixels_action="mask", factor=11.00, remove_raw_files=True, save_dap_results=True, geometry=True)
 
 
 

channels/pv_channels.py

@@ -457,6 +457,11 @@ pvs_diffractometer_1 = [
     "SARES30-CPCL-ECMC02:TD-PosAct",
 ]
 
+pvs_swissmx = [
+    "SAR-EXPMX:MOT_FX.RBV",
+    "SAR-EXPMX:MOT_FY.RBV",
+]
+
 pv_channels = (
     pvs_machine
     # + pvs_RF
@@ -488,6 +493,7 @@ pv_channels = (
 #   + pvs_newport_300
     # + pvs_smaract_xyz
     + pvs_diffractometer_1
+    + pvs_swissmx
 #    + pvs_Bernina
 )
 

cristallina.py

@@ -137,6 +137,9 @@ from crq_exp.dilsc import Dilution
 
 dilution = Dilution()
 
+# MX adajustables
+import mx.mx_adjustables
+
 
 ################# Stand setup ##################
 

mx/knife_edge_prototype.py

@@ -0,0 +1,7 @@
+# to execute directly in slic:
+
+from devices.knife_edge import KnifeEdge
+kn = KnifeEdge
+
+scan = Scanner(default_acquisitions=[daq], condition=None)
+scan.scan1D(kn.x, 4, 5, 0.1, 10, 'test_knife_edge_evr_only', detectors=[], channels=["SAR-CVME-TIFALL6:EvtSet"], pvs=[])

mx/mx_adjustables.py

@@ -0,0 +1,23 @@
+from slic.core.device.simpledevice import SimpleDevice
+from slic.devices.general.motor import Motor
+
+# collimator
+mx_coll_x = Motor("SARES30-SMX:MCS1")
+mx_coll_y = Motor("SARES30-SMX:MCS2")
+
+# post-tube
+mx_pt_x1 = Motor("SARES30-SMX:MCS4")
+mx_pt_x2 = Motor("SARES30-SMX:MCS5")
+mx_pt_y1 = Motor("SARES30-SMX:MCS6")
+mx_pt_y2 = Motor("SARES30-SMX:MCS7")
+mx_pt_z = Motor("SARES30-SMX:MCS8")
+
+# post-tube
+mx_detector_z = Motor("SAR-EXPMX:MOT_DET_Z")
+
+# post-tube
+mx_backlight = Motor("SAR-EXPMX:MOT_BLGT")
+
+# fast stage
+mx_fast_x = Motor("SAR-EXPMX:MOT_FX")
+mx_fast_y = Motor("SAR-EXPMX:MOT_FY")

pgroups.py

@@ -1,7 +1,7 @@
 
 pgroup_scratch = "p19150"  # Scratch
 
-pgroup = "p19150"  # Scratch
+# pgroup = "p19150"  # Scratch
 # pgroup = "p19152"  # Scratch
 
 # pgroup = "p19739"  # commissioning March 2022 -- July 2022
@@ -32,3 +32,7 @@ pgroup = "p19150"  # Scratch
 # pgroup = "p21920"  # Beamline commissioning 2024
 
 # pgroup = "p21741"    # CrQ - DilSc - SAXS LiHoF4
+
+#pgroup = "p21735"  # Cr-MX Aller 2024-06-04
+pgroup = "p21736"  # Cr-MX Weik 2024-06-07
+