From f90fc56858eb429d683a7cb921997e3f8727da97 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Mar 2023 08:22:26 +0100 Subject: [PATCH] Mar 2023 --- .../camera_config/S10BC02-DSRM310.json | 4 +- .../camera_config/SARES20-CAMS142-C2.json | 12 +++--- .../camera_config/SARES20-CAMS142-M3.json | 8 ++-- .../camera_config/SARES20-PROF141-M1.json | 4 +- .../camera_config/SINBC02-DSRM310.json | 2 +- ...O02-C321.json => SLAAR02-LPMO01-C321.json} | 6 ++- .../camera_config/SLAAR02-LPMO02-C322.json | 3 +- .../camera_config/SLAAR21-LCAM-CS841.json | 3 +- .../camera_config/permanent_instances.json | 8 ++-- configuration/camera_config/servers.json | 4 +- .../pipeline_config/ROSAROP21-PPRM138_sp.json | 11 ++++++ .../pipeline_config/SARFE10-PBPS053_proc.json | 38 +++++++++---------- .../pipeline_config/SAROP21-ATT01_proc.json | 13 +++++-- .../pipeline_config/SAROP21-PBPS103_proc.json | 38 +++++++++---------- .../pipeline_config/SAROP21-PBPS133_proc.json | 38 +++++++++---------- .../pipeline_config/SATBD02-DSCR050_sp.json | 10 ++--- ...roc.json => SLAAR02-LPMO01-C321_proc.json} | 5 ++- .../SLAAR11-LAMIC-C451_sp.json | 3 +- .../pipeline_config/SLAAR11-LCAM-C421_sp.json | 3 +- .../pipeline_config/SLAAR11-LCAM-C432_sp.json | 3 +- .../pipeline_config/SLAAR11-LCAM-C433_sp.json | 3 +- .../pipeline_config/SLAAR11-LCAM-C452_sp.json | 3 +- .../pipeline_config/SLAAR11-LCAM-C453_sp.json | 3 +- .../pipeline_config/SLAAR21-LCAM-C511_sp.json | 3 +- .../pipeline_config/SLAAR21-LCAM-C531_sp.json | 3 +- .../pipeline_config/SLAAR21-LCAM-C532_sp.json | 3 +- .../pipeline_config/SLAAR21-LCAM-C561_sp.json | 3 +- .../SLAAR21-LCAM-CS841_proc.json | 2 + .../SLAAR21-LCAM-CS841_sp.json | 3 +- .../SLAAR21-LCAM-CS842_sp.json | 3 +- .../SLAAR21-LCAM-CS843_sp.json | 3 +- .../SLAAR21-LCAM-CS844_sp.json | 11 ++++++ .../SLAAR21-PSEN119_Spec_ROI_sp.json | 3 +- .../SLAAR21-PSEN119_Spec_sp.json | 3 +- .../SLAAR21-PSEN119_V1_sp.json | 3 +- .../pipeline_config/SLAAR21-PSEN135_sp.json | 3 +- .../pipeline_config/permanent_instances.json | 10 ++--- configuration/pipeline_config/servers.json | 2 +- 38 files changed, 171 insertions(+), 112 deletions(-) rename configuration/camera_config/{SLAAR02-LPMO02-C321.json => SLAAR02-LPMO01-C321.json} (55%) create mode 100644 configuration/pipeline_config/ROSAROP21-PPRM138_sp.json rename configuration/pipeline_config/{SLAAR02-LPMO02-C321_proc.json => SLAAR02-LPMO01-C321_proc.json} (75%) create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-CS844_sp.json diff --git a/configuration/camera_config/S10BC02-DSRM310.json b/configuration/camera_config/S10BC02-DSRM310.json index 03fac02..ac81bf5 100644 --- a/configuration/camera_config/S10BC02-DSRM310.json +++ b/configuration/camera_config/S10BC02-DSRM310.json @@ -24,6 +24,8 @@ ], "alias": [], "connections": 2, - "buffer_size": 40, + "_buffer_size": 40, + "threaded": true, + "debug": true, "_forwarder_port": 9015 } \ 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 d99c3b4..e65fe4c 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": [ - 1102, - 855, - 1202, - 955 + 567, + 460, + 570, + 464 ], - "reference_marker_width": 1233.0, - "reference_marker_height": 1245.0, + "reference_marker_width": 73.0, + "reference_marker_height": 96.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SARES20-CAMS142-M3.json b/configuration/camera_config/SARES20-CAMS142-M3.json index 8a725d8..66372e2 100644 --- a/configuration/camera_config/SARES20-CAMS142-M3.json +++ b/configuration/camera_config/SARES20-CAMS142-M3.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 297, + 352, + 502, 453, - 403, - 555 + 606 ], "reference_marker_width": 413.0, "reference_marker_height": 419.0, @@ -25,6 +25,6 @@ "Bernina" ], "alias": [ - "SAMPLECAM_INLINE (SARES20-CAMS142-M3)" + "CAMERA_BSSS (SARES20-CAMS142-M3)" ] } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-PROF141-M1.json b/configuration/camera_config/SARES20-PROF141-M1.json index 2903dfd..63048c7 100644 --- a/configuration/camera_config/SARES20-PROF141-M1.json +++ b/configuration/camera_config/SARES20-PROF141-M1.json @@ -1,9 +1,9 @@ { "camera_calibration": { "reference_marker": [ - 285, + 260, 176, - 449, + 424, 334 ], "reference_marker_width": 500.0, diff --git a/configuration/camera_config/SINBC02-DSRM310.json b/configuration/camera_config/SINBC02-DSRM310.json index b74cca5..9a60ba6 100644 --- a/configuration/camera_config/SINBC02-DSRM310.json +++ b/configuration/camera_config/SINBC02-DSRM310.json @@ -18,7 +18,7 @@ "image_background": null, "source_type": "bsread", "connections": 2, - "forwarder_port": 9011, + "_forwarder_port": 9011, "threaded": false, "source": "SINBC02-DSRM310", "name": "SINBC02-DSRM310", diff --git a/configuration/camera_config/SLAAR02-LPMO02-C321.json b/configuration/camera_config/SLAAR02-LPMO01-C321.json similarity index 55% rename from configuration/camera_config/SLAAR02-LPMO02-C321.json rename to configuration/camera_config/SLAAR02-LPMO01-C321.json index a673535..cb3b5b9 100644 --- a/configuration/camera_config/SLAAR02-LPMO02-C321.json +++ b/configuration/camera_config/SLAAR02-LPMO01-C321.json @@ -4,7 +4,9 @@ "mirror_y": true, "rotate": 0, "source_type": "bsread", - "name": "SLAAR02-LPMO02-C321", + "name": "SLAAR02-LPMO01-C321", "protocol": "tcp", - "source": "SLAAR02-LPMO02-C321" + "source": "SLAAR02-LPMO01-C321", + "debug": true, + "forwarder_port": 9030 } \ No newline at end of file diff --git a/configuration/camera_config/SLAAR02-LPMO02-C322.json b/configuration/camera_config/SLAAR02-LPMO02-C322.json index 937618e..366b6ca 100644 --- a/configuration/camera_config/SLAAR02-LPMO02-C322.json +++ b/configuration/camera_config/SLAAR02-LPMO02-C322.json @@ -6,5 +6,6 @@ "source_type": "bsread", "name": "SLAAR02-LPMO02-C322", "protocol": "tcp", - "source": "SLAAR02-LPMO02-C322" + "source": "SLAAR02-LPMO02-C322", + "forwarder_port": 9031 } \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-CS841.json b/configuration/camera_config/SLAAR21-LCAM-CS841.json index e28b819..3818a75 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CS841.json +++ b/configuration/camera_config/SLAAR21-LCAM-CS841.json @@ -6,5 +6,6 @@ "source_type": "bsread", "name": "SLAAR21-LCAM-CS841", "protocol": "tcp", - "source": "SLAAR21-LCAM-CS841" + "source": "SLAAR21-LCAM-CS841", + "_debug": true } \ No newline at end of file diff --git a/configuration/camera_config/permanent_instances.json b/configuration/camera_config/permanent_instances.json index e25637a..7060264 100644 --- a/configuration/camera_config/permanent_instances.json +++ b/configuration/camera_config/permanent_instances.json @@ -1,5 +1,6 @@ { - "S10BC02-DSRM310": "S10BC02-DSRM310", + "#S10BC02-DSRM310": "S10BC02-DSRM310", + "#SINBC02-DSRM310": "SINBC02-DSRM310", "S10BD01-DSCR030": "S10BD01-DSCR030", "SARCL01-DSCR170": "SARCL01-DSCR170", "SARES11-SPEC125-M1": "SARES11-SPEC125-M1", @@ -19,6 +20,7 @@ "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" + "SINDI02-DSCR075": "SINDI02-DSCR075", + "SLAAR02-LPMO01-C321": "SLAAR02-LPMO01-C321", + "SLAAR02-LPMO02-C322": "SLAAR02-LPMO02-C322" } \ No newline at end of file diff --git a/configuration/camera_config/servers.json b/configuration/camera_config/servers.json index 2f78209..5b1a970 100644 --- a/configuration/camera_config/servers.json +++ b/configuration/camera_config/servers.json @@ -81,7 +81,9 @@ "SARES20-CAMS142-M5", "SARES20-PROF141-M1", "SARES20-PROF142-M1", - "SARES20-PROF146-M1" + "SARES20-PROF146-M1", + "SLAAR02-LPMO01-C321", + "SLAAR02-LPMO02-C322" ] }, "http://sf-daqsync-15.psi.ch:8880": { diff --git a/configuration/pipeline_config/ROSAROP21-PPRM138_sp.json b/configuration/pipeline_config/ROSAROP21-PPRM138_sp.json new file mode 100644 index 0000000..dd28869 --- /dev/null +++ b/configuration/pipeline_config/ROSAROP21-PPRM138_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": "ROSAROP21-PPRM138", + "name": "ROSAROP21-PPRM138_sp" +} \ 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 d1f4dfd..9b74ffc 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": 33.38277538730609, - "down_calib": 38.98320000065795, - "left_calib": 133.26269065370963, - "right_calib": 35.96174311387501, - "horiz_calib": -8.942189744736796, - "vert_calib": -15.059623048000972, + "up_calib": 0.15959758776955815, + "down_calib": 0.17081416074661804, + "left_calib": 0.44737311355742443, + "right_calib": 0.2736612788911648, + "horiz_calib": -3.928214392529789, + "vert_calib": -7.346281801499673, "uJ_calib": 834.5191797495979, "threshold": 0, "queue_length": 5000, @@ -60,9 +60,9 @@ 0.3 ], "calib_x_norm": [ - -0.044276707967410095, - 0.2216799592001407, - -0.11137436716807164 + 0.07705425324290305, + 0.000292090419390871, + -0.0756869008908959 ], "calib_y_range": [ -0.3, @@ -70,20 +70,20 @@ 0.3 ], "calib_y_norm": [ - 0.016053576105342932, - -0.03239810243257117, - -0.02378805858149902 + 0.0405085485929619, + 0.00025258183377802507, + -0.04116542147956046 ], "calib_time": "2022-11-28 16:19:37", - "calib_datetime": "2023-03-09 11:37:14", + "calib_datetime": "2023-03-13 17:13:41", "calib_x_norm_std": [ - 6.569011858433683, - 4.163696679190494, - 5.902739707642632 + 0.06063214980948818, + 0.06221414202235211, + 0.06667909972355505 ], "calib_y_norm_std": [ - 1.8525151129719428, - 1.8281777825463978, - 1.7905656431049954 + 0.06069608759370142, + 0.05655588611057008, + 0.06231444141801817 ] } \ 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 66a2b33..51402f1 100644 --- a/configuration/pipeline_config/SAROP21-ATT01_proc.json +++ b/configuration/pipeline_config/SAROP21-ATT01_proc.json @@ -1,10 +1,14 @@ { - "bsread_address": "", - "bsread_channels": [ + "_bsread_address": "", + "_bsread_channels": [ "SARES20-CAMS142-M5.processing_parameters", "SARES20-CAMS142-M5.roi_signal_x_profile", "SAR-CVME-TIFALL5:EvtSet" ], + "input_stream": "tcp://sf-daqsync-02:31852", + "input_mode": "PULL", + "input_stream2": "tcp://sf-daqsync-14.psi.ch:8011", + "input_mode2": "SUB", "prof_sig": "SARES20-CAMS142-M5.roi_signal_x_profile", "events": "SAR-CVME-TIFALL5:EvtSet", "function": "SAROP21-ATT01_Test_proc.py", @@ -26,5 +30,8 @@ "fel_on_event": 13, "use_dark": true, "filter_window": 201, - "filter": true + "filter": true, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true } \ 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 d9f2b54..eec2f97 100644 --- a/configuration/pipeline_config/SAROP21-PBPS103_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS103_proc.json @@ -1,17 +1,17 @@ { - "down_calib": 0.5675808419366034, + "down_calib": 0.925051999223361, "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": -5.385929776542216, + "vert_calib": -4.152380380460691, "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": 0.588664563052753, + "left_calib": 0.592104590438952, "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": 5.692288530118327, + "horiz_calib": 4.531983059644944, "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": 0.5597192669314763, + "right_calib": 0.5373571035335166, "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": 0.5299009343813997, + "up_calib": 0.8728614328997423, "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.056916099813404716, - 0.004728343064317412, - 0.048489660422633016 + -0.06797377853298164, + -0.0009580296260295205, + 0.06441859630678808 ], "calib_y_range": [ -0.3, @@ -72,19 +72,19 @@ 0.3 ], "calib_y_norm": [ - 0.05952637576098334, - 0.003397816524308052, - -0.05187500243990399 + 0.07236402801811882, + -0.000407067239587218, + -0.07213140472772038 ], "calib_x_norm_std": [ - 0.47656358898129575, - 0.4841833672049315, - 0.48412264263551147 + 0.3940719769827127, + 0.42532517996523833, + 0.42020614864443373 ], "calib_y_norm_std": [ - 0.4860358874467544, - 0.4841173336939509, - 0.4843848136849683 + 0.42239995772576555, + 0.4500649064126412, + 0.41921484991436164 ], - "calib_datetime": "2023-02-28 15:50:05" + "calib_datetime": "2023-03-14 07:11:51" } \ 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 973ef9c..366a512 100644 --- a/configuration/pipeline_config/SAROP21-PBPS133_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS133_proc.json @@ -17,12 +17,12 @@ "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, + "up_calib": 0.0010504606378507835, + "down_calib": 0.0009209850097155413, + "left_calib": 0.0006156641044110984, + "right_calib": 0.0006645081227811658, + "horiz_calib": 4.316472997878828, + "vert_calib": -4.041701035850821, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 3000, @@ -60,14 +60,14 @@ 0.3 ], "calib_x_norm": [ - -0.5812293065847222, - -0.8991059719528638, - -0.8453347541122557 + -0.07229701327145448, + -0.0020412231780527973, + 0.06670536211577673 ], "calib_x_norm_std": [ - 110.6683449364253, - 21.66837488282107, - 32.271201566713536 + 0.43124994316822457, + 0.45719807355582054, + 0.4506818634031104 ], "calib_y_range": [ -0.3, @@ -75,14 +75,14 @@ 0.3 ], "calib_y_norm": [ - 1.0281522031558, - 1.2070492666749295, - 0.9855457943670932 + 0.0734976063766549, + 0.0011626610457825006, + -0.07495473947422855 ], "calib_y_norm_std": [ - 32.38796859628957, - 265.99931210001046, - 16.277067158433667 + 0.453938099305691, + 0.4620603045418818, + 0.44751356947088244 ], - "calib_datetime": "2023-02-24 10:23:46" + "calib_datetime": "2023-03-14 07:14:27" } \ 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 f7699f5..f8152bb 100644 --- a/configuration/pipeline_config/SATBD02-DSCR050_sp.json +++ b/configuration/pipeline_config/SATBD02-DSCR050_sp.json @@ -3,13 +3,13 @@ "image_background": "SATBD02-DSCR050_20221013_123827_350915", "image_threshold": null, "image_region_of_interest": [ - 335, - 1463, - 233, - 1481 + 232, + 1625, + 534, + 861 ], "image_good_region": { - "threshold": 0.1, + "threshold": 0.10000000000000003, "gfscale": 10.0 }, "image_slices": null, diff --git a/configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json b/configuration/pipeline_config/SLAAR02-LPMO01-C321_proc.json similarity index 75% rename from configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json rename to configuration/pipeline_config/SLAAR02-LPMO01-C321_proc.json index 55cd56f..41dbfd0 100644 --- a/configuration/pipeline_config/SLAAR02-LPMO02-C321_proc.json +++ b/configuration/pipeline_config/SLAAR02-LPMO01-C321_proc.json @@ -6,9 +6,10 @@ "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "camera_name": "SLAAR02-LPMO02-C321", - "name": "SLAAR02-LPMO02-C321_proc", + "camera_name": "SLAAR02-LPMO01-C321", + "name": "SLAAR02-LPMO01-C321_proc", "function": "pprm_simple.py", "mode": "PUSH", + "debug": true, "no_client_timeout": 0 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR11-LAMIC-C451_sp.json b/configuration/pipeline_config/SLAAR11-LAMIC-C451_sp.json index c988b79..5dcc313 100644 --- a/configuration/pipeline_config/SLAAR11-LAMIC-C451_sp.json +++ b/configuration/pipeline_config/SLAAR11-LAMIC-C451_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR11-LAMIC-C451", - "name": "SLAAR11-LAMIC-C451_sp" + "name": "SLAAR11-LAMIC-C451_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR11-LCAM-C421_sp.json b/configuration/pipeline_config/SLAAR11-LCAM-C421_sp.json index fc4f070..13b3ac2 100644 --- a/configuration/pipeline_config/SLAAR11-LCAM-C421_sp.json +++ b/configuration/pipeline_config/SLAAR11-LCAM-C421_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR11-LCAM-C421", - "name": "SLAAR11-LCAM-C421_sp" + "name": "SLAAR11-LCAM-C421_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR11-LCAM-C432_sp.json b/configuration/pipeline_config/SLAAR11-LCAM-C432_sp.json index db5982d..42f5a0c 100644 --- a/configuration/pipeline_config/SLAAR11-LCAM-C432_sp.json +++ b/configuration/pipeline_config/SLAAR11-LCAM-C432_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR11-LCAM-C432", - "name": "SLAAR11-LCAM-C432_sp" + "name": "SLAAR11-LCAM-C432_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR11-LCAM-C433_sp.json b/configuration/pipeline_config/SLAAR11-LCAM-C433_sp.json index 2bec024..408e6ac 100644 --- a/configuration/pipeline_config/SLAAR11-LCAM-C433_sp.json +++ b/configuration/pipeline_config/SLAAR11-LCAM-C433_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR11-LCAM-C433", - "name": "SLAAR11-LCAM-C433_sp" + "name": "SLAAR11-LCAM-C433_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR11-LCAM-C452_sp.json b/configuration/pipeline_config/SLAAR11-LCAM-C452_sp.json index 34b11f7..b403029 100644 --- a/configuration/pipeline_config/SLAAR11-LCAM-C452_sp.json +++ b/configuration/pipeline_config/SLAAR11-LCAM-C452_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR11-LCAM-C452", - "name": "SLAAR11-LCAM-C452_sp" + "name": "SLAAR11-LCAM-C452_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR11-LCAM-C453_sp.json b/configuration/pipeline_config/SLAAR11-LCAM-C453_sp.json index cb20559..6dd3ff8 100644 --- a/configuration/pipeline_config/SLAAR11-LCAM-C453_sp.json +++ b/configuration/pipeline_config/SLAAR11-LCAM-C453_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR11-LCAM-C453", - "name": "SLAAR11-LCAM-C453_sp" + "name": "SLAAR11-LCAM-C453_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C511_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C511_sp.json index d598e8f..b8f7443 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-C511_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-C511_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-C511", - "name": "SLAAR21-LCAM-C511_sp" + "name": "SLAAR21-LCAM-C511_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C531_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C531_sp.json index be1253b..6510e64 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-C531_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-C531_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-C531", - "name": "SLAAR21-LCAM-C531_sp" + "name": "SLAAR21-LCAM-C531_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C532_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C532_sp.json index eb2c78b..1917d3c 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-C532_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-C532_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-C532", - "name": "SLAAR21-LCAM-C532_sp" + "name": "SLAAR21-LCAM-C532_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C561_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C561_sp.json index d7661e4..5323644 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-C561_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-C561_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-C561", - "name": "SLAAR21-LCAM-C561_sp" + "name": "SLAAR21-LCAM-C561_sp", + "max_frame_rate": 10.1 } \ 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 index accb8c0..bae3a25 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS841_proc.json @@ -10,5 +10,7 @@ "name": "SLAAR21-LCAM-CS841_proc", "function": "pprm_simple.py", "mode": "PUSH", + "_debug": true, + "_processing_threads": 2, "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 index e5e450f..b23d403 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-CS841_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS841_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-CS841", - "name": "SLAAR21-LCAM-CS841_sp" + "name": "SLAAR21-LCAM-CS841_sp", + "max_frame_rate": 10.1 } \ 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 index 7e99f5b..9d1aa94 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-CS842_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS842_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-CS842", - "name": "SLAAR21-LCAM-CS842_sp" + "name": "SLAAR21-LCAM-CS842_sp", + "max_frame_rate": 10.1 } \ 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 index 4a58dd4..ba18d81 100644 --- a/configuration/pipeline_config/SLAAR21-LCAM-CS843_sp.json +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS843_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-LCAM-CS843", - "name": "SLAAR21-LCAM-CS843_sp" + "name": "SLAAR21-LCAM-CS843_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-CS844_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-CS844_sp.json new file mode 100644 index 0000000..5d58fe3 --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-CS844_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-CS844", + "name": "SLAAR21-LCAM-CS844_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-PSEN119_Spec_ROI_sp.json b/configuration/pipeline_config/SLAAR21-PSEN119_Spec_ROI_sp.json index d0d63f1..0d18b53 100644 --- a/configuration/pipeline_config/SLAAR21-PSEN119_Spec_ROI_sp.json +++ b/configuration/pipeline_config/SLAAR21-PSEN119_Spec_ROI_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-PSEN119_Spec_ROI", - "name": "SLAAR21-PSEN119_Spec_ROI_sp" + "name": "SLAAR21-PSEN119_Spec_ROI_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-PSEN119_Spec_sp.json b/configuration/pipeline_config/SLAAR21-PSEN119_Spec_sp.json index 73e5f5e..c2c6032 100644 --- a/configuration/pipeline_config/SLAAR21-PSEN119_Spec_sp.json +++ b/configuration/pipeline_config/SLAAR21-PSEN119_Spec_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-PSEN119_Spec", - "name": "SLAAR21-PSEN119_Spec_sp" + "name": "SLAAR21-PSEN119_Spec_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-PSEN119_V1_sp.json b/configuration/pipeline_config/SLAAR21-PSEN119_V1_sp.json index 09b0695..55ca159 100644 --- a/configuration/pipeline_config/SLAAR21-PSEN119_V1_sp.json +++ b/configuration/pipeline_config/SLAAR21-PSEN119_V1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-PSEN119_V1", - "name": "SLAAR21-PSEN119_V1_sp" + "name": "SLAAR21-PSEN119_V1_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-PSEN135_sp.json b/configuration/pipeline_config/SLAAR21-PSEN135_sp.json index 183c736..120696f 100644 --- a/configuration/pipeline_config/SLAAR21-PSEN135_sp.json +++ b/configuration/pipeline_config/SLAAR21-PSEN135_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLAAR21-PSEN135", - "name": "SLAAR21-PSEN135_sp" + "name": "SLAAR21-PSEN135_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 338ddd1..803b90e 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -1,5 +1,6 @@ { "#S10BC02-DSRM310_ib": "S10BC02-DSRM310_ib", + "#S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles", "#S10BD01-DSCR030_ib": "S10BD01-DSCR030_ib", "#SARCL01-DSCR170_ib": "SARCL01-DSCR170_ib", "#SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db", @@ -39,14 +40,15 @@ "#SATES31-CAMS187-RIXS1_ib": "SATES31-CAMS187-RIXS1_ib", "#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", "#jungfrau_proc": "jungfrau_proc", "#test_furka": "test_furka", "#test_merge": "test_merge", "#test_proc_with_bs": "test_proc_with_bs", "#test_stream": "test_stream", + "#test_tadej": "test_tadej", "#testdb_ib": "testdb_ib", - "S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles", "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles", "SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles", "SARES11-XMI125-C4P1_db": "SARES11-XMI125-C4P1_db", @@ -78,14 +80,12 @@ "SATES30-CAMS182-GIGE2_profiles": "SATES30-CAMS182-GIGE2_profiles", "SATES31-CAMS187-RIXS1_proc": "SATES31-CAMS187-RIXS1_proc", "SATOP31-PMOS132-2D_pmos": "SATOP31-PMOS132-2D_pmos", - "SINBC02-DSRM310_profiles": "SINBC02-DSRM310_profiles", "SINDI02-DSCR075_profiles": "SINDI02-DSCR075_profiles", - "SLAAR02-LPMO02-C321_proc": "SLAAR02-LPMO02-C321_proc", + "SLAAR02-LPMO01-C321_proc": "SLAAR02-LPMO01-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_str": "test_str", - "test_tadej": "test_tadej" + "test_str": "test_str" } \ No newline at end of file diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index 4a4ed61..8817684 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -224,7 +224,7 @@ "SLAAR21-LCAM-CS842_proc:9022", "SLAAR21-LCAM-CS843_proc:9023", "SLAAR21-LCAM-CS844_proc:9024", - "SLAAR02-LPMO02-C321_proc:9025", + "SLAAR02-LPMO01-C321_proc:9025", "SLAAR02-LPMO02-C322_proc:9026", "#arrival_time_proc:9008", "test_arrival"