From 07ae1f03d45661a201ee7441e43af60e3a07444a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 7 Mar 2023 15:27:37 +0100 Subject: [PATCH] Image instance forwarder --- .../camera_config/S10BC02-DSRM310.json | 5 +- .../camera_config/S10BD01-DSCR030.json | 3 +- .../camera_config/SARCL01-DSCR170.json | 3 +- .../camera_config/SARES11-SPEC125-M1.json | 1 + .../camera_config/SARES11-SPEC125-M2.json | 3 +- .../camera_config/SARES11-XMI125-C4P1.json | 3 +- .../camera_config/SARES12-XPR128-C4F1.json | 3 +- .../camera_config/SARES20-CAMS142-C2.json | 14 +-- .../camera_config/SARES20-CAMS142-M1.json | 1 + .../camera_config/SARES20-CAMS142-M3.json | 46 ++----- .../camera_config/SARES20-CAMS142-M4.json | 1 + .../camera_config/SARES20-CAMS142-M5.json | 1 + .../camera_config/SARES20-PROF141-M1.json | 11 +- .../camera_config/SARES30-CAMS156-XE.json | 1 + .../camera_config/SARFE10-PPRM064.json | 3 +- .../camera_config/SARFE10-PSSS059.json | 3 +- .../camera_config/SAROP21-PPRM138.json | 1 + .../camera_config/SAROP31-PPRM113.json | 1 + .../camera_config/SAROP31-PPRM150.json | 1 + .../camera_config/SATBD02-DSCR050.json | 3 +- .../camera_config/SATES21-CAMS-PATT1.json | 3 +- .../camera_config/SATES21-CAMS154-M1.json | 5 +- .../camera_config/SATES24-CAMS161-M1.json | 3 +- .../camera_config/SATES30-CAMS182-GIGE1.json | 11 +- .../camera_config/SATES30-CAMS182-GIGE2.json | 1 + .../camera_config/SATES31-CAMS187-RIXS1.json | 1 + .../camera_config/SATOP31-PMOS132-2D.json | 3 +- .../camera_config/SATOP31-PSCA158.json | 26 ++++ .../camera_config/SINBC02-DSRM310.json | 3 +- .../camera_config/SINDI02-DSCR075.json | 3 +- .../camera_config/SLAAR02-LPMO02-C321.json | 10 ++ .../camera_config/SLAAR02-LPMO02-C322.json | 10 ++ .../camera_config/SLAAR21-LCAM-CS841.json | 10 ++ .../camera_config/SLAAR21-LCAM-CS842.json | 10 ++ .../camera_config/SLAAR21-LCAM-CS843.json | 10 ++ .../camera_config/SLAAR21-LCAM-CS844.json | 10 ++ .../camera_config/permanent_instances.json | 23 +++- configuration/camera_config/servers.json | 33 ++++- .../SARES20-CAMS142-M3_proc.json | 14 +++ .../SARES20-CAMS142-M5_psen_db.json | 3 +- .../SARES20-CAMS142-M5_psen_db_proxy.json | 8 ++ .../pipeline_config/SARFE10-PBPS053_proc.json | 38 +++--- .../SARFE10-PSSS059_psss_avg.json | 4 +- .../pipeline_config/SAROP11-PBPS110_proc.json | 38 +++--- .../pipeline_config/SAROP11-PBPS122_proc.json | 38 +++--- .../pipeline_config/SAROP21-ATT01_proc.json | 5 +- .../pipeline_config/SAROP21-PBPS103_proc.json | 38 +++--- .../pipeline_config/SAROP21-PBPS133_proc.json | 119 +++++++++--------- .../pipeline_config/SAROP31-PBPS113_proc.json | 38 +++--- .../pipeline_config/SAROP31-PBPS149_proc.json | 38 +++--- .../SATES31-CAMS187-RIXS1_proc.json | 1 + .../SATOP31-PMOS132-2D_store.json | 4 +- .../pipeline_config/SATOP31-PSCA158_sp.json | 11 ++ .../SLAAR02-LPMO02-C321_proc.json | 14 +++ .../SLAAR02-LPMO02-C322_proc.json | 14 +++ .../SLAAR21-LCAM-CS841_proc.json | 14 +++ .../SLAAR21-LCAM-CS841_sp.json | 11 ++ .../SLAAR21-LCAM-CS842_proc.json | 14 +++ .../SLAAR21-LCAM-CS842_sp.json | 11 ++ .../SLAAR21-LCAM-CS843_proc.json | 14 +++ .../SLAAR21-LCAM-CS843_sp.json | 11 ++ .../SLAAR21-LCAM-CS844_proc.json | 14 +++ .../pipeline_config/permanent_instances.json | 79 ++++++------ configuration/pipeline_config/servers.json | 36 ++++-- configuration/pipeline_config/test_tadej.json | 9 ++ .../user_scripts/SAROP21-ATT01_Test_proc.py | 18 +-- configuration/user_scripts/pprm.py | 2 +- configuration/user_scripts/pprm_gf.py | 2 +- configuration/user_scripts/pprm_simple.py | 11 ++ configuration/user_scripts/test_tadej.py | 8 ++ 70 files changed, 649 insertions(+), 313 deletions(-) create mode 100644 configuration/camera_config/SATOP31-PSCA158.json create mode 100644 configuration/camera_config/SLAAR02-LPMO02-C321.json create mode 100644 configuration/camera_config/SLAAR02-LPMO02-C322.json create mode 100644 configuration/camera_config/SLAAR21-LCAM-CS841.json create mode 100644 configuration/camera_config/SLAAR21-LCAM-CS842.json create mode 100644 configuration/camera_config/SLAAR21-LCAM-CS843.json create mode 100644 configuration/camera_config/SLAAR21-LCAM-CS844.json create mode 100644 configuration/pipeline_config/SARES20-CAMS142-M3_proc.json create mode 100644 configuration/pipeline_config/SARES20-CAMS142-M5_psen_db_proxy.json create mode 100644 configuration/pipeline_config/SATOP31-PSCA158_sp.json create mode 100644 configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json create mode 100644 configuration/pipeline_config/SLAAR02-LPMO02-C322_proc.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS841_sp.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS842_proc.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS842_sp.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS843_proc.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS843_sp.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS844_proc.json create mode 100644 configuration/pipeline_config/test_tadej.json create mode 100644 configuration/user_scripts/pprm_simple.py create mode 100644 configuration/user_scripts/test_tadej.py diff --git a/configuration/camera_config/S10BC02-DSRM310.json b/configuration/camera_config/S10BC02-DSRM310.json index 7a3f427..03fac02 100644 --- a/configuration/camera_config/S10BC02-DSRM310.json +++ b/configuration/camera_config/S10BC02-DSRM310.json @@ -22,5 +22,8 @@ "group": [ "Electrons" ], - "alias": [] + "alias": [], + "connections": 2, + "buffer_size": 40, + "_forwarder_port": 9015 } \ No newline at end of file diff --git a/configuration/camera_config/S10BD01-DSCR030.json b/configuration/camera_config/S10BD01-DSCR030.json index 928153d..8198e4f 100644 --- a/configuration/camera_config/S10BD01-DSCR030.json +++ b/configuration/camera_config/S10BD01-DSCR030.json @@ -20,5 +20,6 @@ "group": [ "Electrons" ], - "alias": [] + "alias": [], + "forwarder_port": 9012 } \ No newline at end of file diff --git a/configuration/camera_config/SARCL01-DSCR170.json b/configuration/camera_config/SARCL01-DSCR170.json index 4727f05..c827d95 100644 --- a/configuration/camera_config/SARCL01-DSCR170.json +++ b/configuration/camera_config/SARCL01-DSCR170.json @@ -22,5 +22,6 @@ "group": [ "Electrons" ], - "alias": [] + "alias": [], + "forwarder_port": 9014 } \ No newline at end of file diff --git a/configuration/camera_config/SARES11-SPEC125-M1.json b/configuration/camera_config/SARES11-SPEC125-M1.json index 702b3aa..de795f0 100644 --- a/configuration/camera_config/SARES11-SPEC125-M1.json +++ b/configuration/camera_config/SARES11-SPEC125-M1.json @@ -22,6 +22,7 @@ "source": "SARES11-SPEC125-M1", "connections": 2, "buffer_size": 0, + "forwarder_port": 9000, "debug": true, "protocol": "tcp" } \ No newline at end of file diff --git a/configuration/camera_config/SARES11-SPEC125-M2.json b/configuration/camera_config/SARES11-SPEC125-M2.json index 8d256f6..0b8219b 100644 --- a/configuration/camera_config/SARES11-SPEC125-M2.json +++ b/configuration/camera_config/SARES11-SPEC125-M2.json @@ -20,5 +20,6 @@ "source": "SARES11-SPEC125-M2", "connections": 2, "buffer_size": 0, + "forwarder_port": 9010, "protocol": "tcp" -} +} \ No newline at end of file diff --git a/configuration/camera_config/SARES11-XMI125-C4P1.json b/configuration/camera_config/SARES11-XMI125-C4P1.json index ac7c26d..358ad8b 100644 --- a/configuration/camera_config/SARES11-XMI125-C4P1.json +++ b/configuration/camera_config/SARES11-XMI125-C4P1.json @@ -6,5 +6,6 @@ "source_type": "bsread", "name": "SARES11-XMI125-C4P1", "protocol": "tcp", - "source": "SARES11-XMI125-C4P1" + "source": "SARES11-XMI125-C4P1", + "_forwarder_port": 9005 } \ No newline at end of file diff --git a/configuration/camera_config/SARES12-XPR128-C4F1.json b/configuration/camera_config/SARES12-XPR128-C4F1.json index 044a7ac..eae3aa2 100644 --- a/configuration/camera_config/SARES12-XPR128-C4F1.json +++ b/configuration/camera_config/SARES12-XPR128-C4F1.json @@ -7,5 +7,6 @@ "image_background": null, "source_type": "bsread", "name": "SARES12-XPR128-C4F1", - "source": "SARES12-XPR128-C4F1" + "source": "SARES12-XPR128-C4F1", + "_forwarder_port": 9004 } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-CAMS142-C2.json b/configuration/camera_config/SARES20-CAMS142-C2.json index 1c86ba5..9151551 100644 --- a/configuration/camera_config/SARES20-CAMS142-C2.json +++ b/configuration/camera_config/SARES20-CAMS142-C2.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 1260, - 872, - 1361, - 972 + 1176, + 863, + 1275, + 964 ], - "reference_marker_width": 1000.0, - "reference_marker_height": 1000.0, + "reference_marker_width": 1233.0, + "reference_marker_height": 1245.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, @@ -16,7 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "prefix": "SARES20-CAMS142-C2", "name": "SARES20-CAMS142-C2", "source": "SARES20-CAMS142-C2", diff --git a/configuration/camera_config/SARES20-CAMS142-M1.json b/configuration/camera_config/SARES20-CAMS142-M1.json index 73323b1..bb81223 100644 --- a/configuration/camera_config/SARES20-CAMS142-M1.json +++ b/configuration/camera_config/SARES20-CAMS142-M1.json @@ -17,6 +17,7 @@ "roi": null, "image_background": null, "source_type": "bsread", + "forwarder_port": 9002, "prefix": "SARES20-CAMS142-M1", "name": "SARES20-CAMS142-M1", "source": "SARES20-CAMS142-M1", diff --git a/configuration/camera_config/SARES20-CAMS142-M3.json b/configuration/camera_config/SARES20-CAMS142-M3.json index e01ce9a..7d931bc 100644 --- a/configuration/camera_config/SARES20-CAMS142-M3.json +++ b/configuration/camera_config/SARES20-CAMS142-M3.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 776, - 140, - 779, - 159 + 388, + 669, + 600, + 884 ], - "reference_marker_width": 12.0, - "reference_marker_height": 76.0, + "reference_marker_width": 413.0, + "reference_marker_height": 419.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, @@ -16,7 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "prefix": "SARES20-CAMS142-M3", "name": "SARES20-CAMS142-M3", "source": "SARES20-CAMS142-M3", @@ -26,35 +26,5 @@ ], "alias": [ "CAMERA_BSSS (SARES20-CAMS142-M3)" - ], - "samplecam_inline.camera.config_cs": { - "camera_calibration": { - "reference_marker": [ - 744, - 140, - 848, - 159 - ], - "reference_marker_width": 100.0, - "reference_marker_height": 100.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", - "prefix": "SARES20-CAMS142-M3", - "name": "SARES20-CAMS142-M3", - "source": "SARES20-CAMS142-M3", - "group": [ - "Photonics", - "Bernina" - ], - "alias": [ - "SAMPLECAM_INLINE (SARES20-CAMS142-M3)" - ] - } + ] } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-CAMS142-M4.json b/configuration/camera_config/SARES20-CAMS142-M4.json index 189baa3..bb7fae1 100644 --- a/configuration/camera_config/SARES20-CAMS142-M4.json +++ b/configuration/camera_config/SARES20-CAMS142-M4.json @@ -22,6 +22,7 @@ "source": "SARES20-CAMS142-M4", "connections": 2, "buffer_size": 0, + "forwarder_port": 9000, "group": [ "Photonics", "Bernina" diff --git a/configuration/camera_config/SARES20-CAMS142-M5.json b/configuration/camera_config/SARES20-CAMS142-M5.json index 13dd3fe..7a07aa3 100644 --- a/configuration/camera_config/SARES20-CAMS142-M5.json +++ b/configuration/camera_config/SARES20-CAMS142-M5.json @@ -22,6 +22,7 @@ "source": "SARES20-CAMS142-M5", "connections": 2, "buffer_size": 0, + "forwarder_port": 9010, "group": [ "Photonics", "Bernina" diff --git a/configuration/camera_config/SARES20-PROF141-M1.json b/configuration/camera_config/SARES20-PROF141-M1.json index 2ae3717..2903dfd 100644 --- a/configuration/camera_config/SARES20-PROF141-M1.json +++ b/configuration/camera_config/SARES20-PROF141-M1.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 266, - 174, - 430, - 332 + 285, + 176, + 449, + 334 ], "reference_marker_width": 500.0, "reference_marker_height": 500.0, @@ -22,11 +22,12 @@ "source": "SARES20-PROF141-M1", "connections": 1, "buffer_size": 0, + "forwarder_port": 9013, "group": [ "Photonics", "Bernina" ], "alias": [ - "TT_KB (SARES20-PROF141-M1)" + "PROF_KB (SARES20-PROF141-M1)" ] } \ No newline at end of file diff --git a/configuration/camera_config/SARES30-CAMS156-XE.json b/configuration/camera_config/SARES30-CAMS156-XE.json index 645f8f0..1c97a4e 100644 --- a/configuration/camera_config/SARES30-CAMS156-XE.json +++ b/configuration/camera_config/SARES30-CAMS156-XE.json @@ -20,6 +20,7 @@ "name": "SARES30-CAMS156-XE", "prefix": "SARES30-CAMS156-XE", "source": "SARES30-CAMS156-XE", + "forwarder_port": 9006, "connections": 1, "buffer_size": 0, "buffer_logs": false, diff --git a/configuration/camera_config/SARFE10-PPRM064.json b/configuration/camera_config/SARFE10-PPRM064.json index d5b1893..895643b 100644 --- a/configuration/camera_config/SARFE10-PPRM064.json +++ b/configuration/camera_config/SARFE10-PPRM064.json @@ -27,5 +27,6 @@ ], "alias": [ "PROF_FE (SARFE10-PPRM064)" - ] + ], + "forwarder_port": 9015 } \ No newline at end of file diff --git a/configuration/camera_config/SARFE10-PSSS059.json b/configuration/camera_config/SARFE10-PSSS059.json index e4a045e..e659304 100644 --- a/configuration/camera_config/SARFE10-PSSS059.json +++ b/configuration/camera_config/SARFE10-PSSS059.json @@ -31,5 +31,6 @@ "Beamline Aramis" ], "alias": [], - "protocol": "tcp" + "protocol": "tcp", + "forwarder_port": 8890 } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM138.json b/configuration/camera_config/SAROP21-PPRM138.json index 0516e47..6804ec4 100644 --- a/configuration/camera_config/SAROP21-PPRM138.json +++ b/configuration/camera_config/SAROP21-PPRM138.json @@ -17,6 +17,7 @@ "roi": null, "image_background": null, "source_type": "bsread", + "forwarder_port": 9004, "group": [ "Photonics", "Bernina" diff --git a/configuration/camera_config/SAROP31-PPRM113.json b/configuration/camera_config/SAROP31-PPRM113.json index 8efd98b..7de92f8 100644 --- a/configuration/camera_config/SAROP31-PPRM113.json +++ b/configuration/camera_config/SAROP31-PPRM113.json @@ -19,6 +19,7 @@ "source_type": "bsread", "name": "SAROP31-PPRM113", "source": "SAROP31-PPRM113", + "forwarder_port": 9000, "group": [ "Photonics", "Beamline Aramis", diff --git a/configuration/camera_config/SAROP31-PPRM150.json b/configuration/camera_config/SAROP31-PPRM150.json index 4e0efe5..f25ba23 100644 --- a/configuration/camera_config/SAROP31-PPRM150.json +++ b/configuration/camera_config/SAROP31-PPRM150.json @@ -16,6 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, + "forwarder_port": 9002, "source_type": "bsread", "name": "SAROP31-PPRM150", "source": "SAROP31-PPRM150", diff --git a/configuration/camera_config/SATBD02-DSCR050.json b/configuration/camera_config/SATBD02-DSCR050.json index 130e58b..57c80b5 100644 --- a/configuration/camera_config/SATBD02-DSCR050.json +++ b/configuration/camera_config/SATBD02-DSCR050.json @@ -22,5 +22,6 @@ "group": [ "Electrons" ], - "alias": [] + "alias": [], + "forwarder_port": 9013 } \ No newline at end of file diff --git a/configuration/camera_config/SATES21-CAMS-PATT1.json b/configuration/camera_config/SATES21-CAMS-PATT1.json index 2a8242f..c726274 100644 --- a/configuration/camera_config/SATES21-CAMS-PATT1.json +++ b/configuration/camera_config/SATES21-CAMS-PATT1.json @@ -22,6 +22,7 @@ "source": "SATES21-CAMS-PATT1", "prefix": "SATES21-CAMS-PATT1", "connections": 2, + "forwarder_port": 9002, "name": "SATES21-CAMS-PATT1", "buffer_size": 0, "group": [ @@ -29,4 +30,4 @@ "Maloja" ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SATES21-CAMS154-M1.json b/configuration/camera_config/SATES21-CAMS154-M1.json index d91d9e9..e56bbf4 100644 --- a/configuration/camera_config/SATES21-CAMS154-M1.json +++ b/configuration/camera_config/SATES21-CAMS154-M1.json @@ -21,10 +21,11 @@ "connections": 2, "buffer_size": 0, "buffer_logs": false, - "protocol": "icp", + "forwarder_port": 9000, + "protocol": "ipc", "group": [ "Photonics", "Maloja" ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SATES24-CAMS161-M1.json b/configuration/camera_config/SATES24-CAMS161-M1.json index e1f4608..0dd5623 100644 --- a/configuration/camera_config/SATES24-CAMS161-M1.json +++ b/configuration/camera_config/SATES24-CAMS161-M1.json @@ -21,6 +21,7 @@ "name": "SATES24-CAMS161-M1", "connections": 2, "buffer_size": 0, + "forwarder_port": 9010, "prefix": "SATES24-CAMS161-M1", "group": [ "Photonics", @@ -28,4 +29,4 @@ ], "alias": [], "protocol": "icp" -} +} \ No newline at end of file diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE1.json b/configuration/camera_config/SATES30-CAMS182-GIGE1.json index 6d114e3..a964b8e 100644 --- a/configuration/camera_config/SATES30-CAMS182-GIGE1.json +++ b/configuration/camera_config/SATES30-CAMS182-GIGE1.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 351, - 179, - 463, - 262 + 81, + 48, + 231, + 200 ], "reference_marker_width": 5000.0, - "reference_marker_height": 3000.0, + "reference_marker_height": 5000.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, @@ -16,6 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, + "forwarder_port": 9003, "source_type": "bsread", "source": "SATES30-CAMS182-GIGE1", "name": "SATES30-CAMS182-GIGE1", diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE2.json b/configuration/camera_config/SATES30-CAMS182-GIGE2.json index 7d44de7..d0e18cc 100644 --- a/configuration/camera_config/SATES30-CAMS182-GIGE2.json +++ b/configuration/camera_config/SATES30-CAMS182-GIGE2.json @@ -16,6 +16,7 @@ "rotate": 0, "roi": null, "image_background": null, + "forwarder_port": 9005, "source_type": "bsread", "source": "SATES30-CAMS182-GIGE2", "name": "SATES30-CAMS182-GIGE2", diff --git a/configuration/camera_config/SATES31-CAMS187-RIXS1.json b/configuration/camera_config/SATES31-CAMS187-RIXS1.json index ac28f35..6bc4acf 100644 --- a/configuration/camera_config/SATES31-CAMS187-RIXS1.json +++ b/configuration/camera_config/SATES31-CAMS187-RIXS1.json @@ -24,6 +24,7 @@ "buffer_size": 0, "buffer_logs": false, "protocol": "ipc", + "forwarder_port": 9001, "group": [ "Photonics", "Furka" diff --git a/configuration/camera_config/SATOP31-PMOS132-2D.json b/configuration/camera_config/SATOP31-PMOS132-2D.json index 254f384..91a23e0 100644 --- a/configuration/camera_config/SATOP31-PMOS132-2D.json +++ b/configuration/camera_config/SATOP31-PMOS132-2D.json @@ -22,9 +22,10 @@ "name": "SATOP31-PMOS132-2D", "connections": 2, "buffer_size": 0, + "forwarder_port": 9002, "group": [ "Photonics" ], "alias": [], "protocol": "tcp" -} +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSCA158.json b/configuration/camera_config/SATOP31-PSCA158.json new file mode 100644 index 0000000..f5a06c1 --- /dev/null +++ b/configuration/camera_config/SATOP31-PSCA158.json @@ -0,0 +1,26 @@ +{ + "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, + "roi": null, + "image_background": null, + "source_type": "epics", + "alias": [], + "source": "SATOP31-PSCA158", + "name": "SATOP31-PSCA158", + "group": [ + "Photonics" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SINBC02-DSRM310.json b/configuration/camera_config/SINBC02-DSRM310.json index 8385cff..91de77f 100644 --- a/configuration/camera_config/SINBC02-DSRM310.json +++ b/configuration/camera_config/SINBC02-DSRM310.json @@ -24,5 +24,6 @@ "Electrons", "2Pulses" ], - "alias": [] + "alias": [], + "forwarder_port": 9011 } \ No newline at end of file diff --git a/configuration/camera_config/SINDI02-DSCR075.json b/configuration/camera_config/SINDI02-DSCR075.json index dd3bbf6..1144145 100644 --- a/configuration/camera_config/SINDI02-DSCR075.json +++ b/configuration/camera_config/SINDI02-DSCR075.json @@ -20,5 +20,6 @@ "group": [ "Electrons" ], - "alias": [] + "alias": [], + "forwarder_port": 9010 } \ No newline at end of file diff --git a/configuration/camera_config/SLAAR02-LPMO02-C321.json b/configuration/camera_config/SLAAR02-LPMO02-C321.json new file mode 100644 index 0000000..a673535 --- /dev/null +++ b/configuration/camera_config/SLAAR02-LPMO02-C321.json @@ -0,0 +1,10 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "source_type": "bsread", + "name": "SLAAR02-LPMO02-C321", + "protocol": "tcp", + "source": "SLAAR02-LPMO02-C321" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR02-LPMO02-C322.json b/configuration/camera_config/SLAAR02-LPMO02-C322.json new file mode 100644 index 0000000..937618e --- /dev/null +++ b/configuration/camera_config/SLAAR02-LPMO02-C322.json @@ -0,0 +1,10 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "source_type": "bsread", + "name": "SLAAR02-LPMO02-C322", + "protocol": "tcp", + "source": "SLAAR02-LPMO02-C322" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-CS841.json b/configuration/camera_config/SLAAR21-LCAM-CS841.json new file mode 100644 index 0000000..e28b819 --- /dev/null +++ b/configuration/camera_config/SLAAR21-LCAM-CS841.json @@ -0,0 +1,10 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "source_type": "bsread", + "name": "SLAAR21-LCAM-CS841", + "protocol": "tcp", + "source": "SLAAR21-LCAM-CS841" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-CS842.json b/configuration/camera_config/SLAAR21-LCAM-CS842.json new file mode 100644 index 0000000..9002365 --- /dev/null +++ b/configuration/camera_config/SLAAR21-LCAM-CS842.json @@ -0,0 +1,10 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "source_type": "bsread", + "name": "SLAAR21-LCAM-CS842", + "protocol": "tcp", + "source": "SLAAR21-LCAM-CS842" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-CS843.json b/configuration/camera_config/SLAAR21-LCAM-CS843.json new file mode 100644 index 0000000..9b145b8 --- /dev/null +++ b/configuration/camera_config/SLAAR21-LCAM-CS843.json @@ -0,0 +1,10 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "source_type": "bsread", + "name": "SLAAR21-LCAM-CS843", + "protocol": "tcp", + "source": "SLAAR21-LCAM-CS843" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-CS844.json b/configuration/camera_config/SLAAR21-LCAM-CS844.json new file mode 100644 index 0000000..9b6bdb3 --- /dev/null +++ b/configuration/camera_config/SLAAR21-LCAM-CS844.json @@ -0,0 +1,10 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "source_type": "bsread", + "name": "SLAAR21-LCAM-CS844", + "protocol": "tcp", + "source": "SLAAR21-LCAM-CS844" +} \ No newline at end of file diff --git a/configuration/camera_config/permanent_instances.json b/configuration/camera_config/permanent_instances.json index 4812767..e25637a 100644 --- a/configuration/camera_config/permanent_instances.json +++ b/configuration/camera_config/permanent_instances.json @@ -1,3 +1,24 @@ { - "SARFE10-PSSS059": "SARFE10-PSSS059" + "S10BC02-DSRM310": "S10BC02-DSRM310", + "S10BD01-DSCR030": "S10BD01-DSCR030", + "SARCL01-DSCR170": "SARCL01-DSCR170", + "SARES11-SPEC125-M1": "SARES11-SPEC125-M1", + "SARES11-SPEC125-M2": "SARES11-SPEC125-M2", + "SARES20-CAMS142-M1": "SARES20-CAMS142-M1", + "SARES20-CAMS142-M5": "SARES20-CAMS142-M5", + "SARES30-CAMS156-XE": "SARES30-CAMS156-XE", + "SARFE10-PPRM064": "SARFE10-PPRM064", + "SARFE10-PSSS059": "SARFE10-PSSS059", + "SAROP31-PPRM113": "SAROP31-PPRM113", + "SAROP31-PPRM150": "SAROP31-PPRM150", + "SATBD02-DSCR050": "SATBD02-DSCR050", + "SATES21-CAMS-PATT1": "SATES21-CAMS-PATT1", + "SATES21-CAMS154-M1": "SATES21-CAMS154-M1", + "SATES24-CAMS161-M1": "SATES24-CAMS161-M1", + "SATES30-CAMS182-GIGE1": "SATES30-CAMS182-GIGE1", + "SATES30-CAMS182-GIGE2": "SATES30-CAMS182-GIGE2", + "SATES31-CAMS187-RIXS1": "SATES31-CAMS187-RIXS1", + "SATOP31-PMOS132-2D": "SATOP31-PMOS132-2D", + "SINBC02-DSRM310": "SINBC02-DSRM310", + "SINDI02-DSCR075": "SINDI02-DSCR075" } \ No newline at end of file diff --git a/configuration/camera_config/servers.json b/configuration/camera_config/servers.json index 2cb90d3..90d6fdb 100644 --- a/configuration/camera_config/servers.json +++ b/configuration/camera_config/servers.json @@ -15,7 +15,10 @@ "http://sf-daqsync-03.psi.ch:8880": { "enabled": true, "expanding": false, - "instances": [] + "instances": [ + "SARFE10-PPRM064", + "SATOP31-PMOS132-2D" + ] }, "http://sf-daqsync-08.psi.ch:8880": { "enabled": true, @@ -29,7 +32,14 @@ }, "http://sf-daqsync-10.psi.ch:8880": { "expanding": false, - "instances": [] + "instances": [ + "S10BC02-DSRM310", + "SINDI02-DSCR075", + "SINBC02-DSRM310", + "S10BD01-DSCR030", + "SATBD02-DSCR050", + "SARCL01-DSCR170" + ] }, "http://sf-daqsync-11.psi.ch:8880": { "enabled": true, @@ -52,7 +62,7 @@ "expanding": false, "instances": [ "SARES11-SPEC125-M1", - "#SARES11-SPEC125-M2", + "SARES11-SPEC125-M2", "SARES11-XMI125-C4P1", "SARES11-XPR125-C4P2", "SARES12-XPR128-C4F1", @@ -67,18 +77,29 @@ "instances": [ "SARES20-CAMS142-M1", "SARES20-CAMS142-M4", - "SARES20-CAMS142-M5" + "SARES20-CAMS142-M5", + "SARES20-PROF141-M1", + "SARES20-PROF142-M1", + "SARES20-PROF146-M1" ] }, "http://sf-daqsync-15.psi.ch:8880": { "enabled": true, "expanding": false, - "instances": [] + "instances": [ + "SATES31-CAMS187-RIXS1", + "SATES30-CAMS182-GIGE1", + "SATES30-CAMS182-GIGE2" + ] }, "http://sf-daqsync-16.psi.ch:8880": { "enabled": true, "expanding": false, - "instances": [] + "instances": [ + "SAROP31-PPRM113", + "SAROP31-PPRM150", + "SARES30-CAMS156-XE" + ] }, "http://sf-daqsync-17.psi.ch:8880": { "enabled": true, diff --git a/configuration/pipeline_config/SARES20-CAMS142-M3_proc.json b/configuration/pipeline_config/SARES20-CAMS142-M3_proc.json new file mode 100644 index 0000000..01d4ac8 --- /dev/null +++ b/configuration/pipeline_config/SARES20-CAMS142-M3_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SARES20-CAMS142-M3", + "name": "SARES20-CAMS142-M3_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json index 2a1f80b..462e2e6 100644 --- a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json +++ b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json @@ -9,7 +9,8 @@ "function": "psen_bsen_processing", "camera_name": "SARES20-CAMS142-M5", "name": "SARES20-CAMS142-M5_psen_db", - "mode": "PUSH", + "_mode": "PUSH", + "mode": "PUB", "roi_signal": [ 300, 2040, diff --git a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db_proxy.json b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db_proxy.json new file mode 100644 index 0000000..5f9aa79 --- /dev/null +++ b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db_proxy.json @@ -0,0 +1,8 @@ +{ + "name": "SARES20-CAMS142-M5_psen_db_proxy", + "input_mode": "SUB", + "mode": "PUSH", + "input_stream": "tcp://sf-daqsync-14.psi.ch:8011", + "pipeline_type": "stream", + "function": "propagate" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SARFE10-PBPS053_proc.json b/configuration/pipeline_config/SARFE10-PBPS053_proc.json index ca57774..0823b25 100644 --- a/configuration/pipeline_config/SARFE10-PBPS053_proc.json +++ b/configuration/pipeline_config/SARFE10-PBPS053_proc.json @@ -17,12 +17,12 @@ "down": "SARFE10-CVME-PHO6212:Lnk9Ch13-DATA-SUM", "right": "SARFE10-CVME-PHO6212:Lnk9Ch14-DATA-SUM", "left": "SARFE10-CVME-PHO6212:Lnk9Ch15-DATA-SUM", - "up_calib": 0.18592729711520714, - "down_calib": 0.2046828245997584, - "left_calib": 0.5648270481862969, - "right_calib": 0.31946001367180926, - "horiz_calib": -3.410708661161579, - "vert_calib": -5.695164729257423, + "up_calib": 0.17996411084406255, + "down_calib": 0.1936446951452057, + "left_calib": 0.5083500282429361, + "right_calib": 0.31702738375787964, + "horiz_calib": -3.831090498851583, + "vert_calib": -6.900401171223998, "uJ_calib": 834.5191797495979, "threshold": 0, "queue_length": 5000, @@ -60,9 +60,9 @@ 0.3 ], "calib_x_norm": [ - 0.08737763795106851, - 4.915561038723763e-05, - -0.08853888251645776 + 0.07869690920714241, + 0.00015605696048788658, + -0.07791646241116247 ], "calib_y_range": [ -0.3, @@ -70,20 +70,20 @@ 0.3 ], "calib_y_norm": [ - 0.05301109719134498, - -0.0003163384406893088, - -0.05234143052706437 + 0.04328456031957706, + -0.0008658919986261164, + -0.043666905995470746 ], "calib_time": "2022-11-28 16:19:37", - "calib_datetime": "2023-01-28 11:31:10", + "calib_datetime": "2023-02-24 09:37:40", "calib_x_norm_std": [ - 0.0702966743711797, - 0.07152076585757301, - 0.06569309389919586 + 0.04947026742477487, + 0.04896469167647291, + 0.04682238235649768 ], "calib_y_norm_std": [ - 0.06232618125346135, - 0.06273569163885237, - 0.0628413012030334 + 0.03927572572711935, + 0.04266742337619606, + 0.04007922538741771 ] } \ No newline at end of file diff --git a/configuration/pipeline_config/SARFE10-PSSS059_psss_avg.json b/configuration/pipeline_config/SARFE10-PSSS059_psss_avg.json index 8f745cc..ab66164 100644 --- a/configuration/pipeline_config/SARFE10-PSSS059_psss_avg.json +++ b/configuration/pipeline_config/SARFE10-PSSS059_psss_avg.json @@ -10,7 +10,7 @@ "SARFE10-PSSS059:SPECTRUM_Y" ], "mode": "PUB", - "function": "psss_avg.py", + "function": "psss_avg", "no_client_timeout": 0, "port": "9005", "spectrum_x": "SARFE10-PSSS059:SPECTRUM_X", @@ -22,4 +22,4 @@ "pixel_bkg": 1, "block": false, "queue_length": 100 -} +} \ 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 f11b682..71e7fef 100644 --- a/configuration/pipeline_config/SAROP11-PBPS110_proc.json +++ b/configuration/pipeline_config/SAROP11-PBPS110_proc.json @@ -19,12 +19,12 @@ "down": "SAROP11-CVME-PBPS2:Lnk9Ch11-DATA-SUM", "right": "SAROP11-CVME-PBPS2:Lnk9Ch14-DATA-SUM", "left": "SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM", - "up_calib": 3.3360070012124314, - "down_calib": 3.7366224157221253, - "left_calib": 3.310722531067212, - "right_calib": 3.612106953894563, - "horiz_calib": -5.6699666765506676, - "vert_calib": 5.859521653283901, + "up_calib": 4.176246646802521, + "down_calib": 5.0147722517321744, + "left_calib": 4.226868737030241, + "right_calib": 4.595144040785396, + "horiz_calib": -5.938292083354949, + "vert_calib": 5.750883131195752, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 5000, @@ -62,9 +62,9 @@ 0.3 ], "calib_x_norm": [ - 0.05579835696069578, - 0.003480756473272972, - -0.05002237078386495 + 0.05144210467883525, + 0.0006052215239522377, + -0.04959704792226395 ], "calib_y_range": [ -0.3, @@ -72,19 +72,19 @@ 0.3 ], "calib_y_norm": [ - -0.050371060030841734, - 0.0007146965208628392, - 0.052026377081407345 + -0.05168657093812036, + 0.0007021663413024587, + 0.05264523103248323 ], - "calib_datetime": "2023-01-30 17:41:29", + "calib_datetime": "2023-03-02 10:00:35", "calib_x_norm_std": [ - 0.5115889854626764, - 0.4973691602441918, - 0.4983141546494207 + 0.594488273756939, + 0.6069233875455338, + 0.63112542665871 ], "calib_y_norm_std": [ - 0.5105030971902298, - 0.5228728589275775, - 0.5344822816305397 + 0.5810483125243515, + 0.6050056030333926, + 0.6023487356109991 ] } \ 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 f77e106..095b97b 100644 --- a/configuration/pipeline_config/SAROP11-PBPS122_proc.json +++ b/configuration/pipeline_config/SAROP11-PBPS122_proc.json @@ -18,12 +18,12 @@ "down": "SAROP11-CVME-PBPS1:Lnk9Ch5-DATA-SUM", "right": "SAROP11-CVME-PBPS1:Lnk9Ch3-DATA-SUM", "left": "SAROP11-CVME-PBPS1:Lnk9Ch7-DATA-SUM", - "up_calib": 2.4099429890702444, - "down_calib": 1.843110261375506, - "left_calib": 2.366780313353075, - "right_calib": 2.0796731233760584, - "horiz_calib": -5.804076268303863, - "vert_calib": 5.7764843223943, + "up_calib": 3.112906892007253, + "down_calib": 2.42031522941779, + "left_calib": 3.0712034522489846, + "right_calib": 2.6667721760426386, + "horiz_calib": -5.887206380557174, + "vert_calib": 5.859029430684977, "uJ_calib": 605.9512700123181, "threshold": 0, "queue_length": 1000, @@ -66,14 +66,14 @@ 0.3 ], "calib_x_norm": [ - 0.05191595806489102, - 0.00023337238120921358, - -0.051459664904884184 + 0.052679439786701664, + 0.001497643249781178, + -0.04923647095519678 ], "calib_x_norm_std": [ - 0.5405995863972689, - 0.5214644617355532, - 0.520267134030826 + 0.6146987957054612, + 0.6088117395208462, + 0.5948902988515276 ], "calib_y_range": [ -0.3, @@ -81,14 +81,14 @@ 0.3 ], "calib_y_norm": [ - -0.05106482740303965, - 0.000706904509229959, - 0.05280457940447428 + -0.050746643828704, + 0.000785186946847148, + 0.05165939578899666 ], "calib_y_norm_std": [ - 0.525897027675966, - 0.5302423157802988, - 0.5105442078541439 + 0.6016897603750389, + 0.5789543559357142, + 0.593537052066037 ], - "calib_datetime": "2023-01-30 17:46:28" + "calib_datetime": "2023-03-02 10:03:18" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-ATT01_proc.json b/configuration/pipeline_config/SAROP21-ATT01_proc.json index feacca8..653c8ad 100644 --- a/configuration/pipeline_config/SAROP21-ATT01_proc.json +++ b/configuration/pipeline_config/SAROP21-ATT01_proc.json @@ -7,7 +7,7 @@ ], "prof_sig": "SARES20-CAMS142-M5.roi_signal_x_profile", "events": "SAR-CVME-TIFALL5:EvtSet", - "function": "SAROP21-ATT01_Debug_proc.py", + "function": "SAROP21-ATT01_Test_proc.py", "device": "SAROP21-ATT01", "mode": "PUSH", "name": "SAROP21-ATT01_proc", @@ -26,5 +26,6 @@ "fel_on_event": 13, "use_dark": true, "filter_window": 201, - "filter": true + "filter": true, + "create_header": "once" } \ 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 8522c7a..d9f2b54 100644 --- a/configuration/pipeline_config/SAROP21-PBPS103_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS103_proc.json @@ -1,17 +1,17 @@ { - "down_calib": 3.630031232686717, + "down_calib": 0.5675808419366034, "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.070579460271278, + "vert_calib": -5.385929776542216, "bsread_address": "", "right": "SAROP21-CVME-PBPS1:Lnk9Ch2-DATA-SUM", "ypos_dif_w_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-W", "ypos_odd_x_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-X", "function": "pbps.py", "port": "9009", - "left_calib": 2.9346038725986725, + "left_calib": 0.588664563052753, "down": "SAROP21-CVME-PBPS1:Lnk9Ch3-DATA-SUM", "ypos_odd_w_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-W", "xpos_odd_y_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-Y", @@ -23,7 +23,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": 4.422564615562066, + "horiz_calib": 5.692288530118327, "ypos_all_m_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-M", "ypos_dif_m_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-M", "bsread_channels": [ @@ -37,7 +37,7 @@ "pipeline_type": "stream", "stream_timeout": 20, "ypos_all_x_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-X", - "right_calib": 2.5887607451604757, + "right_calib": 0.5597192669314763, "xpos_all_m_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-M", "xpos_odd_m_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-M", "left": "SAROP21-CVME-PBPS1:Lnk9Ch1-DATA-SUM", @@ -51,7 +51,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": 3.9870507413731566, + "up_calib": 0.5299009343813997, "ypos_odd_m_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-M", "xpos_all_x_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-X", "up": "SAROP21-CVME-PBPS1:Lnk9Ch4-DATA-SUM", @@ -62,9 +62,9 @@ 0.3 ], "calib_x_norm": [ - -0.066009355423571, - 0.0006423091228374139, - 0.06965853236459774 + -0.056916099813404716, + 0.004728343064317412, + 0.048489660422633016 ], "calib_y_range": [ -0.3, @@ -72,19 +72,19 @@ 0.3 ], "calib_y_norm": [ - 0.07334895113506144, - -0.0006892877948225797, - -0.07405021054596705 + 0.05952637576098334, + 0.003397816524308052, + -0.05187500243990399 ], "calib_x_norm_std": [ - 0.1862659256519873, - 0.1914214949815195, - 0.16642502437072687 + 0.47656358898129575, + 0.4841833672049315, + 0.48412264263551147 ], "calib_y_norm_std": [ - 0.1479706497889028, - 0.15074069887527403, - 0.1282684850391646 + 0.4860358874467544, + 0.4841173336939509, + 0.4843848136849683 ], - "calib_datetime": "2023-02-16 16:38:45" + "calib_datetime": "2023-02-28 15:50:05" } \ 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 eee052b..973ef9c 100644 --- a/configuration/pipeline_config/SAROP21-PBPS133_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS133_proc.json @@ -1,74 +1,73 @@ { - "stream_timeout": 20, - "no_client_timeout": 0, - "ypos_evn_y_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-Y", - "xpos_evn_x_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-X", - "ypos_odd_y_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-Y", - "ypos_dif_m_pvname": "SAROP21-PBPS133:YPOS-DIF-HIST-M", - "ypos_evn_x_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-X", - "vert_calib": -4.042032651583486, - "ypos_all_m_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-M", - "xpos_all_m_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-M", - "port": "9008", - "xpos_odd_w_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-W", - "ypos_all_y_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-Y", - "right": "SLAAR21-LSCP1-FNS:CH4:VAL_GET", - "mode": "PUB", - "xpos_odd_y_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-Y", - "down": "SLAAR21-LSCP1-FNS:CH6:VAL_GET", - "ypos_all_x_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-X", "pipeline_type": "stream", - "ypos_dif_w_pvname": "SAROP21-PBPS133:YPOS-DIF-HIST-W", - "xpos_evn_w_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-W", - "ypos_odd_x_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-X", - "xpos_odd_m_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-M", - "function": "pbps.py", - "xpos_evn_m_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-M", - "xpos_evn_y_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-Y", - "xpos_odd_x_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-X", - "ypos_evn_m_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-M", - "ypos_all_w_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-W", - "uJ_calib": 605.4608924473305, - "xpos_dif_w_pvname": "SAROP21-PBPS133:XPOS-DIF-HIST-W", - "xpos_all_y_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-Y", - "xpos_all_x_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-X", "name": "SAROP21-PBPS133_proc", - "left_calib": 0.00039030040734754, + "bsread_address": "", "bsread_channels": [ "SLAAR21-LSCP1-FNS:CH4:VAL_GET", "SLAAR21-LSCP1-FNS:CH5:VAL_GET", "SLAAR21-LSCP1-FNS:CH6:VAL_GET", "SLAAR21-LSCP1-FNS:CH7:VAL_GET" ], - "ypos_odd_w_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-W", - "abort_on_timeout": true, - "up_calib": 0.0005368851016165617, - "ypos_evn_w_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-W", - "queue_length": 5000, - "down_calib": 0.000493879395158845, - "xpos_dif_m_pvname": "SAROP21-PBPS133:XPOS-DIF-HIST-M", - "bsread_address": "", - "horiz_calib": 4.03731535427499, - "ypos_odd_m_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-M", - "right_calib": 0.0004217539530824008, - "left": "SLAAR21-LSCP1-FNS:CH5:VAL_GET", - "threshold": 0, - "xpos_all_w_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-W", + "mode": "PUB", + "function": "pbps_full.py", + "reload": true, + "no_client_timeout": 0, + "port": "9008", "up": "SLAAR21-LSCP1-FNS:CH7:VAL_GET", + "down": "SLAAR21-LSCP1-FNS:CH6:VAL_GET", + "right": "SLAAR21-LSCP1-FNS:CH4:VAL_GET", + "left": "SLAAR21-LSCP1-FNS:CH5:VAL_GET", + "up_calib": 169.16532441250567, + "down_calib": -3.1106726601795165, + "left_calib": 3.54508647206773, + "right_calib": 34.19888118894548, + "horiz_calib": -2.2718198568677717, + "vert_calib": -14.082388472952845, + "uJ_calib": 605.4608924473305, + "threshold": 0, + "queue_length": 3000, + "xpos_all_x_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-X", + "xpos_all_y_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-Y", + "xpos_all_m_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-M", + "xpos_all_w_pvname": "SAROP21-PBPS133:XPOS-ALL-HIST-W", + "ypos_all_x_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-X", + "ypos_all_y_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-Y", + "ypos_all_m_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-M", + "ypos_all_w_pvname": "SAROP21-PBPS133:YPOS-ALL-HIST-W", + "xpos_evn_x_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-X", + "xpos_evn_y_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-Y", + "xpos_evn_m_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-M", + "xpos_evn_w_pvname": "SAROP21-PBPS133:XPOS-EVN-HIST-W", + "ypos_evn_x_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-X", + "ypos_evn_y_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-Y", + "ypos_evn_m_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-M", + "ypos_evn_w_pvname": "SAROP21-PBPS133:YPOS-EVN-HIST-W", + "xpos_odd_x_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-X", + "xpos_odd_y_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-Y", + "xpos_odd_m_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-M", + "xpos_odd_w_pvname": "SAROP21-PBPS133:XPOS-ODD-HIST-W", + "ypos_odd_x_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-X", + "ypos_odd_y_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-Y", + "ypos_odd_m_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-M", + "ypos_odd_w_pvname": "SAROP21-PBPS133:YPOS-ODD-HIST-W", + "xpos_dif_m_pvname": "SAROP21-PBPS133:XPOS-DIF-HIST-M", + "xpos_dif_w_pvname": "SAROP21-PBPS133:XPOS-DIF-HIST-W", + "ypos_dif_m_pvname": "SAROP21-PBPS133:YPOS-DIF-HIST-M", + "ypos_dif_w_pvname": "SAROP21-PBPS133:YPOS-DIF-HIST-W", "calib_x_range": [ -0.3, 0.0, 0.3 ], "calib_x_norm": [ - -0.07446129654998719, - 1.2886126137609989e-05, - 0.07415231109517194 + -0.5812293065847222, + -0.8991059719528638, + -0.8453347541122557 ], "calib_x_norm_std": [ - 0.3861237907128474, - 0.3903099180014344, - 0.39067664315938483 + 110.6683449364253, + 21.66837488282107, + 32.271201566713536 ], "calib_y_range": [ -0.3, @@ -76,14 +75,14 @@ 0.3 ], "calib_y_norm": [ - 0.07418343203147569, - 0.0008840651392722879, - -0.07425673451813078 + 1.0281522031558, + 1.2070492666749295, + 0.9855457943670932 ], "calib_y_norm_std": [ - 0.40950354508974984, - 0.40087650032585226, - 0.4088462692230485 + 32.38796859628957, + 265.99931210001046, + 16.277067158433667 ], - "calib_datetime": "2023-01-25 09:44:33" + "calib_datetime": "2023-02-24 10:23:46" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP31-PBPS113_proc.json b/configuration/pipeline_config/SAROP31-PBPS113_proc.json index 5ba2d0d..9eb3c23 100644 --- a/configuration/pipeline_config/SAROP31-PBPS113_proc.json +++ b/configuration/pipeline_config/SAROP31-PBPS113_proc.json @@ -16,12 +16,12 @@ "down": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 1.884844732522438e-05, - "down_calib": 1.7471296755985527e-05, - "left_calib": 4.55223323458022e-05, - "right_calib": 4.241739805572221e-05, - "horiz_calib": -3.8366424664601246, - "vert_calib": -6.266032489127928, + "up_calib": 1.9152148189210352e-05, + "down_calib": 1.7064517938972098e-05, + "left_calib": 4.559264973538026e-05, + "right_calib": 4.21026678608106e-05, + "horiz_calib": -3.7945101173783096, + "vert_calib": -6.267291081440332, "uJ_calib": 941.943984588351, "threshold": 0, "queue_length": 5000, @@ -60,14 +60,14 @@ 0.3 ], "calib_x_norm": [ - 0.07826984716790342, - 0.0010905925639025833, - -0.07811689077945334 + 0.07963838293840791, + 0.001358220973310467, + -0.07848479540076332 ], "calib_x_norm_std": [ - 0.038337533357091974, - 0.03877440204182012, - 0.03826558711415791 + 0.04998098709944903, + 0.052423818069909645, + 0.05502543975129206 ], "calib_y_range": [ -0.3, @@ -75,14 +75,14 @@ 0.3 ], "calib_y_norm": [ - 0.04703204249117592, - -0.0010317419675246312, - -0.04872232856276424 + 0.04821850397110222, + 0.0004276481255550119, + -0.04751663776769661 ], "calib_y_norm_std": [ - 0.0364968043075084, - 0.03777766838411619, - 0.04117205141765494 + 0.0571110780155187, + 0.0506525496474363, + 0.050722823751144994 ], - "calib_datetime": "2023-02-22 10:33:36" + "calib_datetime": "2023-02-23 12:08:52" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP31-PBPS149_proc.json b/configuration/pipeline_config/SAROP31-PBPS149_proc.json index 429d706..2a02271 100644 --- a/configuration/pipeline_config/SAROP31-PBPS149_proc.json +++ b/configuration/pipeline_config/SAROP31-PBPS149_proc.json @@ -17,12 +17,12 @@ "down": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 2.7755141917591654e-06, - "down_calib": 2.3267289164064187e-06, - "left_calib": 9.279556949706294e-07, - "right_calib": 1.0241702541302328e-06, - "horiz_calib": -5.3878662443731, - "vert_calib": -4.6822321756891405, + "up_calib": 2.885441486512973e-06, + "down_calib": 2.376016195990847e-06, + "left_calib": 1.0536873159624465e-06, + "right_calib": 1.0169703882630227e-06, + "horiz_calib": -5.257574831198954, + "vert_calib": -4.723951569701649, "uJ_calib": 605.9512700123181, "threshold": 0.0, "queue_length": 5000, @@ -61,14 +61,14 @@ 0.3 ], "calib_x_norm": [ - 0.055517255901851206, - 1.1036903051348371e-05, - -0.05584408322319094 + 0.0568086430437534, + -0.001171639904946471, + -0.057312414528179256 ], "calib_x_norm_std": [ - 0.031094866762654407, - 0.03242094790036017, - 0.032611032692741536 + 0.03560775333350239, + 0.03623513887049099, + 0.03692516564513892 ], "calib_y_range": [ -0.3, @@ -76,14 +76,14 @@ 0.3 ], "calib_y_norm": [ - 0.06340688504886169, - -0.0005462546411476457, - -0.06473712351083573 + 0.06329100837870344, + -0.0004336835506567439, + -0.06372130136813298 ], "calib_y_norm_std": [ - 0.033127392061345476, - 0.03276323605318205, - 0.03323239458656747 + 0.037638465346541604, + 0.03654784966258248, + 0.03906567845477979 ], - "calib_datetime": "2023-02-22 10:35:33" + "calib_datetime": "2023-02-23 12:59:38" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_proc.json b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_proc.json index a650cbc..847e6c9 100644 --- a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_proc.json +++ b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_proc.json @@ -14,5 +14,6 @@ "processing_threads": 3, "thread_buffer_size": 20, "send_buffer_size": 50, + "create_header": "once", "block": false } \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP31-PMOS132-2D_store.json b/configuration/pipeline_config/SATOP31-PMOS132-2D_store.json index a7aab35..a42159d 100644 --- a/configuration/pipeline_config/SATOP31-PMOS132-2D_store.json +++ b/configuration/pipeline_config/SATOP31-PMOS132-2D_store.json @@ -1,5 +1,7 @@ { "pipeline_type": "store", "name": "SATOP31-PMOS132-2D_store", - "camera_name": "SATOP31-PMOS132-2D" + "camera_name": "SATOP31-PMOS132-2D", + "reload": true, + "function": "SARES11-SPEC125-M1_tt.py" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP31-PSCA158_sp.json b/configuration/pipeline_config/SATOP31-PSCA158_sp.json new file mode 100644 index 0000000..67751aa --- /dev/null +++ b/configuration/pipeline_config/SATOP31-PSCA158_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": "SATOP31-PSCA158", + "name": "SATOP31-PSCA158_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json b/configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json new file mode 100644 index 0000000..55cd56f --- /dev/null +++ b/configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SLAAR02-LPMO02-C321", + "name": "SLAAR02-LPMO02-C321_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR02-LPMO02-C322_proc.json b/configuration/pipeline_config/SLAAR02-LPMO02-C322_proc.json new file mode 100644 index 0000000..bcf9492 --- /dev/null +++ b/configuration/pipeline_config/SLAAR02-LPMO02-C322_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SLAAR02-LPMO02-C322", + "name": "SLAAR02-LPMO02-C322_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json b/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json new file mode 100644 index 0000000..accb8c0 --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SLAAR21-LCAM-CS841", + "name": "SLAAR21-LCAM-CS841_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS841_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-CS841_sp.json new file mode 100644 index 0000000..e5e450f --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS841_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": "SLAAR21-LCAM-CS841", + "name": "SLAAR21-LCAM-CS841_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS842_proc.json b/configuration/pipeline_config/SLAAR21-LCAM-CS842_proc.json new file mode 100644 index 0000000..1dc9d89 --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS842_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SLAAR21-LCAM-CS842", + "name": "SLAAR21-LCAM-CS842_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS842_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-CS842_sp.json new file mode 100644 index 0000000..7e99f5b --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS842_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": "SLAAR21-LCAM-CS842", + "name": "SLAAR21-LCAM-CS842_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS843_proc.json b/configuration/pipeline_config/SLAAR21-LCAM-CS843_proc.json new file mode 100644 index 0000000..57a680b --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS843_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SLAAR21-LCAM-CS843", + "name": "SLAAR21-LCAM-CS843_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS843_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-CS843_sp.json new file mode 100644 index 0000000..4a58dd4 --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS843_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": "SLAAR21-LCAM-CS843", + "name": "SLAAR21-LCAM-CS843_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS844_proc.json b/configuration/pipeline_config/SLAAR21-LCAM-CS844_proc.json new file mode 100644 index 0000000..29e3cde --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS844_proc.json @@ -0,0 +1,14 @@ +{ + "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": "SLAAR21-LCAM-CS844", + "name": "SLAAR21-LCAM-CS844_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index e3cc361..d4ae4d3 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -1,86 +1,91 @@ { + "#S10BC02-DSRM310_ib": "S10BC02-DSRM310_ib", + "#S10BD01-DSCR030_ib": "S10BD01-DSCR030_ib", + "#SARCL01-DSCR170_ib": "SARCL01-DSCR170_ib", "#SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db", + "#SARES11-SPEC125-M1_psen_ib": "SARES11-SPEC125-M1_psen_ib", "#SARES11-SPEC125-M1_test": "SARES11-SPEC125-M1_test", "#SARES11-SPEC125-M2_psen_db1": "SARES11-SPEC125-M2_psen_db", + "#SARES11-SPEC125-M2_psen_ib": "SARES11-SPEC125-M2_psen_ib", "#SARES11-XMI125-C4P1_ib": "SARES11-XMI125-C4P1_ib", "#SARES11-XPR125-C4P2_sp": "SARES11-XPR125-C4P2_sp", "#SARES12-CAMS128-M1_psen_db": "SARES12-CAMS128-M1_psen_db", "#SARES12-CAMS128-M1_psen_ib": "SARES12-CAMS128-M1_psen_ib", + "#SARES20-CAMS142-M1_psen_db": "SARES20-CAMS142-M1_psen_db", + "#SARES20-CAMS142-M1_psen_ib": "SARES20-CAMS142-M1_psen_ib", "#SARES20-CAMS142-M3_ib": "SARES20-CAMS142-M3_ib", + "#SARES20-CAMS142-M5_psen_ib": "SARES20-CAMS142-M5_psen_ib", + "#SARES20-DSDPPRM_ib": "SARES20-DSDPPRM_ib", + "#SARES20-DSDPPRM_proc": "SARES20-DSDPPRM_proc", "#SARES20-PROF141-M1_ib": "SARES20-PROF141-M1_ib", "#SARES20-PROF141-M1_proc": "SARES20-PROF141-M1_proc", - "#SARES20-PROF142-M1_ib": "SARES20-PROF142-M1_ib", - "#SARES20-PROF142-M1_proc": "SARES20-PROF142-M1_proc", - "#SARES20-PROF142-M1_spec": "SARES20-PROF142-M1_spec", "#SARES30-CAMS156-PCO1_ib": "SARES30-CAMS156-PCO1_ib", - "#SARES30-CAMS156-XE_proc": "SARES30-CAMS156-XE_proc", + "#SARES30-CAMS156-XE_ib": "SARES30-CAMS156-XE_ib", + "#SARFE10-PPRM064_ib": "SARFE10-PPRM064_ib", + "#SARFE10-PSSS059_store": "SARFE10-PSSS059_store", + "#SAROP11-ATT01_proc": "SAROP11-ATT01_proc", + "#SAROP21-PPRM102_ib": "SAROP21-PPRM102_ib", + "#SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc", + "#SAROP21-PPRM113_proc": "SAROP21-PPRM113_proc", + "#SAROP21-PPRM138_ib": "SAROP21-PPRM138_ib", + "#SAROP31-PPRM113_ib": "SAROP31-PPRM113_ib", + "#SAROP31-PPRM150_ib": "SAROP31-PPRM150_ib", + "#SATBD02-DSCR050_ib": "SATBD02-DSCR050_ib", + "#SATES21-CAMS-PATT1_spec_ib": "SATES21-CAMS-PATT1_spec_ib", + "#SATES21-CAMS154-M1_spec_ib": "SATES21-CAMS154-M1_spec_ib", + "#SATES24-CAMS161-M1_spec_ib": "SATES24-CAMS161-M1_spec_ib", + "#SATES30-CAMS182-GIGE1_ib": "SATES30-CAMS182-GIGE1_ib", + "#SATES30-CAMS182-GIGE2_ib": "SATES30-CAMS182-GIGE2_ib", + "#SATES31-CAMS187-RIXS1_ib": "SATES31-CAMS187-RIXS1_ib", + "#SATOP31-PMOS132-2D_store": "SATOP31-PMOS132-2D_store", + "#SINBC02-DSRM310_ib": "SINBC02-DSRM310_ib", + "#SINDI02-DSCR075_ib": "SINDI02-DSCR075_ib", "#jungfrau_proc": "jungfrau_proc", + "#test_merge": "test_merge", "#test_proc_with_bs": "test_proc_with_bs", "#test_stream": "test_stream", "#testdb_ib": "testdb_ib", - "S10BC02-DSRM310_ib": "S10BC02-DSRM310_ib", "S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles", - "S10BD01-DSCR030_ib": "S10BD01-DSCR030_ib", "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles", - "SARCL01-DSCR170_ib": "SARCL01-DSCR170_ib", "SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles", - "SARES11-SPEC125-M1_psen_ib": "SARES11-SPEC125-M1_psen_ib", - "SARES11-SPEC125-M2_psen_ib": "SARES11-SPEC125-M2_psen_ib", "SARES11-XMI125-C4P1_db": "SARES11-XMI125-C4P1_db", - "SARES20-CAMS142-M1_psen_db": "SARES20-CAMS142-M1_psen_db", - "SARES20-CAMS142-M1_psen_ib": "SARES20-CAMS142-M1_psen_ib", + "SARES20-CAMS142-M3_proc": "SARES20-CAMS142-M3_proc", "SARES20-CAMS142-M5_psen_db": "SARES20-CAMS142-M5_psen_db", - "SARES20-CAMS142-M5_psen_ib": "SARES20-CAMS142-M5_psen_ib", - "SARES20-DSDPPRM_ib": "SARES20-DSDPPRM_ib", - "SARES20-DSDPPRM_proc": "SARES20-DSDPPRM_proc", - "SARES20-PROF146-M1_proc": "SARES20-PROF146-M1_proc", - "SARES30-CAMS156-XE_ib": "SARES30-CAMS156-XE_ib", + "SARES20-CAMS142-M5_psen_db_proxy": "SARES20-CAMS142-M5_psen_db_proxy", + "SARES30-CAMS156-XE_proc": "SARES30-CAMS156-XE_proc", "SARFE10-PBPS053_proc": "SARFE10-PBPS053_proc", - "SARFE10-PPRM064_ib": "SARFE10-PPRM064_ib", "SARFE10-PPRM064_proc": "SARFE10-PPRM064_proc", "SARFE10-PSSS059_psss": "SARFE10-PSSS059_psss", "SARFE10-PSSS059_psss_avg": "SARFE10-PSSS059_psss_avg", - "SARFE10-PSSS059_store": "SARFE10-PSSS059_store", - "SAROP11-ATT01_proc": "SAROP11-ATT01_proc", "SAROP11-PBPS110_proc": "SAROP11-PBPS110_proc", "SAROP11-PBPS122_proc": "SAROP11-PBPS122_proc", "SAROP21-ATT01_proc": "SAROP21-ATT01_proc", "SAROP21-PBPS103_proc": "SAROP21-PBPS103_proc", "SAROP21-PBPS133_proc": "SAROP21-PBPS133_proc", "SAROP21-PBPS138_proc": "SAROP21-PBPS138_proc", - "SAROP21-PPRM102_ib": "SAROP21-PPRM102_ib", - "SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc", - "SAROP21-PPRM113_proc": "SAROP21-PPRM113_proc", - "SAROP21-PPRM138_ib": "SAROP21-PPRM138_ib", "SAROP21-PPRM138_proc": "SAROP21-PPRM138_proc", "SAROP31-PBPS113_proc": "SAROP31-PBPS113_proc", "SAROP31-PBPS149_proc": "SAROP31-PBPS149_proc", - "SAROP31-PPRM113_ib": "SAROP31-PPRM113_ib", "SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc", - "SAROP31-PPRM150_ib": "SAROP31-PPRM150_ib", "SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc", "SATBD02-DSCR050_db": "SATBD02-DSCR050_db", - "SATBD02-DSCR050_ib": "SATBD02-DSCR050_ib", "SATBD02-DSCR050_sp1": "SATBD02-DSCR050_sp", "SATES21-CAMS-PATT1_spec_db": "SATES21-CAMS-PATT1_spec_db", - "SATES21-CAMS-PATT1_spec_ib": "SATES21-CAMS-PATT1_spec_ib", "SATES21-CAMS154-M1_spec_db": "SATES21-CAMS154-M1_spec_db", - "SATES21-CAMS154-M1_spec_ib": "SATES21-CAMS154-M1_spec_ib", "SATES24-CAMS161-M1_spec_db": "SATES24-CAMS161-M1_spec_db", - "SATES24-CAMS161-M1_spec_ib": "SATES24-CAMS161-M1_spec_ib", - "SATES30-CAMS182-GIGE1_ib": "SATES30-CAMS182-GIGE1_ib", "SATES30-CAMS182-GIGE1_profiles": "SATES30-CAMS182-GIGE1_profiles", - "SATES30-CAMS182-GIGE2_ib": "SATES30-CAMS182-GIGE2_ib", "SATES30-CAMS182-GIGE2_profiles": "SATES30-CAMS182-GIGE2_profiles", - "SATES31-CAMS187-RIXS1_ib": "SATES31-CAMS187-RIXS1_ib", "SATES31-CAMS187-RIXS1_proc": "SATES31-CAMS187-RIXS1_proc", "SATOP31-PMOS132-2D_pmos": "SATOP31-PMOS132-2D_pmos", - "SATOP31-PMOS132-2D_store": "SATOP31-PMOS132-2D_store", - "SINBC02-DSRM310_ib": "SINBC02-DSRM310_ib", "SINBC02-DSRM310_profiles": "SINBC02-DSRM310_profiles", - "SINDI02-DSCR075_ib": "SINDI02-DSCR075_ib", "SINDI02-DSCR075_profiles": "SINDI02-DSCR075_profiles", + "SLAAR02-LPMO02-C321_proc": "SLAAR02-LPMO02-C321_proc", + "SLAAR02-LPMO02-C322_proc": "SLAAR02-LPMO02-C322_proc", + "SLAAR21-LCAM-CS841_proc": "SLAAR21-LCAM-CS841_proc", + "SLAAR21-LCAM-CS842_proc": "SLAAR21-LCAM-CS842_proc", + "SLAAR21-LCAM-CS843_proc": "SLAAR21-LCAM-CS843_proc", + "SLAAR21-LCAM-CS844_proc": "SLAAR21-LCAM-CS844_proc", "test_furka": "test_furka", - "test_merge": "test_merge", - "test_str": "test_str" + "test_str": "test_str", + "test_tadej": "test_tadej" } \ No newline at end of file diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index 43b4adb..c99a839 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -39,8 +39,9 @@ "SAROP11-PBPS110_proc:9007", "SAROP31-PBPS113_proc:9013", "SAROP31-PBPS149_proc:9011", + "SAROP21-ATT01_proc", "SAROP11-PBPS122_proc:9010", - "SAROP11-ATT01_proc:9014", + "SAROP11-ATT01_proc:9016", "SAROP21-PBPS133_proc:9008", "SARFE10-PPRM064_ib:9015", "SATOP31-PMOS132-2D_sp", @@ -121,7 +122,8 @@ "SARES20-CAMS142-M3_spec:9004", "#SARES20-PROF142-M1_spec:9004", "#SARES20-PROF142-M1_ib:9003", - "#SARES20-PROF141-M1_sp" + "#SARES20-PROF141-M1_sp", + "SARES20-CAMS142-M3_proc:9006" ] }, "http://sf-daqsync-12.psi.ch:8881": { @@ -178,11 +180,18 @@ "Bernina_spectral_encoding", "Bernina_spatial_encoding", "SARES20-PROF141-M1", + "SARES20-PROF142-M1", "SARES20-PROF146-M1", "SAROP21-PPRM102", "SAROP21-PPRM138", "SAROP31-PPRM113", - "SARES20-DSDPPRM" + "SARES20-DSDPPRM", + "SLAAR21-LCAM-CS841", + "SLAAR21-LCAM-CS842", + "SLAAR21-LCAM-CS843", + "SLAAR21-LCAM-CS844", + "SLAAR02-LPMO02-C321", + "SLAAR02-LPMO02-C322" ], "enabled": true, "expanding": false, @@ -193,10 +202,11 @@ "SARES20-CAMS142-M4_psen_db:9001", "SARES20-CAMS142-M5_psen_ib:9010", "SAROP21-PPRM138_ib:9004", - "SARES20-CAMS142-M5_psen_db:9011", - "#SARES20-PROF142-M1_sp", + "SARES20-CAMS142-M5_psen_db:8011", + "SARES20-CAMS142-M5_psen_db_proxy:9011", + "SARES20-PROF142-M1_sp", "#SARES20-PROF142-M1_ib:9005", - "#SARES20-PROF142-M1_proc:9017", + "SARES20-PROF142-M1_proc:9017", "SAROP21-PPRM102_ib:9006", "SAROP21-PPRM133_ib:9019", "SAROP21-PPRM113_proc:9007", @@ -206,9 +216,15 @@ "SARES20-PROF141-M1_proc:9016", "SARES20-PROF141-M1_ib:9013", "SARES20-PROF146-M1_sp", - "SARES20-PROF146-M1_proc:9018", + "#SARES20-PROF146-M1_proc:9018", "SARES20-DSDPPRM_proc:9014", "SARES20-DSDPPRM_ib:9020", + "SLAAR21-LCAM-CS841_proc:9021", + "SLAAR21-LCAM-CS842_proc:9022", + "SLAAR21-LCAM-CS843_proc:9023", + "SLAAR21-LCAM-CS844_proc:9024", + "SLAAR02-LPMO02-C321_proc:9025", + "SLAAR02-LPMO02-C322_proc:9026", "#arrival_time_proc:9008", "test_arrival" ] @@ -256,7 +272,7 @@ "SAROP31-PPRM150_proc:9003", "SARES30-CAMS156-PCO1_ib:9004", "SARES30-CAMS156-XE_ib:9006", - "SARES30-CAMS156-XE_proc:9017" + "SARES30-CAMS156-XE_proc:9007" ] }, "http://sf-daqsync-17.psi.ch:8881": { @@ -269,6 +285,8 @@ "cameras": [], "enabled": true, "expanding": false, - "instances": [] + "instances": [ + "test_tadej:9000" + ] } } \ No newline at end of file diff --git a/configuration/pipeline_config/test_tadej.json b/configuration/pipeline_config/test_tadej.json new file mode 100644 index 0000000..65cc432 --- /dev/null +++ b/configuration/pipeline_config/test_tadej.json @@ -0,0 +1,9 @@ +{ + "name": "test_tadej", + "input_mode": "SUB", + "mode": "PUSH", + "input_stream": "tcp://sf-daqsync-14.psi.ch:8011", + "pipeline_type": "stream", + "block": false, + "function": "test_tadej" +} \ No newline at end of file diff --git a/configuration/user_scripts/SAROP21-ATT01_Test_proc.py b/configuration/user_scripts/SAROP21-ATT01_Test_proc.py index ad2630e..21ca341 100644 --- a/configuration/user_scripts/SAROP21-ATT01_Test_proc.py +++ b/configuration/user_scripts/SAROP21-ATT01_Test_proc.py @@ -117,22 +117,26 @@ def process(data, pulse_id, timestamp, params): try: edge_results["arrival_time_even"] = edge_results["edge_pos"] * calib except: - edge_results["arrival_time_even"] = np.nan - edge_results["arrival_time_odd"] = np.nan + edge_results["arrival_time_even"] = calib + edge_results["arrival_time_odd"] = calib else: - edge_results["arrival_time_even"] = np.nan + edge_results["arrival_time_even"] = calib try: edge_results["arrival_time_odd"] = edge_results["edge_pos"] * calib except: - edge_results["arrival_time_odd"] = np.nan + edge_results["arrival_time_odd"] = calib # push pulse ID for debuging edge_results["pulse_id"] = pulse_id #debug just return arrival tim - output[f"{device}:arrival_time"] = edge_results["arrival_time"] + #output[f"{device}:arrival_time"] = edge_results["arrival_time"] + #try: + # output[f"{device}:arrival_time_even"] = edge_results["arrival_time_even"] + #except: + # output[f"{device}:arrival_time_even"] = None # Set bs outputs - #for key, value in edge_results.items(): - # output[f"{device}:{key}"] = value + for key, value in edge_results.items(): + output[f"{device}:{key}"] = value #output[f"{device}:raw_wf"] = prof_sig #output[f"{device}:raw_wf_savgol"] = prof_sig_savgol diff --git a/configuration/user_scripts/pprm.py b/configuration/user_scripts/pprm.py index be5e0f4..c73223f 100644 --- a/configuration/user_scripts/pprm.py +++ b/configuration/user_scripts/pprm.py @@ -8,5 +8,5 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata channels = ["intensity","x_center_of_mass","x_fwhm","x_rms","x_fit_amplitude", "x_fit_mean","x_fit_offset","x_fit_standard_deviation","x_profile","y_center_of_mass","y_fwhm","y_rms","y_fit_amplitude", "y_fit_mean","y_fit_offset","y_fit_standard_deviation","y_profile"] prefix = parameters["camera_name"] for c in channels: - ret[prefix+":"+c] = int(r[c]) + ret[prefix+":"+c] = r[c] return ret diff --git a/configuration/user_scripts/pprm_gf.py b/configuration/user_scripts/pprm_gf.py index 45bbf75..ce23119 100644 --- a/configuration/user_scripts/pprm_gf.py +++ b/configuration/user_scripts/pprm_gf.py @@ -9,5 +9,5 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata prefix = parameters["camera_name"] for c in channels: ret[prefix+":"+c] = r[c] - ret['input_pulse_id'] = pulse_id + ret[prefix+":"+'input_pulse_id'] = pulse_id return ret diff --git a/configuration/user_scripts/pprm_simple.py b/configuration/user_scripts/pprm_simple.py new file mode 100644 index 0000000..8824c4f --- /dev/null +++ b/configuration/user_scripts/pprm_simple.py @@ -0,0 +1,11 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions, processor + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + r = processor.process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata) + ret = OrderedDict() + channels = ["x_center_of_mass","y_center_of_mass"] + prefix = parameters["camera_name"] + for c in channels: + ret[prefix+":"+c] = r[c] + return ret diff --git a/configuration/user_scripts/test_tadej.py b/configuration/user_scripts/test_tadej.py new file mode 100644 index 0000000..958572f --- /dev/null +++ b/configuration/user_scripts/test_tadej.py @@ -0,0 +1,8 @@ +count = 0 + +def process(data, pulse_id, timestamp, params): + global count + prefix = "SFTEST-TADEJ:" + data={prefix+"INT":count} + count=count+1 + return data \ No newline at end of file