This commit is contained in:
root
2023-10-24 13:02:07 +02:00
parent 3a50997204
commit 52028adedf
96 changed files with 378 additions and 208 deletions
@@ -1,13 +1,13 @@
{
"camera_calibration": {
"reference_marker": [
714,
483,
716,
485
913,
589,
915,
591
],
"reference_marker_width": 0.9501187648456056,
"reference_marker_height": 0.9690721649484536,
"reference_marker_width": 3.2,
"reference_marker_height": 3.2,
"angle_horizontal": 0.0,
"angle_vertical": 0.0
},
@@ -1,13 +1,13 @@
{
"camera_calibration": {
"reference_marker": [
345,
284,
347,
286
298,
213,
407,
314
],
"reference_marker_width": 5.9405940594059405,
"reference_marker_height": 5.9405940594059405,
"reference_marker_width": 324.0,
"reference_marker_height": 300.0,
"angle_horizontal": 0.0,
"angle_vertical": 0.0
},
@@ -33,5 +33,5 @@
],
"alias": [],
"protocol": "tcp",
"forwarder_port": 8890
"_forwarder_port": 8890
}
@@ -11,5 +11,6 @@
"group": [
"Photonics",
"Maloja"
]
],
"forwarder_port": 9041
}
@@ -21,5 +21,6 @@
"group": [
"Photonics",
"Maloja"
]
],
"forwarder_port": 9042
}
@@ -1,10 +1,10 @@
{
"camera_calibration": {
"reference_marker": [
515,
101,
1440,
1022
195,
22,
1433,
1240
],
"reference_marker_width": 5000.0,
"reference_marker_height": 5000.0,
@@ -22,7 +22,7 @@
"name": "SATOP31-PMOS132-2D",
"connections": 2,
"buffer_size": 0,
"forwarder_port": 9002,
"_forwarder_port": 9002,
"group": [
"Photonics"
],
@@ -1,13 +1,13 @@
{
"camera_calibration": {
"reference_marker": [
1281,
1078,
1283,
1080
1199,
1034,
1361,
1054
],
"reference_marker_width": 11.93288590604027,
"reference_marker_height": 11.93,
"reference_marker_width": 1000.0,
"reference_marker_height": 123.0,
"angle_horizontal": 0.0,
"angle_vertical": 0.0
},
@@ -19,6 +19,8 @@
"SAROP31-PPRM150": "SAROP31-PPRM150",
"SATBD02-DSCR050": "SATBD02-DSCR050",
"SATES21-CAMS-PATT1": "SATES21-CAMS-PATT1",
"SATES21-CAMS154-GIGE6": "SATES21-CAMS154-GIGE6",
"SATES21-CAMS154-GIGE7": "SATES21-CAMS154-GIGE7",
"SATES21-CAMS154-GIGE8": "SATES21-CAMS154-GIGE8",
"SATES21-CAMS154-M1": "SATES21-CAMS154-M1",
"SATES24-CAMS161-M1": "SATES24-CAMS161-M1",
+8
View File
@@ -58,6 +58,14 @@
"SATES21-CAMS154-M1",
"SATES24-CAMS161-M1",
"SATES21-CAMS-PATT1",
"SATES21-CAMS154-GIGE1",
"SATES21-CAMS154-GIGE2",
"SATES21-CAMS154-GIGE3",
"SATES21-CAMS154-GIGE4",
"SATES21-CAMS154-GIGE5",
"SATES21-CAMS154-GIGE6",
"SATES21-CAMS154-GIGE7",
"SATES21-CAMS154-GIGE7b",
"SATES21-CAMS154-GIGE8"
]
},
@@ -10,5 +10,6 @@
"camera_name": "S10BC02-DSRM310",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -10,5 +10,6 @@
"camera_name": "S10BD01-DSCR030",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -0,0 +1,16 @@
{
"pipeline_type": "stream",
"abort_on_timeout": false,
"name": "SARBD01-DSCR110_sp_rep",
"input_pipeline": "SARBD01-DSCR110_sp",
"input_mode": "SUB",
"mode": "PUB",
"block": false,
"function": "propagate_stream",
"image_slices": {
"number_of_slices": 50,
"scale": 2
},
"no_client_timeout": 0,
"input_stream": "tcp://sf-daqsync-09.psi.ch:11106"
}
@@ -10,5 +10,6 @@
"camera_name": "SARCL01-DSCR170",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -10,6 +10,7 @@
"camera_name": "SARES11-SPEC125-M1",
"name": "SARES11-SPEC125-M1_psen_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_signal": [
0,
2048,
@@ -6,15 +6,16 @@
"image_good_region": null,
"image_slices": null,
"pipeline_type": "processing",
"function": "SARES11-SPEC125-M2_pp.py",
"function": "SARES11-SPEC125-M2_jetprojections.py",
"camera_name": "SARES11-SPEC125-M2",
"name": "SARES11-SPEC125-M2_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_signal": [
0,
2048,
200,
400
1350,
1900,
600,
900
],
"roi_background": [
0,
@@ -10,6 +10,7 @@
"camera_name": "SARES11-SPEC125-M2",
"name": "SARES11-SPEC125-M2_pp_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_background": [
0,
2048,
@@ -10,6 +10,7 @@
"camera_name": "SARES11-SPEC125-M2",
"name": "SARES11-SPEC125-M2_psen_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_background": [
0,
2048,
@@ -10,6 +10,7 @@
"camera_name": "SARES11-XMI125-C4P1",
"name": "SARES11-XMI125-C4P1_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_signal": [
550,
900,
@@ -10,6 +10,7 @@
"camera_name": "SARES12-CAMS128-M1",
"name": "SARES12-CAMS128-M1_psen_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_signal": [
0,
2048,
@@ -10,6 +10,7 @@
"camera_name": "SARES20-CAMS142-M1",
"name": "SARES20-CAMS142-M1_psen_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_background": [
0,
1200,
@@ -10,5 +10,6 @@
"name": "SARES20-CAMS142-M3_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0
}
@@ -10,6 +10,7 @@
"name": "SARES20-CAMS142-M3_spec",
"function": "psss_2.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "",
"processing_threads": 8,
@@ -10,6 +10,7 @@
"camera_name": "SARES20-CAMS142-M4",
"name": "SARES20-CAMS142-M4_psen_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_background": [
0,
2048,
@@ -6,11 +6,12 @@
"image_good_region": null,
"image_slices": null,
"pipeline_type": "processing",
"function":"psen",
"function": "psen",
"camera_name": "SARES20-CAMS142-M4",
"name": "SARES20-CAMS142-M4_psen_dw",
"mode": "PUSH",
"buffer_size":100,
"no_client_timeout":30,
"queue_size":1
}
"allow_type_changes": false,
"buffer_size": 100,
"no_client_timeout": 30,
"queue_size": 1
}
@@ -11,6 +11,7 @@
"name": "SARES20-CAMS142-M5_psen_db",
"_mode": "PUSH",
"mode": "PUB",
"allow_type_changes": false,
"roi_signal": [
300,
2040,
@@ -6,11 +6,12 @@
"image_good_region": null,
"image_slices": null,
"pipeline_type": "processing",
"function":"psen",
"function": "psen",
"camera_name": "SARES20-CAMS142-M5",
"name": "SARES20-CAMS142-M5_psen_dw",
"mode": "PUSH",
"buffer_size":100,
"no_client_timeout":30,
"queue_size":1
}
"allow_type_changes": false,
"buffer_size": 100,
"no_client_timeout": 30,
"queue_size": 1
}
@@ -9,5 +9,6 @@
"camera_name": "SARES20-DSDPPRM",
"name": "SARES20-DSDPPRM_proc",
"function": "pprm_simple",
"mode": "PUSH"
"mode": "PUSH",
"allow_type_changes": false
}
@@ -12,5 +12,6 @@
"processing_threads": 3,
"thread_buffer_size": 20,
"send_buffer_size": 50,
"mode": "PUSH"
"mode": "PUSH",
"allow_type_changes": false
}
@@ -10,6 +10,7 @@
"name": "SARES20-PROF142-M1_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "9017",
"reload": true
@@ -10,6 +10,7 @@
"name": "SARES20-PROF142-M1_spec",
"function": "psss_2.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "",
"processing_threads": 8,
@@ -9,5 +9,6 @@
"camera_name": "SARES20-PROF146-M1",
"name": "SARES20-PROF146-M1_proc",
"function": "bernina",
"mode": "PUSH"
}
"mode": "PUSH",
"allow_type_changes": false
}
@@ -10,6 +10,7 @@
"name": "SARES30-CAMS156-XE_proc",
"function": "pprm.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"block": false,
"reload": true
@@ -9,6 +9,7 @@
"SARFE10-CVME-PHO6212:Lnk9Ch15-DATA-SUM"
],
"mode": "PUB",
"allow_type_changes": false,
"function": "pbps.py",
"reload": true,
"no_client_timeout": 0,
@@ -13,6 +13,7 @@
"name": "SARFE10-PPRM064_proc",
"function": "pprm",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "9015"
}
@@ -10,6 +10,7 @@
"name": "SARFE10-PSSS059_psss",
"function": "psss_2.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "8889",
"reload": true,
@@ -10,6 +10,7 @@
"SARFE10-PSSS059:SPECTRUM_Y"
],
"mode": "PUB",
"allow_type_changes": false,
"function": "psss_avg",
"no_client_timeout": 0,
"port": "9005",
@@ -10,6 +10,7 @@
"function": "SAROP11-ATT01_proc.py",
"device": "SAROP11-ATT01",
"mode": "PUB",
"allow_type_changes": false,
"name": "SAROP11-ATT01_proc",
"no_client_timeout": 0,
"pipeline_type": "stream",
@@ -26,4 +27,4 @@
"filter_window": 51,
"filter": true,
"port": 9001
}
}
@@ -11,6 +11,7 @@
"SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM"
],
"mode": "PUB",
"allow_type_changes": false,
"function": "pbps.py",
"reload": true,
"no_client_timeout": 0,
@@ -19,12 +20,12 @@
"down": "SAROP11-CVME-PBPS2:Lnk9Ch11-DATA-SUM",
"right": "SAROP11-CVME-PBPS2:Lnk9Ch14-DATA-SUM",
"left": "SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM",
"up_calib": 7.41032040343848,
"down_calib": 9.898039263159411,
"left_calib": 6.6748505812954155,
"right_calib": 7.8999311453695045,
"horiz_calib": -4.082076042386935,
"vert_calib": 4.160647762472708,
"up_calib": 0.5667819233673512,
"down_calib": 0.6894526330468388,
"left_calib": 0.3986116651107818,
"right_calib": 0.4440949148202752,
"horiz_calib": -4.757387343587321,
"vert_calib": 4.6493267695157385,
"uJ_calib": 605.4608924473305,
"threshold": 0,
"queue_length": 5000,
@@ -62,9 +63,9 @@
0.3
],
"calib_x_norm": [
0.072913611189913,
-0.002722244049207188,
-0.07407042187801549
0.062669573236063,
-0.00022005607047881966,
-0.06345007115420614
],
"calib_y_range": [
-0.3,
@@ -72,19 +73,19 @@
0.3
],
"calib_y_norm": [
-0.07335767612825887,
-0.0001123677804489643,
0.07085063811832251
-0.06458958089191447,
0.0013075448092699194,
0.06446136126470543
],
"calib_datetime": "2023-09-14 15:24:40",
"calib_datetime": "2023-10-09 17:35:46",
"calib_x_norm_std": [
0.364447432613983,
0.37483120676975207,
0.3639987874335917
0.04538184772694033,
0.04741190286825635,
0.04190871255021984
],
"calib_y_norm_std": [
0.3704531315278293,
0.3741944306116198,
0.39299923267964687
0.059742138998617196,
0.05503841499919202,
0.061553251337725524
]
}
@@ -9,7 +9,10 @@
"SAROP11-PBPS122:Lnk9Ch0-PP_VAL_PD3"
],
"mode": "PUSH",
"allow_type_changes": false,
"processing_threads": 1,
"abort_on_timeout": true,
"abort_on_error": true,
"debug": true,
"block": false,
"stream_timeout": 20,
@@ -13,9 +13,16 @@
"events": "SAR-CVME-TIFALL5:EvtSet",
"function": "SAROP21-ATT01_Debug_proc.py",
"device": "SAROP21-ATT01",
"mode": "PUB",
"mode": "PUSH",
"allow_type_changes": false,
"name": "SAROP21-ATT01_proc",
"no_client_timeout": 0,
"processing_threads": 1,
"abort_on_timeout": true,
"abort_on_error": false,
"debug": true,
"block": false,
"stream_timeout": 20,
"pipeline_type": "stream",
"reload": true,
"calib": [
@@ -1,21 +1,22 @@
{
"down_calib": 0.8709627542091036,
"down_calib": 0.6776148346242159,
"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.343524844450063,
"vert_calib": -4.1515389887188725,
"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.503989977652582,
"left_calib": 0.42478367611829265,
"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",
"mode": "PUB",
"allow_type_changes": false,
"queue_length": 5000,
"xpos_evn_w_pvname": "SAROP21-PBPS103:XPOS-EVN-HIST-W",
"ypos_odd_y_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-Y",
@@ -23,7 +24,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.145145282136136,
"horiz_calib": 5.3109820165021535,
"ypos_all_m_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-M",
"ypos_dif_m_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-M",
"bsread_channels": [
@@ -37,7 +38,7 @@
"pipeline_type": "stream",
"stream_timeout": 20,
"ypos_all_x_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-X",
"right_calib": 0.4568578469578163,
"right_calib": 0.3858345895568209,
"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 +52,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.8203982275839259,
"up_calib": 0.6238403279438393,
"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 +63,9 @@
0.3
],
"calib_x_norm": [
-0.05704120310088223,
0.00035393702507686883,
0.05957357978643304
-0.057015299750002656,
0.0011554150937345086,
0.05595815753825302
],
"calib_y_range": [
-0.3,
@@ -72,19 +73,19 @@
0.3
],
"calib_y_norm": [
0.0709624219253421,
-0.00014561524076284058,
-0.06717423470427285
0.07377056469911934,
-0.0007700758942303132,
-0.07075415291292807
],
"calib_x_norm_std": [
0.32910395462768066,
0.33531297049221437,
0.3224623775263659
0.3912513863330545,
0.33979404347367814,
0.35849025842147947
],
"calib_y_norm_std": [
0.3401331400463244,
0.3304383701027726,
0.3310795545018731
0.39103341690150445,
0.37747061460501213,
0.39400898893958414
],
"calib_datetime": "2023-09-15 09:41:06"
"calib_datetime": "2023-10-03 07:48:00"
}
@@ -9,6 +9,13 @@
"SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD3"
],
"mode": "PUSH",
"allow_type_changes": false,
"processing_threads": 1,
"abort_on_timeout": true,
"abort_on_error": false,
"debug": true,
"block": false,
"stream_timeout": 20,
"function": "pbps_full.py",
"reload": true,
"no_client_timeout": 0,
@@ -17,12 +24,12 @@
"down": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD2",
"right": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD3",
"left": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD0",
"up_calib": 1.8277229306557535e-05,
"down_calib": 1.737522848425457e-05,
"left_calib": 1.0840028496266912e-05,
"right_calib": 1.0113004328446757e-05,
"horiz_calib": -4.701764883734,
"vert_calib": -4.323462656133165,
"up_calib": 1.5389517301018466e-05,
"down_calib": 1.467647070564706e-05,
"left_calib": 9.792731740491983e-06,
"right_calib": 9.140366116267942e-06,
"horiz_calib": -4.403049705481173,
"vert_calib": -4.143007729427544,
"uJ_calib": 605.4608924473305,
"threshold": 0,
"queue_length": 3000,
@@ -60,14 +67,14 @@
0.3
],
"calib_x_norm": [
0.06484457045655358,
-0.0003184531823874863,
-0.06276708491901213
0.06888455615546296,
-0.0010306772860041692,
-0.06738463000727442
],
"calib_x_norm_std": [
0.3451578973161714,
0.3661570941479462,
0.350052629151749
0.42942925280271577,
0.39658630285672014,
0.39668245256653745
],
"calib_y_range": [
-0.3,
@@ -75,14 +82,14 @@
0.3
],
"calib_y_norm": [
0.06921810506986649,
-0.0012512638357458307,
-0.06955954787200726
0.07364761176357257,
0.0006085135080750125,
-0.07117471037168067
],
"calib_y_norm_std": [
0.3544204373532124,
0.3809010695934321,
0.3627440054458453
0.4026880422356293,
0.40240959119693887,
0.39778796220601226
],
"calib_datetime": "2023-09-14 21:57:09"
"calib_datetime": "2023-10-03 07:45:28"
}
@@ -11,6 +11,7 @@
"SAROP21-CVME-PBPS2:Lnk9Ch4-DATA-SUM"
],
"mode": "PUB",
"allow_type_changes": false,
"function": "pbps.py",
"no_client_timeout": 0,
"port": "9009",
@@ -55,4 +56,4 @@
"xpos_dif_w_pvname": "SAROP21-PBPS138:XPOS-DIF-HIST-W",
"ypos_dif_m_pvname": "SAROP21-PBPS138:YPOS-DIF-HIST-M",
"ypos_dif_w_pvname": "SAROP21-PBPS138:YPOS-DIF-HIST-W"
}
}
@@ -10,6 +10,7 @@
"name": "SAROP21-PPRM102_proc",
"function": "bernina",
"mode": "PUSH",
"allow_type_changes": false,
"multiprocessing": false,
"processing_threads": 0,
"thread_buffer_size": 5,
@@ -13,6 +13,7 @@
"name": "SAROP21-PPRM113_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "9016"
}
@@ -13,6 +13,7 @@
"name": "SAROP21-PPRM138_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "9015",
"reload": true
@@ -9,19 +9,26 @@
"SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3"
],
"mode": "PUSH",
"allow_type_changes": false,
"function": "pbps_full.py",
"reload": true,
"no_client_timeout": 0,
"processing_threads": 1,
"abort_on_timeout": true,
"abort_on_error": false,
"debug": true,
"block": false,
"stream_timeout": 20,
"up": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD1",
"down": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD2",
"right": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3",
"left": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD0",
"up_calib": 0.00015275739315231377,
"down_calib": 0.00013143547517078724,
"left_calib": 0.0002931904752969433,
"right_calib": 0.00039583016669199984,
"horiz_calib": -4.305375579443304,
"vert_calib": -7.6300959536090875,
"up_calib": 3.4874916230451215e-05,
"down_calib": 2.8938407262475286e-05,
"left_calib": 6.668412901725199e-05,
"right_calib": 8.901396735964635e-05,
"horiz_calib": -3.852522089625701,
"vert_calib": -6.2976405058048845,
"uJ_calib": 941.943984588351,
"threshold": 0,
"queue_length": 5000,
@@ -60,14 +67,14 @@
0.3
],
"calib_x_norm": [
0.06989419000042109,
-1.8397199791929376e-05,
-0.06946647411092724
0.07749233353786725,
0.001282049484060931,
-0.07824979747176808
],
"calib_x_norm_std": [
0.04473345852473604,
0.04454186774767829,
0.04351371421737362
0.166014369496804,
0.1519798416480267,
0.1487731725522344
],
"calib_y_range": [
-0.3,
@@ -75,16 +82,14 @@
0.3
],
"calib_y_norm": [
0.039511556655187734,
1.0723688533509076e-05,
-0.03912441380285033
0.0479777250366171,
0.0008593204304962432,
-0.04729605241176959
],
"calib_y_norm_std": [
0.04080085889456772,
0.040232979350983585,
0.04159870689275296
0.15729264570026444,
0.15889926981179298,
0.16700609913611925
],
"calib_datetime": "2023-09-27 08:47:55",
"abort_on_timeout": true,
"abort_on_error": false
"calib_datetime": "2023-10-20 16:31:53"
}
@@ -10,7 +10,14 @@
"SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD4"
],
"mode": "PUSH",
"allow_type_changes": false,
"function": "pbps_full.py",
"processing_threads": 1,
"abort_on_timeout": true,
"abort_on_error": false,
"debug": true,
"block": false,
"stream_timeout": 20,
"reload": true,
"no_client_timeout": 0,
"up": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD1",
@@ -85,8 +92,5 @@
0.0455948853624268,
0.04522573724833574
],
"calib_datetime": "2023-09-27 08:53:51",
"block": false,
"abort_on_timeout": true,
"abort_on_error": false
"calib_datetime": "2023-09-27 08:53:51"
}
@@ -10,6 +10,7 @@
"name": "SAROP31-PPRM113_proc",
"function": "pprm.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "9001",
"reload": true
@@ -10,6 +10,7 @@
"name": "SAROP31-PPRM150_proc",
"function": "pprm.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"port": "9003",
"reload": true
@@ -4,6 +4,7 @@
"input_stream": "tcp://sf-daqsync-10:9020",
"pipeline_type": "stream",
"mode": "PUSH",
"allow_type_changes": false,
"function": "propagate_with_prefix",
"prefix": "SATBD02-DSCR050:",
"exclude": [
@@ -3,20 +3,13 @@
"image_background": "SATBD02-DSCR050_20230923_150234_114901",
"image_threshold": null,
"image_region_of_interest": [
278,
1288,
392,
1234
64,
1846,
111,
1858
],
"image_good_region": {
"threshold": 0.10000000000000003,
"gfscale": 5.0
},
"image_slices": {
"number_of_slices": 31,
"scale": 3.0,
"orientation": "horizontal"
},
"image_good_region": null,
"image_slices": null,
"pipeline_type": "processing",
"camera_name": "SATBD02-DSCR050",
"name": "SATBD02-DSCR050_sp",
@@ -24,10 +17,10 @@
"no_client_timeout": 0,
"port": "9020",
"Marker": [
1030,
904
707,
1295
],
"reload": true,
"function": "beam_full_width",
"function": "beam_full_width.py",
"fw_threshold": 0.1
}
@@ -1,33 +1,29 @@
{
"image_background_enable": "passive",
"image_background": "SATES21-CAMS-PATT1_20230911_011304_804105",
"image_background": "SATES21-CAMS-PATT1_20231006_125947_646571",
"image_threshold": null,
"image_region_of_interest": null,
"image_good_region": null,
"image_slices": null,
"pipeline_type": "processing",
"function_old": "spectrometer.py",
"function_old": "pprm_simple.py",
"function": "spectrometer.py",
"camera_name": "SATES21-CAMS-PATT1",
"name": "SATES21-CAMS-PATT1_spec_db",
"mode": "PUSH",
"allow_type_changes": false,
"processing_threads": 4,
"thread_buffer_size": 30,
"multiprocessing": false,
"no_client_timeout": 0,
"port": "9003",
"threshold": "12",
"project_axis": "0",
"roi_background": [
0,
700,
88,
2550
],
"threshold": 12,
"project_axis": 0,
"reload": true,
"roi_signal": [
0,
700,
88,
2550
395,
922,
25,
2224
]
}
@@ -1,6 +1,6 @@
{
"image_background_enable": false,
"image_background": "SATES21-CAMS-PATT1_20220129_173123_892798",
"image_background": "SATES21-CAMS-PATT1_20231005_113802_147338",
"image_threshold": null,
"image_region_of_interest": null,
"image_good_region": null,
@@ -0,0 +1,11 @@
{
"image_background_enable": false,
"image_background": null,
"image_threshold": null,
"image_region_of_interest": null,
"image_good_region": null,
"image_slices": null,
"pipeline_type": "processing",
"camera_name": "SATES21-CAMS154-GIGE10",
"name": "SATES21-CAMS154-GIGE10_sp"
}
@@ -10,6 +10,7 @@
"name": "SATES21-CAMS154-GIGE1_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"block": false,
"reload": true
}
@@ -4,5 +4,6 @@
"name": "SATES21-CAMS154-GIGE2_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -4,5 +4,6 @@
"name": "SATES21-CAMS154-GIGE3_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -4,5 +4,6 @@
"name": "SATES21-CAMS154-GIGE4_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -10,6 +10,7 @@
"name": "SATES21-CAMS154-GIGE5_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"block": false,
"reload": true
}
@@ -4,5 +4,6 @@
"name": "SATES21-CAMS154-GIGE6_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -1,6 +1,6 @@
{
"image_background_enable": "passive",
"image_background": "SATES21-CAMS154-M1_20230911_011432_950565",
"image_background": "SATES21-CAMS154-M1_20231004_091251_164195",
"image_threshold": null,
"image_region_of_interest": null,
"image_good_region": null,
@@ -10,21 +10,22 @@
"camera_name": "SATES21-CAMS154-M1",
"name": "SATES21-CAMS154-M1_spec_db",
"mode": "PUSH",
"allow_type_changes": false,
"processing_threads": 4,
"thread_buffer_size": 30,
"project_axis": 0,
"threshold": 5,
"roi_background": [
407,
523,
9,
1441
310,
540,
189,
1310
],
"roi_signal": [
407,
523,
9,
1441
310,
540,
189,
1310
],
"reload": true
}
@@ -1,6 +1,6 @@
{
"image_background_enable": "passive",
"image_background": "SATES24-CAMS161-M1_20230831_180416_158476",
"image_background": "SATES24-CAMS161-M1_20231006_125934_629095",
"image_threshold": null,
"image_region_of_interest": null,
"image_good_region": null,
@@ -10,21 +10,22 @@
"camera_name": "SATES24-CAMS161-M1",
"name": "SATES24-CAMS161-M1_spec_db",
"mode": "PUSH",
"allow_type_changes": false,
"roi_signal": [
0,
798,
0,
2540
91,
834,
173,
1557
],
"processing_threads": 4,
"thread_buffer_size": 30,
"project_axis": 0,
"threshold": 15,
"threshold": 10,
"roi_background": [
0,
798,
0,
2540
91,
834,
173,
1557
],
"reload": true
}
@@ -10,5 +10,6 @@
"camera_name": "SATES30-CAMS182-GIGE1",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -10,5 +10,6 @@
"camera_name": "SATES30-CAMS182-GIGE2",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -1,6 +1,6 @@
{
"image_background_enable": true,
"image_background": "SATES30-RIXS-CAM01_20230926_114743_025493",
"image_background": "SATES30-RIXS-CAM01_20231020_165644_515835",
"image_threshold": null,
"image_region_of_interest": null,
"image_good_region": null,
@@ -10,8 +10,9 @@
"name": "SATES30-RIXS-CAM01_proc",
"function": "single_photon.c",
"mode": "PUB",
"allow_type_changes": false,
"block": false,
"threshold": 150.0,
"threshold": 280.0,
"threshold_file": "",
"_max_frame_rate": 5.1,
"libs": "",
@@ -5,6 +5,7 @@
"input_pipeline": "SATES30-RIXS-CAM01_proc",
"input_mode": "SUB",
"mode": "PUSH",
"allow_type_changes": false,
"block": false,
"function": "propagate_stream"
}
@@ -8,11 +8,13 @@
"pipeline_type": "processing",
"camera_name": "SATES31-CAMS187-RIXS1",
"name": "SATES31-CAMS187-RIXS1_proc",
"function": "profiles",
"mode": "PUSH",
"function": "Furka_tt.py",
"mode": "PUB",
"allow_type_changes": false,
"multiprocessing": false,
"processing_threads": 3,
"thread_buffer_size": 20,
"send_buffer_size": 50,
"block": false
"block": false,
"reload": true
}
@@ -10,6 +10,7 @@
"name": "SATOP21-PMOS127-2D_pmos",
"function": "pmos132-2D.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"reload": true,
"processing_threads": 6,
@@ -10,6 +10,7 @@
"name": "SATOP31-PMOS132-2D_pmos",
"function": "pmos132-2D.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"reload": true,
"processing_threads": 6,
@@ -10,5 +10,6 @@
"camera_name": "SINBC02-DSRM310",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -10,5 +10,6 @@
"camera_name": "SINDI02-DSCR075",
"function": "profiles",
"mode": "PUSH",
"allow_type_changes": false,
"block": false
}
@@ -10,6 +10,7 @@
"name": "SLAAR02-LPMO01-C321_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"debug": true,
"no_client_timeout": 0,
"reload": true
@@ -10,6 +10,7 @@
"name": "SLAAR02-LPMO02-C322_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0,
"reload": true
}
@@ -10,6 +10,7 @@
"name": "SLAAR21-LCAM-C561_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"_debug": true,
"_processing_threads": 2,
"no_client_timeout": 0
@@ -10,6 +10,7 @@
"name": "SLAAR21-LCAM-C562_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"_debug": true,
"_processing_threads": 2,
"no_client_timeout": 0
@@ -10,6 +10,7 @@
"name": "SLAAR21-LCAM-CS841_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"_debug": true,
"_processing_threads": 2,
"no_client_timeout": 0
@@ -10,5 +10,6 @@
"name": "SLAAR21-LCAM-CS842_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0
}
@@ -10,5 +10,6 @@
"name": "SLAAR21-LCAM-CS843_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0
}
@@ -10,5 +10,6 @@
"name": "SLAAR21-LCAM-CS844_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0
}
@@ -10,5 +10,6 @@
"name": "SLAAR21-LCAM-CT1C1_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0
}
@@ -10,5 +10,6 @@
"name": "SLAAR21-LCAM-CT1C2_proc",
"function": "pprm_simple.py",
"mode": "PUSH",
"allow_type_changes": false,
"no_client_timeout": 0
}
@@ -10,5 +10,6 @@
"camera_name": "SLG-LCAM-C103",
"function": "pprm_ccd_offset.py",
"mode": "PUSH",
"allow_type_changes": false,
"reload": true
}
@@ -16,6 +16,7 @@
"bsread_image_buf": 1000,
"bsread_data_buf": 1000,
"mode": "PUSH",
"allow_type_changes": false,
"function": "arrival_time_proc",
"no_client_timeout": 0,
"dispatcher_disable_compression": true
@@ -1,19 +1,20 @@
{
"#S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles",
"#SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db",
"#SARES11-SPEC125-M1_test": "SARES11-SPEC125-M1_test",
"#SARES11-SPEC125-M2_db": "SARES11-SPEC125-M2_db",
"#SARES11-SPEC125-M2_pp_db": "SARES11-SPEC125-M2_pp_db",
"#SARES11-SPEC125-M2_psen_db": "SARES11-SPEC125-M2_psen_db",
"#SARES11-XMI125-C4P1_db": "SARES11-XMI125-C4P1_db",
"#SARES12-CAMS128-M1_psen_db": "SARES12-CAMS128-M1_psen_db",
"#SARES20-CAMS142-M1_psen_db": "SARES20-CAMS142-M1_psen_db",
"#SAROP11-ATT01_proc": "SAROP11-ATT01_proc",
"#SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc",
"#SATBD02-DSCR050_db": "SATBD02-DSCR050_db",
"#SATES21-CAMS154-GIGE1_proc": "SATES21-CAMS154-GIGE1_proc",
"#SATES21-CAMS154-GIGE2_proc": "SATES21-CAMS154-GIGE2_proc",
"#SATES21-CAMS154-GIGE3_proc": "SATES21-CAMS154-GIGE3_proc",
"#SATES21-CAMS154-GIGE4_proc": "SATES21-CAMS154-GIGE4_proc",
"#SATES21-CAMS154-GIGE5_proc": "SATES21-CAMS154-GIGE5_proc",
"#SATES21-CAMS154-GIGE6_proc": "SATES21-CAMS154-GIGE6_proc",
"#SATES30-CAMS182-GIGE2_profiles": "SATES30-CAMS182-GIGE2_profiles",
"#SATES30-RIXS-CAM01_sp": "SATES30-RIXS-CAM01_sp",
"#SATMA02_calib": "SATMA02_calib",
@@ -31,9 +32,9 @@
"#test_stream": "test_stream",
"#testdb_ib": "testdb_ib",
"S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles",
"SARBD01-DSCR110_sp1": "SARBD01-DSCR110_sp_rep",
"SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles",
"SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db",
"SARES11-SPEC125-M2_psen_db": "SARES11-SPEC125-M2_psen_db",
"SARES11-SPEC125-M2_db": "SARES11-SPEC125-M2_db",
"SARES20-CAMS142-M3_proc": "SARES20-CAMS142-M3_proc",
"SARES20-CAMS142-M5_psen_db": "SARES20-CAMS142-M5_psen_db",
"SARES20-CAMS142-M5_psen_db_proxy": "SARES20-CAMS142-M5_psen_db_proxy",
@@ -45,6 +46,7 @@
"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-PBPS110_proc": "SAROP11-PBPS110_proc",
"SAROP11-PBPS122_proc": "SAROP11-PBPS122_proc",
"SAROP21-ATT01_proc": "SAROP21-ATT01_proc",
@@ -57,10 +59,10 @@
"SAROP31-PBPS149_proc": "SAROP31-PBPS149_proc",
"SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc",
"SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc",
"SATBD02-DSCR050_db": "SATBD02-DSCR050_db",
"SATBD02-DSCR050_sp": "SATBD02-DSCR050_sp",
"SATBD02-DSCR050_sp1": "SATBD02-DSCR050_sp_rep",
"SATES21-CAMS-PATT1_spec_db": "SATES21-CAMS-PATT1_spec_db",
"SATES21-CAMS154-GIGE6_proc": "SATES21-CAMS154-GIGE6_proc",
"SATES21-CAMS154-M1_spec_db": "SATES21-CAMS154-M1_spec_db",
"SATES24-CAMS161-M1_spec_db": "SATES24-CAMS161-M1_spec_db",
"SATES30-CAMS182-GIGE1_profiles": "SATES30-CAMS182-GIGE1_profiles",
+15 -8
View File
@@ -71,7 +71,10 @@
"cameras": [],
"enabled": true,
"expanding": true,
"instances": []
"instances": [
"SARBD01-DSCR110_sp",
"SARBD01-DSCR110_sp_rep"
]
},
"http://sf-daqsync-10.psi.ch:8881": {
"cameras": [
@@ -116,7 +119,8 @@
"SARFE10-PSSS059_psss_avg:9005",
"SARES20-CAMS142-M3_sp",
"SARES20-CAMS142-M3_spec:9004",
"SARES20-CAMS142-M3_proc:9006"
"SARES20-CAMS142-M3_proc:9006",
"SARFE10-PSSS059_store:8890"
]
},
"http://sf-daqsync-12.psi.ch:8881": {
@@ -129,7 +133,10 @@
"SATES21-CAMS154-GIGE3",
"SATES21-CAMS154-GIGE4",
"SATES21-CAMS154-GIGE5",
"SATES21-CAMS154-GIGE6"
"SATES21-CAMS154-GIGE6",
"SATES21-CAMS154-GIGE7",
"SATES21-CAMS154-GIGE7b",
"SATES21-CAMS154-GIGE8"
],
"enabled": true,
"expanding": false,
@@ -162,12 +169,12 @@
"enabled": true,
"expanding": false,
"instances": [
"SARES11-SPEC125-M1_psen_db:9001",
"SARES11-SPEC125-M1_test:9009",
"SARES11-SPEC125-M2_psen_db:9011",
"SARES12-CAMS128-M1_psen_db:9003",
"#SARES11-SPEC125-M1_psen_db:9001",
"#SARES11-SPEC125-M1_test:9009",
"#SARES11-SPEC125-M2_psen_db:9011",
"#SARES12-CAMS128-M1_psen_db:9003",
"SARES11-XMI125-C4P1_db:9011",
"SARES11-SPEC125-M2_pp_db",
"#SARES11-SPEC125-M2_pp_db",
"SARES11-SPEC125-M2_db:9011"
]
},
@@ -9,6 +9,7 @@
"camera_name": "simulation_3",
"name": "simulation_3_proc",
"mode": "PUSH",
"allow_type_changes": false,
"block": false,
"function": "pprm_simple"
}
@@ -8,5 +8,6 @@
"pipeline_type": "processing",
"camera_name": "simulation",
"name": "simulation_proc",
"allow_type_changes": false,
"function": "test6"
}
@@ -1,12 +1,12 @@
{
"image_background_enable": false,
"image_background": null,
"image_threshold": 250.0,
"image_threshold": 20.0,
"image_region_of_interest": [
527,
230,
397,
168
457,
342,
426,
99
],
"image_good_region": {
"threshold": 0.1,
@@ -18,7 +18,7 @@
"name": "simulation_sp",
"reload": true,
"function": "beam_full_width",
"fw_threshold": 0.3,
"fw_threshold": 0.2,
"no_client_timeout": 0,
"image_background_subtraction": true,
"slice_orientation": "horizontal"
+35
View File
@@ -0,0 +1,35 @@
import json
from logging import getLogger
from cam_server.pipeline.data_processing import functions
from collections import deque
_logger = getLogger(__name__)
bg = deque([],Nbg)
def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata=None):
# Add return values
return_value = dict()
prefix = parameters["camera_name"]+":"
#(min_value, max_value) = functions.get_min_max(image)
(x_profile, y_profile) = functions.get_x_y_profile(image)
# Could be also y_profile.sum() -> it should give the same result.
# Add return values
intensity = x_profile.sum()
#return_value[prefix+"min_value"] = min_value
#return_value[prefix+"max_value"] = max_value
return_value[prefix+"x_profile"] = x_profile
return_value[prefix+"y_profile"] = y_profile
return_value[prefix+"intensity"] = intensity
return_value[prefix+"step"] = 0
return return_value
@@ -13,7 +13,7 @@ background = deque(maxlen=4)
DEFAULT_ROI_SIGNAL = None
DEFAULT_ROI_BACKGROUND = None
um_per_px = 5 # calibrated 2023-07-18 with pco edge 4.2 and 90% zoom, but it seems like the zoom motors are wrong
um_per_px = 3.33 # calibrated 2023-09-29 with pco edge 4.2 and 90% zoom, 49% focus
def get_roi_projection(image, roi, axis):
x_start, x_stop, y_start, y_stop = roi
@@ -25,6 +25,6 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata
x_axis, x_profile, y_axis, y_profile = ret["x_axis"], ret["x_profile"], ret["y_axis"], ret["y_profile"]
x_fw = get_fw(x_axis, x_profile, fw_threshold)
y_fw = get_fw(y_axis, y_profile, fw_threshold)
ret["x_fw"]=x_fw
ret["y_fw"]=y_fw
ret["x_fw"]=float(x_fw)
ret["y_fw"]=float(y_fw)
return ret
+3
View File
@@ -113,6 +113,7 @@ def update_dif_PVs(xpos_dif_m_pvname, xpos_dif_w_pvname, ypos_dif_m_pvname, ypos
def process(data, pulse_id, timestamp, params):
try:
global sent_pid
global intensity_pv, xpos_pv, ypos_pv
# Initialize on first run
@@ -180,3 +181,5 @@ def process(data, pulse_id, timestamp, params):
epics_lock.release()
return output
except Exception as e:
_logger.exception(e)
+1
View File
@@ -18,4 +18,5 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata
return_value[prefix+"x_profile"] = x_profile
return_value[prefix+"y_profile"] = y_profile
return_value[prefix+"intensity"] = intensity
return_value[prefix+"step"] = 0
return return_value
+1 -1
View File
@@ -11,7 +11,7 @@ const char *CHANNEL_NAMES[] = {"EVENT_NUM", "EVENT_I", "EVENT_J", "EVENT_CHARGE"
// max number of events per frame
#define MAX_NUM_EVENTS 50
#define MAX_NUM_EVENTS 120
#define EVENT_CHANNELS 7
double evt_p[EVENT_CHANNELS][MAX_NUM_EVENTS];