From 7645e497943f2ebc33c1bc5f86843a7e76ed352b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 20 Feb 2025 15:05:42 +0100 Subject: [PATCH] 02.2025 --- .../camera_config/SATOP11-PSAS079.json | 8 ++-- .../SARES11-SPEC125-M1_psen_db.json | 2 +- .../pipeline_config/SAROP11-PBPS110_proc.json | 38 +++++++++---------- .../pipeline_config/SAROP11-PBPS122_proc.json | 38 +++++++++---------- .../pipeline_config/SATBD02-DSCR050_sp.json | 10 ++--- .../SATES21-CAMS-PATT1_spec_db.json | 18 ++++----- .../SATES21-CAMS154-M1_spec_db.json | 2 +- .../SATOP21-PMOS127-2D_pmos.json | 16 +++++--- .../pipeline_config/jfj-cristall_db.json | 17 +++++++++ .../pipeline_config/jfj-cristall_rec.json | 9 +++++ .../pipeline_config/permanent_instances.json | 6 ++- configuration/pipeline_config/servers.json | 4 +- 12 files changed, 101 insertions(+), 67 deletions(-) create mode 100644 configuration/pipeline_config/jfj-cristall_db.json create mode 100644 configuration/pipeline_config/jfj-cristall_rec.json diff --git a/configuration/camera_config/SATOP11-PSAS079.json b/configuration/camera_config/SATOP11-PSAS079.json index 130ad0e..14aa07f 100644 --- a/configuration/camera_config/SATOP11-PSAS079.json +++ b/configuration/camera_config/SATOP11-PSAS079.json @@ -27,10 +27,10 @@ "hardware_configuration": { "EXPOSURE": 1.0, "HSSPEED": 0.0, - "REGIONX_START": 8.0, - "REGIONY_START": 810.0, - "REGIONX_END": 4104.0, - "REGIONY_END": 1200.0, + "REGIONX_START": 1020.0, + "REGIONY_START": 840.0, + "REGIONX_END": 2810.0, + "REGIONY_END": 1180.0, "TRIGGER": 1, "TRIGGERSOURCE": 0, "DELAY": 0.0, diff --git a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json index d750da3..5fee963 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json @@ -1,6 +1,6 @@ { "image_background_enable": "passive", - "image_background": "SARES11-SPEC125-M1_20250201_153642_349861", + "image_background": "SARES11-SPEC125-M1_20250219_102506_385640", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, diff --git a/configuration/pipeline_config/SAROP11-PBPS110_proc.json b/configuration/pipeline_config/SAROP11-PBPS110_proc.json index 6111698..1af7caf 100644 --- a/configuration/pipeline_config/SAROP11-PBPS110_proc.json +++ b/configuration/pipeline_config/SAROP11-PBPS110_proc.json @@ -26,12 +26,12 @@ "down": "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 1.5176581897929183e-06, - "down_calib": 1.318044634179137e-06, - "left_calib": 1.490116652292008e-06, - "right_calib": 1.5251830042683894e-06, - "horiz_calib": -3.445079537226236, - "vert_calib": -4.526187253618725, + "up_calib": 9.737862278566756e-07, + "down_calib": 9.353619683200535e-07, + "left_calib": 1.0309994225495954e-06, + "right_calib": 1.0803571833705372e-06, + "horiz_calib": -3.815574774066874, + "vert_calib": -4.765031357737654, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 1000, @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.08928964939169279, - -0.0004260470257601398, - -0.08487178680059977 + 0.07875594604296668, + 0.0007371884210029649, + -0.0784942811254248 ], "calib_y_range": [ -0.3, @@ -79,19 +79,19 @@ 0.3 ], "calib_y_norm": [ - 0.06886169723871727, - 0.0002235257511305972, - -0.0637002067170448 + 0.06412401332876447, + 8.368823342154213e-05, + -0.0617933112289628 ], - "calib_datetime": "2024-11-19 08:28:13", + "calib_datetime": "2025-02-18 12:35:39", "calib_x_norm_std": [ - 0.017475169999872805, - 0.01854660174469743, - 0.017759044318414286 + 0.04337406366054226, + 0.04308021833976918, + 0.03941977018047361 ], "calib_y_norm_std": [ - 0.024021607127917188, - 0.024252208065290107, - 0.023430804513813092 + 0.04206756807633558, + 0.0433518072679861, + 0.040856758898731346 ] } \ 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 14d13b0..62c6712 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": 3.635295520443448e-05, - "down_calib": 4.4528403243520136e-05, - "left_calib": 1.578558876773274e-05, - "right_calib": 1.5226182504921408e-05, - "horiz_calib": -5.495384761676846, - "vert_calib": -5.988644352106681, + "up_calib": 6.101323855488045e-06, + "down_calib": 7.654460272371415e-06, + "left_calib": 3.668981334042787e-06, + "right_calib": 3.355588491029438e-06, + "horiz_calib": -4.619094947499179, + "vert_calib": -4.245916121265708, "uJ_calib": 605.9512700123181, "threshold": 0, "queue_length": 1000, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.054969977322280913, - 0.0009656974192057046, - -0.05421255056625182 + 0.06665873277683025, + 0.0007229623165680056, + -0.06323684348207421 ], "calib_x_norm_std": [ - 0.044412111433209785, - 0.03994837842564122, - 0.041061134090118044 + 0.07600711950147099, + 0.07532881833515205, + 0.07635620007810899 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.048947766395264214, - -0.0006253311131685033, - -0.05124185327866625 + 0.07117396482192535, + -3.0390768441330145e-05, + -0.07013829450295737 ], "calib_y_norm_std": [ - 0.04700591017282901, - 0.039664252046486964, - 0.04249498877747604 + 0.0772216925343307, + 0.07719104433527772, + 0.0797284532174974 ], - "calib_datetime": "2024-11-14 17:03:33" + "calib_datetime": "2025-02-18 20:43:22" } \ 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 23a9d00..cdcdb2b 100644 --- a/configuration/pipeline_config/SATBD02-DSCR050_sp.json +++ b/configuration/pipeline_config/SATBD02-DSCR050_sp.json @@ -1,12 +1,12 @@ { "image_background_enable": false, - "image_background": "SATBD02-DSCR050_20250216_143504_789375", + "image_background": "SATBD02-DSCR050_20250217_170917_808358", "image_threshold": null, "image_region_of_interest": [ - 401, - 1729, - 339, - 1377 + 495, + 1573, + 90, + 1964 ], "image_good_region": { "threshold": 0.1, diff --git a/configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json b/configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json index 4e6cf4d..cd658be 100644 --- a/configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json +++ b/configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json @@ -1,6 +1,6 @@ { "image_background_enable": "passive", - "image_background": "SATES21-CAMS-PATT1_20241106_175709_505906", + "image_background": "SATES21-CAMS-PATT1_20250219_141109_108477", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -20,16 +20,16 @@ "project_axis": 0, "reload": true, "roi_background": [ - 7, - 836, - 35, - 2092 + 466, + 752, + 91, + 2356 ], "roi_signal": [ - 7, - 836, - 35, - 2092 + 178, + 474, + 91, + 2356 ], "enforce_pid": true, "enforce_timestamp": true, diff --git a/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json b/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json index bd786d2..5ca6ca1 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json +++ b/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json @@ -1,6 +1,6 @@ { "image_background_enable": "passive", - "image_background": "SATES21-CAMS154-M1_20250131_172243_522923", + "image_background": "SATES21-CAMS154-M1_20250218_150832_735370", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, diff --git a/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json b/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json index e28c3a9..02bfc83 100644 --- a/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json +++ b/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json @@ -1,22 +1,26 @@ { - "image_background_enable": false, - "image_background": "SATOP21-PMOS127-2D_20240517_090650_703956", + "image_background_enable": true, + "image_background": "SATOP21-PMOS127-2D_20250217_153645_690118", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", "camera_name": "SATOP21-PMOS127-2D", - "e_axis": "SATOP21-PMOS127-2D:SPECTRUM_X", - "int_axis": "SATOP21-PMOS127-2D:SPECTRUM_Y", "name": "SATOP21-PMOS127-2D_pmos", - "function": "pmos127B-2D.py", + "function": "pmos_2.py", "mode": "PUSH", "allow_type_changes": false, + "allow_shape_changes": false, "no_client_timeout": 0, + "port": "9017", "reload": true, "processing_threads": 6, "thread_buffer_size": 30, "abort_on_error": false, - "pixel_bkg": 1 + "_enforce_pid": true, + "_enforce_timestamp": true, + "pixel_bkg": 1, + "e_axis_name": "SATOP21-PMOS127-2D:SPECTRUM_X", + "e_int_name": "SATOP21-PMOS127-2D:SPECTRUM_Y" } \ No newline at end of file diff --git a/configuration/pipeline_config/jfj-cristall_db.json b/configuration/pipeline_config/jfj-cristall_db.json new file mode 100644 index 0000000..6142782 --- /dev/null +++ b/configuration/pipeline_config/jfj-cristall_db.json @@ -0,0 +1,17 @@ +{ + "pipeline_type": "stream", + "name": "jfj-cristall_db", + "mode": "PUSH", + "function": "propagate_with_prefix.py", + "prefix": "JFJ-CRISTALL:", + "_input_pipeline": "jfj-cristall_db", + "input_stream": "tcp://sf-daqsync-18.psi.ch:9050", + "input_mode": "SUB", + "abort_on_timeout": false, + "block": false, + "allow_type_changes": false, + "allow_shape_changes": false, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/jfj-cristall_rec.json b/configuration/pipeline_config/jfj-cristall_rec.json new file mode 100644 index 0000000..f24615e --- /dev/null +++ b/configuration/pipeline_config/jfj-cristall_rec.json @@ -0,0 +1,9 @@ +{ + "name": "jfj-cristall_rec", + "buffer_size": 0, + "pid_buffer": 0, + "pipeline_type": "fanin", + "input_mode": "PULL", + "input_stream": "tcp://*:8000", + "mode": "PUB" +} \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 41c5a95..eea7607 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -44,6 +44,7 @@ "#jungfrau_proc": "jungfrau_proc", "#simulation_3_proc": "simulation_3_proc", "#test_dispatcher_waveforms": "test_dispatcher_waveforms", + "#test_ivan": "test_ivan", "#test_load_file": "test_load_file", "#test_merge": "test_merge", "#test_merge_disp_sp": "test_merge_disp_sp", @@ -121,9 +122,10 @@ "SLG-LCAM-C111_proc": "SLG-LCAM-C111_proc", "SSL-LCAM-C0103_proc": "SSL-LCAM-C0103_proc", "SSL-LCAM-C0104_proc": "SSL-LCAM-C0104_proc", + "jfj-cristall_db": "jfj-cristall_db", + "jfj-cristall_rec": "jfj-cristall_rec", "simulation_3_sp": "simulation_3_sp", "simulation_sp": "simulation_sp", "test_furka": "test_furka", - "test_furka_proc": "test_furka_proc", - "test_ivan": "test_ivan" + "test_furka_proc": "test_furka_proc" } \ No newline at end of file diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index 584a97a..c58ffde 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -359,8 +359,10 @@ "SLG-LCAM-C082_proc:9005", "SLG-LCAM-C083_proc:9006", "SLG-LCAM-C091_proc:9007", - "test_ivan:9050", + "#test_ivan:9050", "test_tadej:9020", + "jfj-cristall_rec:9050", + "jfj-cristall_db:9010", "DET-FURKA-1_sp" ] }