post-p21592 HVE commissioning cleanup

channels/bs_channels.py

@@ -28,14 +28,20 @@ detectors = [
 # )
 
 detectors_with_config = DetectorConfig(detectors)
-detectors_with_config["JF16T03V01"]['save_dap_results'] = True
-detectors_with_config["JF16T03V01"]['remove_raw_files'] = True
+#detectors_with_config["JF16T03V01"]['save_dap_results'] = True
+#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
 
 
+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)
+
+
+
 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-SMX-OAV:FPICTURE",    # SwissMX OAV camera picture
+    "SARES30-CAMS156-SMX-OAV.jet_projection", #SWISSMX oav jET PROJECTION
     # "SARES30-CAMS156-XE:FPICTURE",         # X-ray eye
 ]
 
@@ -120,7 +126,24 @@ channels_RF = [
     "S30CB14-RLLE-DSP:AMPLT-VS",
 ]
 
-channels_Xeye = ["SARES30-CAMS156-XE:intensity"]
+channels_Xeye = ["SARES30-CAMS156-XE:intensity",
+                "SARES30-CAMS156-XE:x_center_of_mass",
+                "SARES30-CAMS156-XE:x_fit_amplitude",
+                "SARES30-CAMS156-XE:x_fit_mean",
+                "SARES30-CAMS156-XE:x_fit_offset",
+                "SARES30-CAMS156-XE:x_fit_standard_deviation",
+                "SARES30-CAMS156-XE:x_fwhm",
+                "SARES30-CAMS156-XE:x_profile",
+                "SARES30-CAMS156-XE:x_rms",
+                "SARES30-CAMS156-XE:y_center_of_mass",
+                "SARES30-CAMS156-XE:y_fit_amplitude",
+                "SARES30-CAMS156-XE:y_fit_mean",
+                "SARES30-CAMS156-XE:y_fit_offset",
+                "SARES30-CAMS156-XE:y_fit_standard_deviation",
+                "SARES30-CAMS156-XE:y_fwhm",
+                "SARES30-CAMS156-XE:y_profile",
+                "SARES30-CAMS156-XE:y_rms",
+                 ]
 
 ######################
 # PBPS053
@@ -143,8 +166,22 @@ 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",
+# Experimental large bandwith camera
+    "SARFE10-PSSS059-LB:FIT-BRT",
+"SARFE10-PSSS059-LB:FIT-COM",
+"SARFE10-PSSS059-LB:FIT-FWHM",
+"SARFE10-PSSS059-LB:FIT-RES",
+"SARFE10-PSSS059-LB:FIT-RMS",
+"SARFE10-PSSS059-LB:SPECT-COM",
+"SARFE10-PSSS059-LB:SPECT-RES",
+"SARFE10-PSSS059-LB:SPECT-RMS",
+"SARFE10-PSSS059-LB:SPECTRUM_X",
+"SARFE10-PSSS059-LB:SPECTRUM_Y",
+"SARFE10-PSSS059-LB:SPECTRUM_Y_SUM",
+"SARFE10-PSSS059-LB:processing_parameters",
+"SARFE10-PSSS059-LB:FPICTURE",
 ]
 
 ###################################
@@ -154,7 +191,7 @@ channels_Bernina = [
     "SAROP21-PBPS103:INTENSITY",
     "SAROP21-PBPS103:XPOS",
     "SAROP21-PBPS103:YPOS",
-    "SAROP21-PPRM113:FPICTURE",
+    #"SAROP21-PPRM113:FPICTURE",
     "SAROP21-PPRM113:intensity",
     "SAROP21-PPRM113:x_fit_mean",
     "SAROP21-PPRM113:y_fit_mean",
@@ -275,7 +312,10 @@ channels_digitizer = [
 
 #######################
 # Other BS channels that we sometimes use
-channels_other = []
+channels_other = [
+        # "SARFE10-PPRM053:FPICTURE", # TODO: Test if this works here
+        # "SARFE10-PPRM064:FPICTURE", # TODO: Test if this works here
+        ]
 
 bs_channels = (
     camera_channels
@@ -289,10 +329,10 @@ bs_channels = (
     # + channels_PPRM113
     + channels_PBPS149
     # + channels_PBPS149_waveforms
-    # + channels_PPRM150
+    + channels_PPRM150 # only if screen is inserted
     + channels_EVR
     # + channels_digitizer
-    # + channels_other
+    + channels_other
 )
 
 bs_channels_OAPU107_scan = (

channels/pv_channels.py

@@ -8,7 +8,7 @@
 # Machine
 pvs_machine = [
     "SARCL02-MBND100:P-READ",  # Predicted bunch energy
-    "SARUN:FELPHOTENE.VAL",  # Predicted photon energy from machine settings
+    "SARUN:FELPHOTENE.VAL",    # Predicted photon energy from machine settings
     "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG.VAL",  # Average pulse energy from the gas detector
 ]
 
@@ -169,6 +169,8 @@ pvs_OATT053 = [
 # Beam profile monitor PPRM053
 pvs_PPRM053 = [
     "SARFE10-PPRM053:MOTOR_PROBE.RBV",
+    #"SARFE10-PPRM053:FPICTURE", 
+    #"SARFE10-PPRM064:FPICTURE", # TODO move to correct place
 ]
 
 ###################