acquisition examples and cleanup

channels/bs_channels.py

@@ -29,13 +29,14 @@ detectors = [
 
 detectors_with_config = DetectorConfig(detectors)
 detectors_with_config["JF16T03V01"]['save_dap_results'] = True
-detectors_with_config["JF16T03V01"]['disabled_modules'] = [0, 1] # bottom module:0, middle module:1, top module:2
+detectors_with_config["JF16T03V01"]['remove_raw_files'] = True
+# detectors_with_config["JF16T03V01"]['disabled_modules'] = [0, 1] # bottom module:0, middle module:1, top module:2
 
 
 camera_channels = [
     # "SARES30-CAMS156-PCO1:FPICTURE",       # PCO edge camera for the wavefront analysis (from Alvra)
     # "SARES30-CAMS156-SMX-OAV:FPICTURE",    # SwissMX OAV camera picture
-    "SARES30-CAMS156-XE:FPICTURE",         # X-ray eye
+    # "SARES30-CAMS156-XE:FPICTURE",         # X-ray eye
 ]
 
 ####################
@@ -142,7 +143,7 @@ channels_PSSS059 = [
     "SARFE10-PSSS059:SPECTRUM_Y_SUM",
     "SARFE10-PSSS059:SPECTRUM_X",
     "SARFE10-PSSS059:SPECTRUM_Y",
-    # "SARFE10-PSSS059:FPICTURE",
+    #"SARFE10-PSSS059:FPICTURE",
     "SARFE10-PSSS059:processing_parameters",
 ]
 
@@ -280,7 +281,7 @@ bs_channels = (
     camera_channels
     + channels_gas_monitor
     # + channels_RF
-    # + channels_Xeye
+    + channels_Xeye
     + channels_PBPS053
     + channels_PSSS059
     + channels_PBPS113

channels/pv_channels.py

@@ -264,10 +264,10 @@ pvs_OLAS147 = [
 ###################
 # Slits OAPU149
 pvs_OAPU149 = [
-    "SAROP31-OAPU149:MOTOR_X.VAL",
     "SAROP31-OAPU149:MOTOR_X.RBV",
-    "SAROP31-OAPU149:MOTOR_Y.VAL",
     "SAROP31-OAPU149:MOTOR_Y.RBV",
+    "SAROP31-OAPU149:MOTOR_W.RBV",
+    "SAROP31-OAPU149:MOTOR_H.RBV",
 ]
 
 ###################
@@ -408,6 +408,16 @@ pvs_smaract_juraj = [
     "SARES30-XSMA156:Rz:MOTRBV",
 ]
 
+pvs_diffractometer_1 = [
+    "SARES30-CPCL-ECMC02:ROT2THETA-PosAct",
+    "SARES30-CPCL-ECMC02:ROTTHETA-PosAct",
+    "SARES30-CPCL-ECMC02:TRXBASE-PosAct",
+    "SARES30-CPCL-ECMC02:TRY-PosAct",
+    "SARES30-CPCL-ECMC02:TRX-PosAct",
+    "SARES30-CPCL-ECMC02:TRZ-PosAct",
+    "SARES30-CPCL-ECMC02:TD-PosAct",
+]
+
 pvs = (
     pvs_machine
     # + pvs_RF
@@ -438,6 +448,7 @@ pvs = (
     + pvs_standa
     + pvs_newport_300
     + pvs_smaract_xyz
+    + pvs_diffractometer_1
 #    + pvs_Bernina
 )