From d5c19462cbb2c761df9e6b210b76daeb49e7bc43 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Feb 2024 10:01:41 +0100 Subject: [PATCH] Feb 2024 --- .../camera_config/SARCL01-DSCR170.json | 1 + .../camera_config/SAROP31-PPRM113.json | 2 +- .../camera_config/SAROP31-PPRM150.json | 2 +- .../camera_config/SATBD01-DSCR120.json | 2 +- .../camera_config/SATES21-CAMS154-M2.json | 31 ++++++ .../camera_config/SATES30-CAMS182-GIGE4.json | 6 +- .../camera_config/SATOP11-PSAS079.json | 7 +- .../camera_config/SATOP21-PSCA162.json | 7 +- .../camera_config/SINEG01-DSCR190.json | 45 +++++---- .../camera_config/SINEG01-DSCR350.json | 45 +++++---- .../camera_config/SSL-LCAM-C1103.json | 28 ++++++ .../camera_config/SSL-LCAM-C1104.json | 28 ++++++ .../camera_config/permanent_instances.json | 1 + configuration/camera_config/servers.json | 19 +++- .../SARES11-SPEC125-M1_psen_db.json | 6 +- .../pipeline_config/SARES21-PBPS141_proc.json | 98 +++++++++++++++++++ .../pipeline_config/SAROP11-PBPS110_proc.json | 38 +++---- .../pipeline_config/SAROP11-PBPS122_proc.json | 38 +++---- .../pipeline_config/SAROP21-PBPS103_proc.json | 38 +++---- .../pipeline_config/SAROP21-PBPS133_proc.json | 38 +++---- .../pipeline_config/SATBD02-DSCR050_sp.json | 21 ++-- .../SATES21-CAMS154-GIGE6_proc.json | 11 ++- .../SATES21-CAMS154-GIGE8_proc.json | 9 ++ .../SATES21-CAMS154-M2_sp.json | 11 +++ .../SATES30-RIXS-CAM01_proc.json | 4 +- .../SATES31-CAMS187-RIXS1_sp.json | 7 +- .../pipeline_config/SATOP11-PSAS079_psas.json | 20 ++++ .../pipeline_config/SATOP11-PSAS079_sp.json | 11 +++ .../pipeline_config/SSL-LCAM-C1103_sp.json | 11 +++ .../pipeline_config/SSL-LCAM-C1104_sp.json | 11 +++ .../pipeline_config/permanent_instances.json | 10 +- configuration/pipeline_config/servers.json | 9 +- .../user_scripts/SARES11-SPEC125-M1_tt.py | 2 +- 33 files changed, 459 insertions(+), 158 deletions(-) create mode 100644 configuration/camera_config/SATES21-CAMS154-M2.json create mode 100644 configuration/camera_config/SSL-LCAM-C1103.json create mode 100644 configuration/camera_config/SSL-LCAM-C1104.json create mode 100644 configuration/pipeline_config/SARES21-PBPS141_proc.json create mode 100644 configuration/pipeline_config/SATES21-CAMS154-GIGE8_proc.json create mode 100644 configuration/pipeline_config/SATES21-CAMS154-M2_sp.json create mode 100644 configuration/pipeline_config/SATOP11-PSAS079_psas.json create mode 100644 configuration/pipeline_config/SATOP11-PSAS079_sp.json create mode 100644 configuration/pipeline_config/SSL-LCAM-C1103_sp.json create mode 100644 configuration/pipeline_config/SSL-LCAM-C1104_sp.json diff --git a/configuration/camera_config/SARCL01-DSCR170.json b/configuration/camera_config/SARCL01-DSCR170.json index c827d95..04814b2 100644 --- a/configuration/camera_config/SARCL01-DSCR170.json +++ b/configuration/camera_config/SARCL01-DSCR170.json @@ -19,6 +19,7 @@ "source_type": "bsread", "name": "SARCL01-DSCR170", "source": "SARCL01-DSCR170", + "prefix": "SARCL01-DSCR170", "group": [ "Electrons" ], diff --git a/configuration/camera_config/SAROP31-PPRM113.json b/configuration/camera_config/SAROP31-PPRM113.json index f270415..a4e662e 100644 --- a/configuration/camera_config/SAROP31-PPRM113.json +++ b/configuration/camera_config/SAROP31-PPRM113.json @@ -16,7 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "bsread", + "source_type": "epics", "name": "SAROP31-PPRM113", "source": "SAROP31-PPRM113", "forwarder_port": 9000, diff --git a/configuration/camera_config/SAROP31-PPRM150.json b/configuration/camera_config/SAROP31-PPRM150.json index f25ba23..5e3564f 100644 --- a/configuration/camera_config/SAROP31-PPRM150.json +++ b/configuration/camera_config/SAROP31-PPRM150.json @@ -17,7 +17,7 @@ "roi": null, "image_background": null, "forwarder_port": 9002, - "source_type": "bsread", + "source_type": "epics", "name": "SAROP31-PPRM150", "source": "SAROP31-PPRM150", "group": [ diff --git a/configuration/camera_config/SATBD01-DSCR120.json b/configuration/camera_config/SATBD01-DSCR120.json index cb61f5e..5a84d4a 100644 --- a/configuration/camera_config/SATBD01-DSCR120.json +++ b/configuration/camera_config/SATBD01-DSCR120.json @@ -16,7 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "bsread", + "source_type": "epics", "name": "SATBD01-DSCR120", "source": "SATBD01-DSCR120", "group": [ diff --git a/configuration/camera_config/SATES21-CAMS154-M2.json b/configuration/camera_config/SATES21-CAMS154-M2.json new file mode 100644 index 0000000..f7685cb --- /dev/null +++ b/configuration/camera_config/SATES21-CAMS154-M2.json @@ -0,0 +1,31 @@ +{ + "camera_calibration": { + "reference_marker": [ + 0, + 0, + 100, + 100 + ], + "reference_marker_width": 100.0, + "reference_marker_height": 100.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SATES21-CAMS154-M2", + "prefix": "SATES21-CAMS154-M2", + "source": "SATES21-CAMS154-M2", + "connections": 2, + "buffer_size": 0, + "buffer_logs": false, + "forwarder_port": 9004, + "protocol": "tcp", + "group": [ + "Photonics", + "Maloja" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE4.json b/configuration/camera_config/SATES30-CAMS182-GIGE4.json index 555277b..cdc733b 100644 --- a/configuration/camera_config/SATES30-CAMS182-GIGE4.json +++ b/configuration/camera_config/SATES30-CAMS182-GIGE4.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 312, + 477, 157, - 378, - 292 + 547, + 375 ], "reference_marker_width": 5000.0, "reference_marker_height": 7000.0, diff --git a/configuration/camera_config/SATOP11-PSAS079.json b/configuration/camera_config/SATOP11-PSAS079.json index 187d50f..1d44176 100644 --- a/configuration/camera_config/SATOP11-PSAS079.json +++ b/configuration/camera_config/SATOP11-PSAS079.json @@ -16,7 +16,10 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "source": "SATOP11-PSAS079", - "name": "SATOP11-PSAS079" + "name": "SATOP11-PSAS079", + "group": [ + "Photonics" + ] } \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PSCA162.json b/configuration/camera_config/SATOP21-PSCA162.json index d939eaf..6f3f7ad 100644 --- a/configuration/camera_config/SATOP21-PSCA162.json +++ b/configuration/camera_config/SATOP21-PSCA162.json @@ -18,5 +18,10 @@ "image_background": null, "source_type": "epics", "name": "SATOP21-PSCA162", - "source": "SATOP21-PSCA162" + "source": "SATOP21-PSCA162", + "group": [ + "Photonics", + "Athos", + "Maloja" + ] } \ No newline at end of file diff --git a/configuration/camera_config/SINEG01-DSCR190.json b/configuration/camera_config/SINEG01-DSCR190.json index a9b0382..e7c748c 100644 --- a/configuration/camera_config/SINEG01-DSCR190.json +++ b/configuration/camera_config/SINEG01-DSCR190.json @@ -1,21 +1,26 @@ { - "name": "SINEG01-DSCR190", - "camera_calibration": { - "angle_horizontal": 0.0, - "angle_vertical": 0.0, - "reference_marker_height": 30000.0, - "reference_marker": [ - 45, - 49, - 1168, - 1156 - ], - "reference_marker_width": 30000.0 - }, - "source": "SINEG01-DSCR190", - "mirror_y": true, - "rotate": 0, - "mirror_x": false, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 24, + 49, + 1147, + 1156 + ], + "reference_marker_width": 30000.0, + "reference_marker_height": 30000.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SINEG01-DSCR190", + "source": "SINEG01-DSCR190", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SINEG01-DSCR350.json b/configuration/camera_config/SINEG01-DSCR350.json index 76e0495..c8bf131 100644 --- a/configuration/camera_config/SINEG01-DSCR350.json +++ b/configuration/camera_config/SINEG01-DSCR350.json @@ -1,21 +1,26 @@ { - "name": "SINEG01-DSCR350", - "camera_calibration": { - "angle_horizontal": 0.0, - "angle_vertical": 0.0, - "reference_marker_height": 16000.0, - "reference_marker": [ - 120, - 245, - 1251, - 1504 - ], - "reference_marker_width": 16000.0 - }, - "source": "SINEG01-DSCR350", - "mirror_y": true, - "rotate": 0, - "mirror_x": true, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 120, + 245, + 1251, + 1504 + ], + "reference_marker_width": 16000.0, + "reference_marker_height": 16000.0, + "angle_horizontal": 15.8, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SINEG01-DSCR350", + "source": "SINEG01-DSCR350", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SSL-LCAM-C1103.json b/configuration/camera_config/SSL-LCAM-C1103.json new file mode 100644 index 0000000..49e7366 --- /dev/null +++ b/configuration/camera_config/SSL-LCAM-C1103.json @@ -0,0 +1,28 @@ +{ + "camera_calibration": { + "reference_marker": [ + 0, + 0, + 1984, + 1264 + ], + "reference_marker_width": 50790.4, + "reference_marker_height": 32358.4, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "source": "SSL-LCAM-C1103:RF", + "prefix": "SSL-LCAM-C1103", + "name": "SSL-LCAM-C1103", + "group": [ + "Laser", + "SSL1" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SSL-LCAM-C1104.json b/configuration/camera_config/SSL-LCAM-C1104.json new file mode 100644 index 0000000..e771165 --- /dev/null +++ b/configuration/camera_config/SSL-LCAM-C1104.json @@ -0,0 +1,28 @@ +{ + "camera_calibration": { + "reference_marker": [ + 0, + 0, + 1984, + 1264 + ], + "reference_marker_width": 28966.4, + "reference_marker_height": 18454.4, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "source": "SSL-LCAM-C1104:RF", + "prefix": "SSL-LCAM-C1104", + "name": "SSL-LCAM-C1104", + "group": [ + "Laser", + "SSL1" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/permanent_instances.json b/configuration/camera_config/permanent_instances.json index 496466b..972cb87 100644 --- a/configuration/camera_config/permanent_instances.json +++ b/configuration/camera_config/permanent_instances.json @@ -27,6 +27,7 @@ "SATES21-CAMS154-GIGE7": "SATES21-CAMS154-GIGE7", "SATES21-CAMS154-GIGE8": "SATES21-CAMS154-GIGE8", "SATES21-CAMS154-M1": "SATES21-CAMS154-M1", + "SATES21-CAMS154-M2": "SATES21-CAMS154-M2", "SATES24-CAMS161-M1": "SATES24-CAMS161-M1", "SATES30-CAMS182-GIGE1": "SATES30-CAMS182-GIGE1", "SATES30-CAMS182-GIGE2": "SATES30-CAMS182-GIGE2", diff --git a/configuration/camera_config/servers.json b/configuration/camera_config/servers.json index 6e8d2db..d816cf3 100644 --- a/configuration/camera_config/servers.json +++ b/configuration/camera_config/servers.json @@ -10,7 +10,10 @@ "http://sf-daqsync-01.psi.ch:8880": { "enabled": true, "expanding": true, - "instances": [] + "instances": [ + "SARBD02-DSCR050", + "#SATBD01-DSCR120" + ] }, "http://sf-daqsync-03.psi.ch:8880": { "enabled": true, @@ -18,7 +21,8 @@ "instances": [ "SARFE10-PPRM064", "SATOP31-PMOS132-2D", - "SATOP21-PMOS127-2D" + "SATOP21-PMOS127-2D", + "SATOP11-PSAS079" ] }, "http://sf-daqsync-08.psi.ch:8880": { @@ -40,8 +44,7 @@ "SATBD01-DSCR120", "S10BD01-DSCR030", "SATBD02-DSCR050", - "SARCL01-DSCR170", - "SARBD02-DSCR050" + "SARCL01-DSCR170" ] }, "http://sf-daqsync-11.psi.ch:8880": { @@ -58,6 +61,7 @@ "instances": [ "SATES21-CAMS154-M1", "SATES24-CAMS161-M1", + "SATES21-CAMS154-M2", "SATES21-CAMS-PATT1", "SATES21-CAMS154-GIGE1", "SATES21-CAMS154-GIGE2", @@ -113,6 +117,8 @@ "SATES31-CAMS187-RIXS1", "SATES30-CAMS182-GIGE1", "SATES30-CAMS182-GIGE2", + "SATES30-CAMS182-GIGE3", + "SATES30-CAMS182-GIGE4", "SATES30-RIXS-CAM01" ] }, @@ -130,7 +136,10 @@ "enabled": true, "expanding": false, "instances": [ - "#SATES30-CAMS182-GIGE2" + "#SATES30-CAMS182-GIGE2", + "#SARCL01-DSCR170", + "#SATBD02-DSCR050", + "#SINDI02-DSCR075" ] }, "http://sf-daqsync-18.psi.ch:8880": { diff --git a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json index daec940..aa97224 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json @@ -1,12 +1,12 @@ { "image_background_enable": "passive", - "image_background": "SARES11-SPEC125-M1_20231130_141405_968258", + "image_background": "SARES11-SPEC125-M1_20240130_101226_381784", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "function": "SARES11-SPEC125-M1_2tt.py", + "function": "SARES11-SPEC125-M1_tt.py", "camera_name": "SARES11-SPEC125-M1", "name": "SARES11-SPEC125-M1_psen_db", "mode": "PUSH", @@ -15,7 +15,7 @@ 0, 2048, 75, - 250 + 400 ], "roi_signal2": [ 0, diff --git a/configuration/pipeline_config/SARES21-PBPS141_proc.json b/configuration/pipeline_config/SARES21-PBPS141_proc.json new file mode 100644 index 0000000..0532b13 --- /dev/null +++ b/configuration/pipeline_config/SARES21-PBPS141_proc.json @@ -0,0 +1,98 @@ +{ + "pipeline_type": "stream", + "name": "SARES21-PBPS141_proc", + "bsread_address": "", + "bsread_channels": [ + "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD0", + "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD1", + "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD2", + "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD3" + ], + "mode": "PUSH", + "function": "pbps_full.py", + "reload": true, + "allow_type_changes": false, + "abort_on_timeout": true, + "abort_on_error": false, + "debug": true, + "block": false, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true, + "stream_timeout": 20, + "no_client_timeout": 0, + "processing_threads": 1, + "up": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD1", + "down": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD2", + "right": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD3", + "left": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD0", + "up_calib": 1.3175436096394441e-05, + "down_calib": 1.5036546627308606e-05, + "left_calib": 3.1887584275696484e-05, + "right_calib": 3.722003831579624e-05, + "horiz_calib": -3.9446335571333027, + "vert_calib": -7.009396901398793, + "uJ_calib": 941.943984588351, + "threshold": 0, + "queue_length": 300, + "xpos_all_x_pvname": "SARES21-PBPS141:XPOS-ALL-HIST-X", + "xpos_all_y_pvname": "SARES21-PBPS141:XPOS-ALL-HIST-Y", + "xpos_all_m_pvname": "SARES21-PBPS141:XPOS-ALL-HIST-M", + "xpos_all_w_pvname": "SARES21-PBPS141:XPOS-ALL-HIST-W", + "ypos_all_x_pvname": "SARES21-PBPS141:YPOS-ALL-HIST-X", + "ypos_all_y_pvname": "SARES21-PBPS141:YPOS-ALL-HIST-Y", + "ypos_all_m_pvname": "SARES21-PBPS141:YPOS-ALL-HIST-M", + "ypos_all_w_pvname": "SARES21-PBPS141:YPOS-ALL-HIST-W", + "xpos_evn_x_pvname": "SARES21-PBPS141:XPOS-EVN-HIST-X", + "xpos_evn_y_pvname": "SARES21-PBPS141:XPOS-EVN-HIST-Y", + "xpos_evn_m_pvname": "SARES21-PBPS141:XPOS-EVN-HIST-M", + "xpos_evn_w_pvname": "SARES21-PBPS141:XPOS-EVN-HIST-W", + "ypos_evn_x_pvname": "SARES21-PBPS141:YPOS-EVN-HIST-X", + "ypos_evn_y_pvname": "SARES21-PBPS141:YPOS-EVN-HIST-Y", + "ypos_evn_m_pvname": "SARES21-PBPS141:YPOS-EVN-HIST-M", + "ypos_evn_w_pvname": "SARES21-PBPS141:YPOS-EVN-HIST-W", + "xpos_odd_x_pvname": "SARES21-PBPS141:XPOS-ODD-HIST-X", + "xpos_odd_y_pvname": "SARES21-PBPS141:XPOS-ODD-HIST-Y", + "xpos_odd_m_pvname": "SARES21-PBPS141:XPOS-ODD-HIST-M", + "xpos_odd_w_pvname": "SARES21-PBPS141:XPOS-ODD-HIST-W", + "ypos_odd_x_pvname": "SARES21-PBPS141:YPOS-ODD-HIST-X", + "ypos_odd_y_pvname": "SARES21-PBPS141:YPOS-ODD-HIST-Y", + "ypos_odd_m_pvname": "SARES21-PBPS141:YPOS-ODD-HIST-M", + "ypos_odd_w_pvname": "SARES21-PBPS141:YPOS-ODD-HIST-W", + "xpos_dif_m_pvname": "SARES21-PBPS141:XPOS-DIF-HIST-M", + "xpos_dif_w_pvname": "SARES21-PBPS141:XPOS-DIF-HIST-W", + "ypos_dif_m_pvname": "SARES21-PBPS141:YPOS-DIF-HIST-M", + "ypos_dif_w_pvname": "SARES21-PBPS141:YPOS-DIF-HIST-W", + "port": "9013", + "calib_x_range": [ + -0.3, + 0.0, + 0.3 + ], + "calib_x_norm": [ + 0.07635186735124318, + 0.0006787788287971773, + -0.07575351615516294 + ], + "calib_x_norm_std": [ + 0.11111011715402397, + 0.10803039641898522, + 0.10654207734466892 + ], + "calib_y_range": [ + -0.3, + 0.0, + 0.3 + ], + "calib_y_norm": [ + 0.04025605145908799, + -0.00028632736218344964, + -0.045343324413073594 + ], + "calib_y_norm_std": [ + 0.11130579296839123, + 0.11052246554408188, + 0.11072063526778356 + ], + "calib_datetime": "2023-12-05 07:36:57" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PBPS110_proc.json b/configuration/pipeline_config/SAROP11-PBPS110_proc.json index 503d960..11ef85c 100644 --- a/configuration/pipeline_config/SAROP11-PBPS110_proc.json +++ b/configuration/pipeline_config/SAROP11-PBPS110_proc.json @@ -26,12 +26,12 @@ "down": "SAROP11-CVME-PBPS2:Lnk9Ch11-DATA-SUM", "right": "SAROP11-CVME-PBPS2:Lnk9Ch14-DATA-SUM", "left": "SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM", - "up_calib": 7.852328164299955, - "down_calib": 9.359921504121692, - "left_calib": 7.8359272358887235, - "right_calib": 8.95233298718808, - "horiz_calib": -5.177498736180698, - "vert_calib": 5.6124443438633635, + "up_calib": 0.911828773893007, + "down_calib": 1.0875477835228293, + "left_calib": 0.9557541802547133, + "right_calib": 1.023654851874409, + "horiz_calib": -4.633887216795798, + "vert_calib": 5.3294283727255705, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 5000, @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.053477701499551306, - 0.002010027303857127, - -0.0624083721767513 + 0.06434354472247358, + 0.0007553750703822087, + -0.06513737959205539 ], "calib_y_range": [ -0.3, @@ -79,19 +79,19 @@ 0.3 ], "calib_y_norm": [ - -0.05708126055992021, - -0.0014145962948527093, - 0.049824031188057456 + -0.05383005707722167, + 0.0011933783885959858, + 0.058752373539656774 ], - "calib_datetime": "2023-11-27 18:32:01", + "calib_datetime": "2024-01-31 10:06:41", "calib_x_norm_std": [ - 0.8405729474786395, - 0.7912252362742299, - 0.8749748472341693 + 0.09781978276098474, + 0.10949423250842817, + 0.08584591311926743 ], "calib_y_norm_std": [ - 0.829282029537981, - 0.8273938236773883, - 0.8256896298568531 + 0.07300807348677127, + 0.14544169687653924, + 0.11644860775951334 ] } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PBPS122_proc.json b/configuration/pipeline_config/SAROP11-PBPS122_proc.json index 5be11bd..fd40699 100644 --- a/configuration/pipeline_config/SAROP11-PBPS122_proc.json +++ b/configuration/pipeline_config/SAROP11-PBPS122_proc.json @@ -27,12 +27,12 @@ "down": "SAROP11-PBPS122:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP11-PBPS122:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP11-PBPS122:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 8.260394053837945e-05, - "down_calib": 0.0001053082076374567, - "left_calib": 8.850560063440816e-05, - "right_calib": 0.00010465952581699319, - "horiz_calib": -5.671978410741236, - "vert_calib": -5.633880294004439, + "up_calib": 9.645489672574209e-06, + "down_calib": 1.2582008271714206e-05, + "left_calib": 6.921684791236726e-06, + "right_calib": 6.863877395554986e-06, + "horiz_calib": -4.279019192875421, + "vert_calib": -4.332948289712399, "uJ_calib": 605.9512700123181, "threshold": 0, "queue_length": 1000, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.05093945114235838, - -0.0017631144492631953, - -0.05484374416454858 + 0.07021082090199846, + 0.0005210247215771878, + -0.07000822765917689 ], "calib_x_norm_std": [ - 0.6318974367582005, - 0.6355268212490287, - 0.6720457022563601 + 0.026085454412408775, + 0.02892082203672501, + 0.02649234690711122 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.053566888769106424, - 0.00025161571193160266, - -0.05293164664324844 + 0.06975188386083704, + 0.0008026225966396075, + -0.06872195886296457 ], "calib_y_norm_std": [ - 0.6701382766699944, - 0.6807018300686237, - 0.6593694552297956 + 0.031944251463484, + 0.03089150841401929, + 0.030150230385363422 ], - "calib_datetime": "2023-11-28 17:45:39" + "calib_datetime": "2024-01-30 10:28:41" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PBPS103_proc.json b/configuration/pipeline_config/SAROP21-PBPS103_proc.json index 3488bfe..ef6d351 100644 --- a/configuration/pipeline_config/SAROP21-PBPS103_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS103_proc.json @@ -10,19 +10,19 @@ "check_timestamp": true, "stream_timeout": 20, "queue_length": 5000, - "down_calib": 2.345095029254029e-06, + "down_calib": 2.5755023981017933e-05, "xpos_odd_w_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-W", "ypos_all_y_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-Y", "ypos_all_w_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-W", "name": "SAROP21-PBPS103_proc", - "vert_calib": -4.107388665528667, + "vert_calib": -4.217739993270827, "bsread_address": "", "right": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD3", "ypos_dif_w_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-W", "ypos_odd_x_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-X", "function": "pbps_fft", "port": "9009", - "left_calib": 1.8604645624663628e-06, + "left_calib": 1.9425922043619432e-05, "down": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD2", "ypos_odd_w_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-W", "xpos_odd_y_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-Y", @@ -32,7 +32,7 @@ "ypos_evn_x_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-X", "uJ_calib": 605.9512700123181, "xpos_evn_m_pvname": "SAROP21-PBPS103:XPOS-EVN-HIST-M", - "horiz_calib": -3.7979163733652124, + "horiz_calib": -4.1599251028026085, "ypos_all_m_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-M", "ypos_dif_m_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-M", "bsread_channels": [ @@ -45,7 +45,7 @@ "ypos_evn_w_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-W", "pipeline_type": "stream", "ypos_all_x_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-X", - "right_calib": 1.938280827709179e-06, + "right_calib": 2.1594373024654728e-05, "xpos_all_m_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-M", "xpos_odd_m_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-M", "left": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD0", @@ -58,7 +58,7 @@ "ypos_evn_y_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-Y", "xpos_odd_x_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-X", "threshold": 0, - "up_calib": 2.237138787544513e-06, + "up_calib": 2.467482041172208e-05, "ypos_odd_m_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-M", "xpos_all_x_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-X", "up": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD1", @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.07954047295712068, - -0.004129649086041158, - -0.07844088866732161 + 0.07215335742303826, + -0.0005049983029482148, + -0.07208000860457851 ], "calib_y_range": [ -0.3, @@ -79,19 +79,19 @@ 0.3 ], "calib_y_norm": [ - 0.07343998285666285, - 0.0008404504608791769, - -0.072638231030304 + 0.07329543334108214, + 0.0006596427988468453, + -0.06896084631514773 ], "calib_x_norm_std": [ - 0.02615166241705118, - 0.03146081595118508, - 0.026519528573341077 + 0.4396215228842542, + 0.41591417762080635, + 0.4103443291467783 ], "calib_y_norm_std": [ - 0.03475168509244215, - 0.0329588972422198, - 0.032931411355669175 + 0.43343158044697055, + 0.4426383133355521, + 0.4360493015968147 ], - "calib_datetime": "2023-12-16 22:17:50" + "calib_datetime": "2024-02-01 09:30:35" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PBPS133_proc.json b/configuration/pipeline_config/SAROP21-PBPS133_proc.json index 419a2b0..15e8322 100644 --- a/configuration/pipeline_config/SAROP21-PBPS133_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS133_proc.json @@ -27,12 +27,12 @@ "down": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 2.302287768621037e-06, - "down_calib": 2.1486832052818416e-06, - "left_calib": 1.980886505345383e-06, - "right_calib": 1.7496940589950085e-06, - "horiz_calib": -3.6194086573180084, - "vert_calib": -4.05561350847352, + "up_calib": 2.729326173037096e-05, + "down_calib": 2.468659381685747e-05, + "left_calib": 2.2631729793803216e-05, + "right_calib": 2.087266439060002e-05, + "horiz_calib": -4.006379249756593, + "vert_calib": -4.105091490407538, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 3000, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.08387188111710729, - 0.002629121476999102, - -0.08190105496372796 + 0.07442929006531175, + -0.0016482193138825406, + -0.07533186897534892 ], "calib_x_norm_std": [ - 0.030074237123352995, - 0.03202154895295221, - 0.03065461541856456 + 0.45066097364535607, + 0.4589954232321951, + 0.4636806356577685 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.07343671569103251, - -0.0007935082666288781, - -0.07450637571706177 + 0.07291506684804762, + 0.00021505381542338768, + -0.07324489119479595 ], "calib_y_norm_std": [ - 0.03632897978156685, - 0.036921705511352064, - 0.03616553762276342 + 0.46075595797861424, + 0.4716494592430148, + 0.4500934976801521 ], - "calib_datetime": "2023-12-16 22:11:42" + "calib_datetime": "2024-02-01 11:11:42" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD02-DSCR050_sp.json b/configuration/pipeline_config/SATBD02-DSCR050_sp.json index 4847c97..e43c50f 100644 --- a/configuration/pipeline_config/SATBD02-DSCR050_sp.json +++ b/configuration/pipeline_config/SATBD02-DSCR050_sp.json @@ -2,8 +2,16 @@ "image_background_enable": false, "image_background": "SATBD02-DSCR050_20230923_150234_114901", "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, + "image_region_of_interest": [ + 257, + 1493, + 404, + 1553 + ], + "image_good_region": { + "threshold": 0.05, + "gfscale": 5.0 + }, "image_slices": null, "pipeline_type": "processing", "camera_name": "SATBD02-DSCR050", @@ -11,11 +19,8 @@ "max_frame_rate": 20.1, "no_client_timeout": 0, "port": "9020", - "Marker": [ - 1020, - 1004 - ], "reload": true, - "function": "beam_full_width", - "fw_threshold": 0.2 + "function": "bunch_length_op", + "fw_threshold": 0.1, + "replace": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json index 5a32a47..8eb0e54 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json @@ -1,9 +1,16 @@ { + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE6", "name": "SATES21-CAMS154-GIGE6_proc", - "function": "pprm_simple.py", + "function": "cs_test.py", "mode": "PUSH", "allow_type_changes": false, - "block": false + "block": false, + "reload": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE8_proc.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE8_proc.json new file mode 100644 index 0000000..a379e9e --- /dev/null +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE8_proc.json @@ -0,0 +1,9 @@ +{ + "pipeline_type": "processing", + "camera_name": "SATES21-CAMS154-GIGE8", + "name": "SATES21-CAMS154-GIGE8_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json b/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json new file mode 100644 index 0000000..1d72b01 --- /dev/null +++ b/configuration/pipeline_config/SATES21-CAMS154-M2_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-CAMS154-M2", + "name": "SATES21-CAMS154-M2_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json b/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json index b9b7504..4def75d 100644 --- a/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json +++ b/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json @@ -1,6 +1,6 @@ { "image_background_enable": true, - "image_background": "SATES30-RIXS-CAM01_20231020_165644_515835", + "image_background": "SATES30-RIXS-CAM01_20240130_153206_238813", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -12,7 +12,7 @@ "mode": "PUB", "allow_type_changes": false, "block": false, - "threshold": 280.0, + "threshold": 80.0, "threshold_file": "", "_max_frame_rate": 5.1, "libs": "", diff --git a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json index f8ee493..1379fb4 100644 --- a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json +++ b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json @@ -2,12 +2,7 @@ "image_background_enable": false, "image_background": "SATES31-CAMS187-RIXS1_20231024_235607_038268", "image_threshold": null, - "image_region_of_interest": [ - 17, - 2413, - 923, - 276 - ], + "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", diff --git a/configuration/pipeline_config/SATOP11-PSAS079_psas.json b/configuration/pipeline_config/SATOP11-PSAS079_psas.json new file mode 100644 index 0000000..6d14014 --- /dev/null +++ b/configuration/pipeline_config/SATOP11-PSAS079_psas.json @@ -0,0 +1,20 @@ +{ + "image_background_enable": false, + "image_background": "SATOP21-PMOS127-2D_20230503_074443_285170", + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATOP11-PSAS079", + "name": "SATOP11-PSAS079_psas", + "function": "pmos132-2D.py", + "mode": "PUB", + "allow_type_changes": false, + "no_client_timeout": 0, + "reload": true, + "processing_threads": 6, + "thread_buffer_size": 30, + "abort_on_error": false, + "pixel_bkg": 1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP11-PSAS079_sp.json b/configuration/pipeline_config/SATOP11-PSAS079_sp.json new file mode 100644 index 0000000..92def00 --- /dev/null +++ b/configuration/pipeline_config/SATOP11-PSAS079_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATOP11-PSAS079", + "name": "SATOP11-PSAS079_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SSL-LCAM-C1103_sp.json b/configuration/pipeline_config/SSL-LCAM-C1103_sp.json new file mode 100644 index 0000000..9af983f --- /dev/null +++ b/configuration/pipeline_config/SSL-LCAM-C1103_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SSL-LCAM-C1103", + "name": "SSL-LCAM-C1103_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SSL-LCAM-C1104_sp.json b/configuration/pipeline_config/SSL-LCAM-C1104_sp.json new file mode 100644 index 0000000..a720859 --- /dev/null +++ b/configuration/pipeline_config/SSL-LCAM-C1104_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SSL-LCAM-C1104", + "name": "SSL-LCAM-C1104_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 95cb4b5..4ed4d49 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -1,11 +1,11 @@ { "#S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles", - "#SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db", "#SARES11-SPEC125-M1_test": "SARES11-SPEC125-M1_test", "#SARES11-SPEC125-M2_db": "SARES11-SPEC125-M2_db", "#SARES11-SPEC125-M2_pp_db": "SARES11-SPEC125-M2_pp_db", "#SARES11-SPEC125-M2_psen_db": "SARES11-SPEC125-M2_psen_db", "#SARES11-SPEC125-M3_sp": "SARES11-SPEC125-M3_sp", + "#SARES11-SPEC125-M3_spec_db": "SARES11-SPEC125-M3_spec_db", "#SARES11-XMI125-C4P1_db": "SARES11-XMI125-C4P1_db", "#SARES12-CAMS128-M1_psen_db": "SARES12-CAMS128-M1_psen_db", "#SARES20-CAMS142-M1_psen_db": "SARES20-CAMS142-M1_psen_db", @@ -13,6 +13,8 @@ "#SARFE10-PSSS059_store": "SARFE10-PSSS059_store", "#SAROP11-ATT01_proc": "SAROP11-ATT01_proc", "#SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc", + "#SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc", + "#SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc", "#SATBD02-DSCR050_db": "SATBD02-DSCR050_db", "#SATES21-CAMS154-GIGE1_proc": "SATES21-CAMS154-GIGE1_proc", "#SATES21-CAMS154-GIGE2_proc": "SATES21-CAMS154-GIGE2_proc", @@ -38,7 +40,7 @@ "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles", "SARBD01-DSCR110_sp1": "SARBD01-DSCR110_sp_rep", "SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles", - "SARES11-SPEC125-M3_spec_db": "SARES11-SPEC125-M3_spec_db", + "SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db", "SARES20-CAMS142-M3_proc": "SARES20-CAMS142-M3_proc", "SARES20-CAMS142-M4_psen_db": "SARES20-CAMS142-M4_psen_db", "SARES20-CAMS142-M5_psen_db": "SARES20-CAMS142-M5_psen_db", @@ -46,6 +48,7 @@ "SARES20-DSDPPRM_proc": "SARES20-DSDPPRM_proc", "SARES20-PROF141-M1_proc": "SARES20-PROF141-M1_proc", "SARES20-PROF142-M1_proc": "SARES20-PROF142-M1_proc", + "SARES21-PBPS141_proc": "SARES21-PBPS141_proc", "SARES30-CAMS156-SMX-OAV_db": "SARES30-CAMS156-SMX-OAV_db", "SARES30-CAMS156-XE_proc": "SARES30-CAMS156-XE_proc", "SARFE10-PBPS053_proc": "SARFE10-PBPS053_proc", @@ -64,8 +67,6 @@ "SAROP21-PPRM138_proc": "SAROP21-PPRM138_proc", "SAROP31-PBPS113_proc": "SAROP31-PBPS113_proc", "SAROP31-PBPS149_proc": "SAROP31-PBPS149_proc", - "SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc", - "SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc", "SATBD02-DSCR050_sp": "SATBD02-DSCR050_sp", "SATBD02-DSCR050_sp1": "SATBD02-DSCR050_sp_rep", "SATES21-CAMS-PATT1_spec_db": "SATES21-CAMS-PATT1_spec_db", @@ -78,6 +79,7 @@ "SATES30-RIXS-CAM01_repeater": "SATES30-RIXS-CAM01_repeater", "SATES31-CAMS187-RIXS1_proc": "SATES31-CAMS187-RIXS1_proc", "SATES31-CAMS187-RIXS1_sp": "SATES31-CAMS187-RIXS1_sp", + "SATOP11-PSAS079_psas": "SATOP11-PSAS079_psas", "SATOP21-PMOS127-2D_pmos": "SATOP21-PMOS127-2D_pmos", "SATOP31-PMOS132-2D_pmos": "SATOP31-PMOS132-2D_pmos", "SINDI02-DSCR075_profiles": "SINDI02-DSCR075_profiles", diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index 6f5197f..ff02bbd 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -32,6 +32,7 @@ "SAROP21-ATT01_proc:9003", "test_stream:9006", "SARFE10-PSSS059_psss_avg:9012", + "SATOP11-PSAS079_psas:9002", "SAROP21-PBPS103_proc:9009", "SAROP11-PBPS110_proc:9007", "SAROP31-PBPS113_proc:9013", @@ -42,6 +43,7 @@ "SAROP21-PBPS133_proc:9008", "SAROP21-PBPS138_proc", "SATOP31-PMOS132-2D_sp", + "SARES21-PBPS141_proc:9018", "SATOP21-PMOS127-2D_pmos:9017", "SARFE10-PPRM064_sp", "SARFE10-PPRM064_proc:9014", @@ -133,6 +135,7 @@ "http://sf-daqsync-12.psi.ch:8881": { "cameras": [ "SATES21-CAMS154-M1", + "SATES21-CAMS154-M2", "SATES24-CAMS161-M1", "SATES21-CAMS-PATT1", "SATES21-CAMS154-GIGE1", @@ -177,7 +180,7 @@ "enabled": true, "expanding": false, "instances": [ - "#SARES11-SPEC125-M1_psen_db:9001", + "SARES11-SPEC125-M1_psen_db:9001", "#SARES11-SPEC125-M1_test:9009", "#SARES11-SPEC125-M2_psen_db:9011", "#SARES12-CAMS128-M1_psen_db:9003", @@ -185,7 +188,7 @@ "#SARES11-SPEC125-M2_pp_db", "#SARES11-SPEC125-M2_db:9011", "#SARES11-SPEC125-M3_sp", - "SARES11-SPEC125-M3_spec_db", + "#SARES11-SPEC125-M3_spec_db", "SAROP11-PPRM122_proc:9012" ] }, @@ -249,6 +252,8 @@ "SATES31-CAMS187-RIXS1", "SATES30-CAMS182-GIGE1", "SATES30-CAMS182-GIGE2", + "SATES30-CAMS182-GIGE3", + "SATES30-CAMS182-GIGE4", "SATES30-RIXS-CAM01" ], "enabled": true, diff --git a/configuration/user_scripts/SARES11-SPEC125-M1_tt.py b/configuration/user_scripts/SARES11-SPEC125-M1_tt.py index 16d1cb7..26e9711 100644 --- a/configuration/user_scripts/SARES11-SPEC125-M1_tt.py +++ b/configuration/user_scripts/SARES11-SPEC125-M1_tt.py @@ -11,7 +11,7 @@ import numpy as np _logger = getLogger(__name__) # Alvra spectral encoder constants/waveforms -px2fs = 2.1 # calibration from ... +px2fs = 2.152 # calibration from ... #lambdas = 528.34 + 0.0261*np.arange(0,2048) # calibration from 2021-10-06 lambdas = np.linspace(504.17385, 608.07410, num=2048) # calibration from 2023-04-25 #lambdas = np.linspace(510.57796, 628.63459, num=2048) # calibration from 2022-05-18