before MX beamtime October 2024

channels/bs_channels.py

@@ -9,8 +9,10 @@ from slic.core.acquisition.detcfg import DetectorConfig
 
 # TODO: JF settings regarding raw conversion, compression, etc.
 detectors = [
-    "JF16T03V01",
+    "JF16T03V02",
+#    "JF16T03V01",
 #    "JF17T16V01",
+    "JF20T01V01",
 ]
 
 # ALLOWED_PARAMS = dict(
@@ -160,6 +162,7 @@ channels_Xeye = ["SARES30-CAMS156-XE:intensity",
                 "SARES30-CAMS156-XE:y_fwhm",
                 "SARES30-CAMS156-XE:y_profile",
                 "SARES30-CAMS156-XE:y_rms",
+                # "SARES30-CAMS156-XE:FPICTURE",
                  ]
 
 ######################
@@ -207,15 +210,49 @@ channels_PSSS059_LB = [
 ###################################
 ## Bernina channels
 # Beam position monitor PBPS113
-channels_Bernina = [
+#channels_Bernina = [
+#    "SAROP21-PBPS103:INTENSITY",
+#    "SAROP21-PBPS103:XPOS",
+#    "SAROP21-PBPS103:YPOS",
+#    #"SAROP21-PPRM113:FPICTURE",
+#    "SAROP21-PPRM113:intensity",
+#    "SAROP21-PPRM113:x_fit_mean",
+#    "SAROP21-PPRM113:y_fit_mean",
+#]
+
+channels_PBPS113_bernina = [
     "SAROP21-PBPS103:INTENSITY",
+    "SAROP21-PBPS103:INTENSITY_UJ",
+    "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD0",
+    "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD1",
+    "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD2",
+    "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD3",
     "SAROP21-PBPS103:XPOS",
     "SAROP21-PBPS103:YPOS",
-    #"SAROP21-PPRM113:FPICTURE",
-    "SAROP21-PPRM113:intensity",
-    "SAROP21-PPRM113:x_fit_mean",
-    "SAROP21-PPRM113:y_fit_mean",
 ]
+
+channels_PPRM113_bernina = [
+    "SAROP21-PPRM113:intensity",
+    "SAROP21-PPRM113:x_center_of_mass",
+    "SAROP21-PPRM113:x_fit_amplitude",
+    "SAROP21-PPRM113:x_fit_mean",
+    "SAROP21-PPRM113:x_fit_offset",
+    "SAROP21-PPRM113:x_fit_standard_deviation",
+    "SAROP21-PPRM113:x_fwhm",
+    "SAROP21-PPRM113:x_profile",
+    "SAROP21-PPRM113:x_rms",
+    "SAROP21-PPRM113:y_center_of_mass",
+    "SAROP21-PPRM113:y_fit_amplitude",
+    "SAROP21-PPRM113:y_fit_mean",
+    "SAROP21-PPRM113:y_fit_offset",
+    "SAROP21-PPRM113:y_fit_standard_deviation",
+    "SAROP21-PPRM113:y_fwhm",
+    "SAROP21-PPRM113:y_profile",
+    "SAROP21-PPRM113:y_rms",
+    # "SAROP31-PPRM113:FPICTURE",                         # full pictures for debugging purposes at the moment, from _ib process
+]
+
+
 ###################################
 # Beam position monitor PBPS113
 channels_PBPS113 = [
@@ -360,3 +397,12 @@ bs_channels = (
     + channels_other
 )
 
+bs_channels_bernina_DCM = (
+    channels_gas_monitor
+    # + channels_RF
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PSSS059_LB
+    + channels_PBPS113_bernina
+#    + channels_PPRM113_bernina
+)