acquisition examples and cleanup

2023-11-13 11:31:57 +01:00
parent 2b61757705
commit afde091b4e
17 changed files with 43027 additions and 163 deletions
--- a/exp_temp/channels.py
+++ b/exp_temp/channels.py
@ -1,15 +1,28 @@
-# Channels to save at Cristallina endstation
+# Channels to save at Cristallina endstation, Bill's temporary implementations

 ##########################################################################################################
 ##########################################################################################################
 ##########################################################################################################
-# BS channels
+# JF configurations
+
+from slic.core.acquisition.detcfg import DetectorConfig

-# TODO: JF settings regarding raw conversion, compression, etc.
 detectors = [
    "JF16T03V01",
 ]

+ROIs = {'direct_beam': [200,400,500,600]}
+detectors_with_config_ROI_only = DetectorConfig(detectors)
+detectors_with_config_ROI_only["JF16T03V01"]['save_dap_results'] = False
+detectors_with_config_ROI_only["JF16T03V01"]['disabled_modules'] = [0, 1] # bottom module:0, middle module:1, top module:2
+detectors_with_config_ROI_only["JF16T03V01"]['roi'] = ROIs
+#detectors_with_config_ROI_only["JF16T03V01"]['remove_raw_files'] = True
+
+##########################################################################################################
+##########################################################################################################
+##########################################################################################################
+# BS channels, updated 05.11.2023 from official channel list and adapted
+
 camera_channels = [
    # "SARES30-CAMS156-PCO1:FPICTURE",       # PCO edge camera for the wavefront analysis (from Alvra)
    # "SARES30-CAMS156-SMX-OAV:FPICTURE",    # SwissMX OAV camera picture
@ -25,6 +38,7 @@ channels_gas_monitor = [
    "SARFE10-PBIG050-EVR0:CALCI",  # good for correlations with total beam intensity
    "SARFE10-PBPG050:HAMP-INTENSITY-CAL",
 ]
+
 # RF phases and amplitudes
 channels_RF = [
    "SINSB01-RLLE-DSP:PHASE-VS",
@ -96,7 +110,26 @@ 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",
+    "SARES30-CAMS156-XE:FPICTURE",    
+]

 ######################
 # PBPS053
@ -119,12 +152,8 @@ channels_PSSS059 = [
    "SARFE10-PSSS059:SPECTRUM_Y_SUM",
    "SARFE10-PSSS059:SPECTRUM_X",
    "SARFE10-PSSS059:SPECTRUM_Y",
-    # "SARFE10-PSSS059:FPICTURE",
-    # "SARFE10-PSSS059:FIT_ERR",
+    #"SARFE10-PSSS059:FPICTURE",
    "SARFE10-PSSS059:processing_parameters",
-    # "SARFE10-PSSS059:SPECTRUM_AVG_CENTER",
-    # "SARFE10-PSSS059:SPECTRUM_AVG_FWHM",
-    # "SARFE10-PSSS059:SPECTRUM_AVG_Y",
 ]

 ###################################
@ -139,6 +168,7 @@ channels_Bernina = [
    "SAROP21-PPRM113:x_fit_mean",
    "SAROP21-PPRM113:y_fit_mean",
 ]
+
 ###################################
 # Beam position monitor PBPS113
 channels_PBPS113 = [
@ -170,6 +200,13 @@ channels_PBPS113_waveforms = [
    "SAROP31-PBPS113:Lnk9Ch15-WF-DATA",
 ]

+###################################
+# Diode PDIM 113
+channels_PDIM113 = [
+    "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD4",
+]
+
+
 ####################
 # Profile monitor PPRM113 (from _proc process)
 channels_PPRM113 = [
@ -234,12 +271,40 @@ channels_PPRM150 = [
    # "SAROP31-PPRM150:FPICTURE",                         # full pictures for debugging purposes at the moment, from _ib process
 ]

+
+###################################
+# Diode of PSCD153
+channels_PSCD153_diode = [
+    "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD4",
+]
+
 #######################
 # Cristallina event reciever
 channels_EVR = [
    "SAR-CVME-TIFALL6:EvtSet",
 ]

+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",
+    "SARES30-CAMS156-XE:FPICTURE",    
+]
+
 #######################
 # Digitizer
 channels_digitizer = [
@ -254,6 +319,124 @@ channels_digitizer = [
 ]


+##########################################################################################################
+# Bernina channels
+
+#######################
+# Profile monitor PPRM113 (from _proc process)
+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",
+    # "SAROP21-PPRM113:FPICTURE",                         # full pictures for debugging purposes at the moment, from _ib process
+]
+
+###########################
+# Beam position monitor Bernina
+channels_PBPS103_Bernina = [
+    "SAROP21-PBPS103:INTENSITY",
+    "SAROP21-PBPS103:XPOS",
+    "SAROP21-PBPS103:YPOS",
+]
+
+##########################################################################################################
+# special bs channel configurations
+
+####################
+
+bs_channels_OAPU107_scan = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PBPS113
+    + channels_PBPS149
+    + channels_PPRM150
+)
+
+bs_channels_OAPU149_scan = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PBPS113
+    + channels_PBPS149
+    + channels_PPRM150
+)
+
+bs_channels_pbps_snapshot = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PBPS113
+    + channels_PBPS149
+)
+
+bs_channels_PBPS_tests = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PBPS113
+    + channels_PBPS149
+    + channels_Xeye
+)
+
+bs_channels_OATA_tests = (
+    channels_gas_monitor
+    + channels_PBPS053
+#    + channels_PSSS059
+#    + channels_PBPS113
+#    + channels_PBPS149
+    + channels_PSCD153_diode
+)
+
+bs_channels_OATA_tests_JF = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PBPS113
+    + channels_PBPS149
+)
+
+bs_channels_PPRM150 = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PPRM150
+)
+
+bs_channels_jf_direct_beam = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PBPS113
+    + channels_PBPS149
+    + channels_EVR
+)
+
+bs_channels_DCM_Bernina = (
+    channels_gas_monitor
+    + channels_PBPS053
+    + channels_PSSS059
+    + channels_PPRM113_Bernina
+    + channels_PBPS103_Bernina
+)
+
+
+
+
 ##########################################################################################################
 ##########################################################################################################
 ##########################################################################################################
@ -379,6 +562,27 @@ pvs_PBPS053 = [
    "SARFE10-PBPS053:MOTOR_PROBE",
 ]

+###################
+# Spectrometer PSSS059
+pvs_PSSS059 = [
+    "SARFE10-PSSS055:MOTOR_X1.RBV",
+    "SARFE10-PSSS055:MOTOR_Y1.RBV",
+    "SARFE10-PSSS055:MOTOR_ROT_X1.RBV",
+    "SARFE10-PSSS055:MOTOR_PROBE.RBV",
+    "SARFE10-PSSS059:MOTOR_X3.RBV",
+    "SARFE10-PSSS059:MOTOR_Y3.RBV",
+    "SARFE10-PSSS059:MOTOR_ROT_X3.RBV",
+    "SARFE10-PSSS059:MOTOR_Y4.RBV",
+    "SARFE10-PSSS059:MOTOR_ROT_X4.RBV",
+    "SARFE10-PSSS059:MOTOR_X5.RBV",
+    "SARFE10-PSSS059:MOTOR_Y5.RBV",
+    "SARFE10-PSSS059:MOTOR_Z5.RBV",
+    "SARFE10-PSSS055:GRATING_SP",
+    "SARFE10-PSSS059:CRYSTAL_SP",
+    "SARFE10-PSSS059:SPC_ROI_YMIN",
+    "SARFE10-PSSS059:SPC_ROI_YMAX",
+]
+
 ####################
 # Upstream attenuator OATT053
 pvs_OATT053 = [
@ -405,42 +609,6 @@ pvs_PPRM053 = [
    "SARFE10-PPRM053:MOTOR_PROBE.RBV",
 ]

-###################
-# Bernina mono
-pvs_Bernina = [
-    "SAROP21-ARAMIS:ENERGY_SP",
-    "SAROP21-ARAMIS:ENERGY",
-    "SAROP21-PBPS103:MOTOR_X1.DRBV",
-    "SAROP21-PBPS103:MOTOR_Y1.DRBV",
-    "SAROP21-PBPS103:MOTOR_X1.RBV",
-    "SAROP21-PBPS103:MOTOR_Y1.RBV",
-    "SAROP21-PBPS103:MOTOR_PROBE.RBV",
-    "SAROP21-PPRM113:MOTOR_PROBE.RBV"
-]
-
-####################
-# Single shot spectrometer PSS059
-pvs_PSSS059 = [
-    "SARFE10-PSSS055:MOTOR_X1.RBV",
-    "SARFE10-PSSS055:MOTOR_Y1.RBV",
-    "SARFE10-PSSS055:MOTOR_ROT_X1.RBV",
-    "SARFE10-PSSS055:MOTOR_PROBE.RBV",
-    "SARFE10-PSSS059:MOTOR_X3.RBV",
-    "SARFE10-PSSS059:MOTOR_Y3.RBV",
-    "SARFE10-PSSS059:MOTOR_ROT_X3.RBV",
-    "SARFE10-PSSS059:MOTOR_Y4.RBV",
-    "SARFE10-PSSS059:MOTOR_ROT_X4.RBV",
-    "SARFE10-PSSS059:MOTOR_X5.RBV",
-    "SARFE10-PSSS059:MOTOR_Y5.RBV",
-    "SARFE10-PSSS059:MOTOR_Z5.RBV",
-    "SARFE10-PSSS055:GRATING_SP",
-    "SARFE10-PSSS059:CRYSTAL_SP",
-    "SARFE10-PSSS059:SPC_ROI_YMIN",
-    "SARFE10-PSSS059:SPC_ROI_YMAX",
-]
-
-
-
 ####################
 # First Cristallina horizontal offset mirror OOMH067
 pvs_OOMH067 = [
@ -506,6 +674,12 @@ pvs_PBPS113 = [
    "SAROP31-PBPS113:MOTOR_PROBE.RBV",
 ]

+####################
+# Diode PDIM113
+pvs_PDIM113 = [
+    "SAROP31-PDIM113:MOTOR_PROBE.RBV"
+]
+
 ###################
 # Beam profile monitor PPRM113
 pvs_PPRM113 = [
@ -521,10 +695,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",
 ]

 ###################
@ -566,6 +740,7 @@ pvs_OPPI151 = [
    "SAROP31-OPPI151:MOTOR_Y.RBV",
 ]

+
 ####################
 ## Horizontal offset mirror ODMV152
 pvs_ODMV152 = [
@ -581,13 +756,6 @@ pvs_ODMV152 = [
    "SAROP31-ODMV152:TX.RBV",
 ]

-#######################
-# from _proc process
-pvs_PPRM150 = [
-    "SAROP31-PPRM150:MOTOR_PROBE.RBV",
-]
-
-
 ###########################
 # Vertical KB mirror OKBV153
 pvs_OKBV153 = [
@ -607,7 +775,6 @@ pvs_OKBV153 = [

 ####################
 # Screen between the KB's PSCD153
-# Not implemented yet
 pvs_PSCD153 = [
    "SAROP31-PSCD153:MOTOR_PROBE.RBV"
 ]
@ -636,6 +803,13 @@ pvs_standa = [
    "SARES30-MOBI1:MOT_3.RBV",
 ]

+####################
+# Newport 300 mm stage
+pvs_newport_300 = [
+    "SARES30-MOBI1:MOT_5.RBV",
+]
+
+
 ###############################
 # Smaract stages mini XYZ from SwissMX
 pvs_smaract_xyz = [
@ -665,7 +839,74 @@ pvs_smaract_juraj = [
    "SARES30-XSMA156:Rz:MOTRBV",
 ]

-pvs = (
+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",
+]
+
+
+##########################################################################################################
+# Bernina
+
+###################
+# Slits OAPU092
+pvs_OAPU092 = [
+    "SAROP21-OAPU092:MOTOR_X.RBV",
+    "SAROP21-OAPU092:MOTOR_Y.RBV",
+    "SAROP21-OAPU092:MOTOR_W.RBV",
+    "SAROP21-OAPU092:MOTOR_H.RBV",
+]
+
+###################
+# Bernina mono
+pvs_ODCM098 = [
+    "SAROP21-ARAMIS:ENERGY_SP",
+    "SAROP21-ARAMIS:ENERGY",
+    "SAROP21-PBPS103:MOTOR_X1.DRBV",
+    "SAROP21-PBPS103:MOTOR_Y1.DRBV",
+    "SAROP21-PBPS103:MOTOR_X1.RBV",
+    "SAROP21-PBPS103:MOTOR_Y1.RBV",
+    "SAROP21-PBPS103:MOTOR_PROBE.RBV",
+    "SAROP21-PPRM113:MOTOR_PROBE.RBV"
+]
+
+###################
+# Beam position and intensity monitor PBPS149
+pvs_PBPS103 = [
+    "SAROP21-PBPS103:MOTOR_X1.DRBV",
+    "SAROP21-PBPS103:MOTOR_Y1.DRBV",
+    "SAROP21-PBPS103:MOTOR_X1.RBV",
+    "SAROP21-PBPS103:MOTOR_Y1.RBV",
+    "SAROP21-PBPS103:MOTOR_PROBE.RBV",
+]
+
+###################
+# Slits OAPU102
+pvs_OAPU102 = [
+    "SAROP21-OAPU102:MOTOR_X.RBV",
+    "SAROP21-OAPU102:MOTOR_Y.RBV",
+    "SAROP21-OAPU102:MOTOR_W.RBV",
+    "SAROP21-OAPU102:MOTOR_H.RBV",
+]
+
+####################
+# Pulse picker OPPI113
+pvs_OPPI113 = [
+    "SAROP21-OPPI113:MOTOR_X1.RBV",
+    "SAROP21-OPPI113:MOTOR_Y1.RBV",
+]
+
+
+##########################################################################################################
+# special pvs configurations
+
+####################
+pvs_cristallina = (
    pvs_machine
    # + pvs_RF
    # + pvs_undulator
@ -681,6 +922,7 @@ pvs = (
    + pvs_PPRM085
    + pvs_OAPU107
    + pvs_PBPS113
+    + pvs_PDIM113 
    + pvs_PPRM113
    + pvs_OLAS147
    + pvs_OAPU149
@ -702,66 +944,12 @@ pvs = (
 # + pvs_smaract_juraj


-##########################
-#########################
-
 ####################
-
-detectors_jf_direct_beam_012 = [
-    "JF16T03V01",
-]
-
-
-####################
-
-bs_channels_OAPU107_scan = (
-    channels_gas_monitor
-    + channels_PBPS053
-    + channels_PSSS059
-    + channels_PBPS113
-    + channels_PBPS113
-    + channels_PPRM150
-)
-
-bs_channels_OAPU149_scan = (
-    channels_gas_monitor
-    + channels_PBPS053
-    + channels_PSSS059
-    + channels_PBPS113
-    + channels_PBPS113
-    + channels_PPRM150
-)
-
-bs_channels_pbps_snapshot = (
-    channels_gas_monitor
-    + channels_PBPS053
-    + channels_PSSS059
-    + channels_PBPS113
-    + channels_PBPS149
-)
-
-bs_channels_PPRM150 = (
-    channels_gas_monitor
-    + channels_PBPS053
-    + channels_PSSS059
-    + channels_PPRM150
-    + ["SAROP31-PPRM150:FPICTURE"]
-)
-
-bs_channels_jf_direct_beam = (
-    channels_gas_monitor
-    + channels_PBPS053
-    + channels_PSSS059
-    + channels_PBPS113
-    + channels_PBPS149
-    + channels_EVR
-)
-
-
-####################
-
-pvs_channels_PPRM150 = (
-    pvs_gas_monitor
+pvs_bernina = (
+    pvs_machine
+    # + pvs_RF
+    # + pvs_undulator
+    + pvs_gas_monitor
    + pvs_OAPU044
    + pvs_PBPS053
    + pvs_OATT053
@ -769,36 +957,13 @@ pvs_channels_PPRM150 = (
    + pvs_PSSS059
    + pvs_OOMH067
    + pvs_PSCR068
-    + pvs_OOMH084
-    + pvs_PPRM085
-    + pvs_OAPU107
-    + pvs_PBPS113
-    + pvs_PPRM113
-    + pvs_OLAS147
-    + pvs_OAPU149
-    + pvs_PBPS149
-    + pvs_PPRM150
-)
-
-pvs_channels_jf_direct_beam = (
-    pvs_gas_monitor
-    + pvs_OAPU044
-    + pvs_PBPS053
-    + pvs_OATT053
-    + pvs_PPRM053
-    + pvs_PSSS059
-    + pvs_OOMH067
-    + pvs_OOMH084
-    + pvs_PPRM085
-    + pvs_OAPU107
-    + pvs_PBPS113
-    + pvs_PPRM113
-    + pvs_OAPU149
-    + pvs_PBPS149
-    + pvs_OATA150
-    + pvs_OPPI151
-    + pvs_ODMV152
-    + pvs_OKBV153
-    + pvs_PSCD153
-    + pvs_OKBH154
+    + pvs_OAPU092
+#    + pvs_OOMV092
+#    + pvs_PPRM094
+#    + pvs_PSCR097
+    + pvs_ODCM098
+    + pvs_OAPU102
+    + pvs_PBPS103
+    + pvs_OPPI113
+#    + pvs_PPRM113_Bernina
 )