From f79f0b2169b3afde34c9daaea6c63bdd49aa84c9 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Jan 2025 16:20:01 +0100 Subject: [PATCH] 01.2025 --- .../camera_config/S10BD01-DSCR030.json | 24 +- .../camera_config/S10DI01-DSCR020.json | 45 ++-- .../camera_config/S10MA01-DSCR090.json | 45 ++-- .../camera_config/SARBD01-DSCR050.json | 2 +- .../camera_config/SARBD01-DSCR110.json | 14 +- .../camera_config/SARCL01-DSCR170.json | 5 +- .../camera_config/SARES20-CAMS142-C2.json | 12 +- .../camera_config/SARES20-CAMS142-M1.json | 18 +- .../camera_config/SARES20-CAMS142-M2.json | 20 +- .../camera_config/SARES20-CAMS142-M3.json | 14 +- .../camera_config/SARES20-PROF141-M1.json | 12 +- .../camera_config/SARES30-CAMS156-QC2.json | 27 +++ .../SARES30-CAMS156-SMX-OAV.json | 5 +- .../camera_config/SARES30-CAMS156-XE.json | 12 +- .../camera_config/SARFE10-PSSS059-LB.json | 6 + .../camera_config/SARFE10-PSSS059.json | 10 + .../camera_config/SAROP10-PSETUP.json | 15 ++ .../camera_config/SAROP11-PPRM066.json | 3 +- .../camera_config/SAROP11-PPRM078.json | 7 +- .../camera_config/SAROP11-PPRM110.json | 9 +- .../camera_config/SAROP11-PPRM117.json | 2 +- .../camera_config/SAROP11-PPRM122.json | 9 +- .../camera_config/SAROP11-PSCR109.json | 9 +- .../camera_config/SAROP21-PPRM138.json | 8 +- .../camera_config/SATBD02-DSCR050.json | 6 +- .../camera_config/SATCL01-DSCR150.json | 12 +- .../camera_config/SATES20-HOLO-CAM01.json | 18 ++ .../camera_config/SATES21-ADTEST1-CAM1.json | 14 ++ .../camera_config/SATES21-ADTEST1-CAM2.json | 14 ++ .../camera_config/SATES21-ADTEST1-CAM3.json | 14 ++ .../camera_config/SATES21-ADTEST1-CAM4.json | 14 ++ .../camera_config/SATES21-CAMS154-GIGE10.json | 3 +- .../camera_config/SATES21-CAMS154-GIGE11.json | 3 +- .../camera_config/SATES21-CAMS154-GIGE9.json | 16 +- .../camera_config/SATES30-CAMS182-GIGE1.json | 5 +- .../camera_config/SATES30-CAMS182-GIGE3.json | 8 +- .../camera_config/SATES30-CAMS182-GIGE4.json | 20 +- .../camera_config/SATES30-CAMS182-GIGE5.json | 28 +++ .../camera_config/SATFE10-PSRD066.json | 9 +- .../camera_config/SATMA01-DSCR030.json | 8 +- .../camera_config/SATOP10-PSETUP.json | 14 ++ .../camera_config/SATOP21-PMOS127-2D.json | 11 +- .../camera_config/SATOP21-PMOS127B-2D.json | 2 +- .../camera_config/SATOP31-PMOS132-2D.json | 12 +- .../camera_config/SATOP31-PSRD132.json | 1 + .../camera_config/SATOP31-PSRD175.json | 1 + .../camera_config/SATSY03-DSCR140.json | 12 +- .../camera_config/SINBC01-DSCR040.json | 45 ++-- .../camera_config/SINBD01-DSCR010.json | 45 ++-- .../camera_config/SINEG01-DSCR190.json | 10 +- .../camera_config/SINEG01-DSCR350.json | 8 +- .../camera_config/SINLH01-DSCR080.json | 45 ++-- .../camera_config/SINLH02-DSCR250.json | 16 +- .../camera_config/SINSB03-DSCR110.json | 8 +- .../camera_config/SINSB05-DSCR140.json | 18 +- .../camera_config/SLAAR02-LPMO01-C321.json | 15 +- .../camera_config/SLAAR02-LPMO02-C322.json | 15 +- .../camera_config/SLAAR11-LCAM-C421.json | 22 -- .../camera_config/SLAAR12-LSPC-SPEC1.json | 9 + .../camera_config/SLAAR21-LCAM-C561.json | 13 +- .../camera_config/SLAAR21-LCAM-C562.json | 13 +- .../camera_config/SLAAR21-LCAM-C563.json | 27 +++ .../camera_config/SLAAR21-LCAM-C563_ep.json | 27 +++ .../camera_config/SLAAR21-LCAM-CS841.json | 10 +- .../camera_config/SLAAR21-LCAM-CS843.json | 12 +- .../camera_config/SLAAR21-LCAM-CS844.json | 13 +- .../camera_config/SLAAR21-LCAM-CT1C1.json | 13 +- .../camera_config/SLAAR21-LCAM-CT1C2.json | 13 +- .../camera_config/SLG-LCAM-C071.json | 11 +- .../camera_config/SLG-LCAM-C111.json | 24 ++ .../camera_config/permanent_instances.json | 16 +- configuration/camera_config/servers.json | 42 ++-- configuration/camera_config/simulation.json | 3 +- .../Bernina_tt_kb_populate_pvs.json | 19 ++ .../Bernina_tt_kb_restart_cam.json | 13 ++ .../pipeline_config/Bernina_tt_test.json | 47 ++++ .../pipeline_config/S10BC02-DSCR220.json | 12 - .../pipeline_config/S10BC02-DSRM310.json | 9 - .../pipeline_config/S10BD01-DSCR030.json | 20 -- .../pipeline_config/S10DI01-DSCR020.json | 20 -- .../pipeline_config/S10MA01-DSCR090.json | 17 -- .../pipeline_config/SARBD01-DSCR050.json | 9 - .../pipeline_config/SARBD01-DSCR110.json | 9 - .../pipeline_config/SARBD02-DSCR050.json | 20 -- .../pipeline_config/SARCL01-DSCR170.json | 12 - .../pipeline_config/SARCL02-DSCR280.json | 12 - .../SARES11-SPEC125-M1_psen_db.json | 8 +- .../SARES11-SPEC125-M2_db.json | 4 +- .../SARES11-SPEC125-M3_spec_db.json | 10 +- .../SARES11-XMI125-C4P1_xy_db.json | 17 ++ .../SARES20-CAMS142-M5_psen_db.json | 5 +- .../pipeline_config/SARES21-PBPS141_proc.json | 10 +- .../SARES30-CAMS156-QC2_sp.json | 11 + .../SARES30-CAMS156-SMX-OAV_db.json | 8 +- .../SARES30-CAMS156-SMX-OAV_sp.json | 3 +- .../pipeline_config/SARFE10-PBPS053_proc.json | 58 ++--- .../pipeline_config/SARFE10-PPRM053.json | 9 - .../pipeline_config/SARFE10-PPRM064.json | 9 - .../SARFE10-PSSS059-LB_psss.json | 4 +- .../pipeline_config/SARMA02-DSCR030.json | 14 -- .../pipeline_config/SAROP11-PBPS110_proc.json | 60 ++--- .../pipeline_config/SAROP11-PBPS122_proc.json | 38 +-- .../pipeline_config/SAROP11-PPRM066.json | 9 - .../pipeline_config/SAROP11-PPRM078.json | 9 - .../pipeline_config/SAROP11-PPRM110.json | 9 - .../pipeline_config/SAROP11-PPRM110_proc.json | 18 ++ .../pipeline_config/SAROP11-PPRM117.json | 9 - .../pipeline_config/SAROP11-PPRM122.json | 9 - .../pipeline_config/SAROP11-PPRM122_proc.json | 3 +- .../pipeline_config/SAROP11-PPRM122_sp.json | 6 +- .../pipeline_config/SAROP11-PPRM130.json | 9 - .../pipeline_config/SAROP11-PSCR106.json | 9 - .../pipeline_config/SAROP21-ATT01PD_proc.json | 45 ++++ .../pipeline_config/SAROP21-ATT01_proc.json | 40 ++-- .../pipeline_config/SAROP21-PBPS103_proc.json | 38 +-- .../pipeline_config/SAROP21-PBPS133_proc.json | 38 +-- .../pipeline_config/SAROP21-PPRM094.json | 9 - .../pipeline_config/SAROP21-PPRM102.json | 12 - .../pipeline_config/SAROP21-PPRM133.json | 4 - .../pipeline_config/SAROP21-PPRM138.json | 4 - .../pipeline_config/SAROP21-PPRM146.json | 4 - .../pipeline_config/SAROP21-PSCR097.json | 12 - .../pipeline_config/SAROP31-PBPS113_proc.json | 38 +-- .../pipeline_config/SAROP31-PBPS149_proc.json | 40 ++-- .../pipeline_config/SATBD01-DSCR050.json | 9 - .../pipeline_config/SATBD01-DSCR110.json | 9 - .../pipeline_config/SATBD01-SDSCR210_sp.json | 11 + .../pipeline_config/SATBD02-DSCR050.json | 12 - .../pipeline_config/SATBD02-DSCR050_sp.json | 20 +- .../SATBD02-DSCR050_sp_rep.json | 4 +- .../pipeline_config/SATCL01-DSCR150.json | 9 - .../SATES20-HOLO-CAM01_proc.json | 12 + .../SATES20-HOLO-CAM01_sp.json | 12 + .../SATES21-ADTEST1-CAM1_sp.json | 11 + .../SATES21-ADTEST1-CAM2_sp.json | 11 + .../SATES21-ADTEST1-CAM3_sp.json | 11 + .../SATES21-ADTEST1-CAM4_sp.json | 11 + .../SATES21-CAM154-GIGE1_sp.json | 11 + .../SATES21-CAMS-PATT1_spec_db.json | 24 +- .../SATES21-CAMS154-GIGE11_sp.json | 3 +- .../SATES21-CAMS154-GIGE6_proc.json | 2 +- .../SATES21-CAMS154-GIGE8_sp.json | 3 +- .../SATES21-CAMS154-GIGE9_proc.json | 9 + .../SATES21-CAMS154-M1_spec_db.json | 25 +- .../SATES21-CAMS154-M2_proc.json | 6 +- .../SATES24-CAMS161-M1_spec_db.json | 20 +- .../SATES30-CAMS182-GIGE1_sp.json | 3 +- .../SATES30-CAMS182-GIGE2_sp.json | 3 +- .../SATES30-CAMS182-GIGE3_sp.json | 3 +- .../SATES30-CAMS182-GIGE4_sp.json | 3 +- .../SATES30-CAMS182-GIGE5_sp.json | 12 + .../SATES30-RIXS-CAM01_proc.json | 4 +- .../SATES30-RIXS-CAM01_sp.json | 2 +- .../SATES31-CAMS187-RIXS1_sp.json | 9 +- .../pipeline_config/SATMA01-DSCR030.json | 12 - .../pipeline_config/SATOP11-PSAS079_psas.json | 4 +- .../SATOP21-PMOS127-2D_pmos.json | 10 +- .../pipeline_config/SATOP21-PMOS127_sp.json | 11 + .../SATOP31-PMOS132-2D_pmos.json | 4 +- .../pipeline_config/SATSY02-DSCR220.json | 9 - .../pipeline_config/SINBC01-DSCR040.json | 17 -- .../pipeline_config/SINBC01-DSCR040_sp.json | 1 + .../pipeline_config/SINBC02-DSCR220.json | 14 -- .../pipeline_config/SINBC02-DSRM310.json | 14 -- .../pipeline_config/SINBD01-DSCR010.json | 15 -- .../pipeline_config/SINDI01-DSCR080.json | 20 -- .../pipeline_config/SINDI02-DLAC055.json | 14 -- .../pipeline_config/SINEG01-DSCR190.json | 17 -- .../pipeline_config/SINEG01-DSCR350.json | 20 -- .../pipeline_config/SINLH01-DSCR080.json | 14 -- .../pipeline_config/SINLH02-DSCR220.json | 14 -- .../pipeline_config/SINLH02-DSCR250.json | 14 -- .../pipeline_config/SINLH03-DSCR070.json | 14 -- .../pipeline_config/SINSB03-DSCR110.json | 20 -- .../SLAAR02-LPMO02-C322_sp.json | 11 + .../SLAAR12-LSPC-SPEC1_sp.json | 11 + .../SLAAR21-LCAM-C563_ep_sp.json | 11 + .../SLAAR21-LCAM-C563_epics_sp.json | 11 + .../pipeline_config/SLAAR21-LCAM-C563_sp.json | 11 + .../pipeline_config/SLG-LCAM-C011.json | 9 - .../pipeline_config/SLG-LCAM-C012.json | 9 - .../pipeline_config/SLG-LCAM-C013.json | 9 - .../pipeline_config/SLG-LCAM-C021.json | 9 - .../pipeline_config/SLG-LCAM-C031.json | 9 - .../pipeline_config/SLG-LCAM-C032.json | 9 - .../pipeline_config/SLG-LCAM-C041.json | 20 -- .../pipeline_config/SLG-LCAM-C042.json | 9 - .../pipeline_config/SLG-LCAM-C044.json | 9 - .../pipeline_config/SLG-LCAM-C051.json | 4 - .../pipeline_config/SLG-LCAM-C052.json | 4 - .../pipeline_config/SLG-LCAM-C061.json | 14 -- .../pipeline_config/SLG-LCAM-C062.json | 4 - .../pipeline_config/SLG-LCAM-C063.json | 4 - .../pipeline_config/SLG-LCAM-C071_proc.json | 16 ++ .../pipeline_config/SLG-LCAM-C071_sp.json | 3 +- .../pipeline_config/SLG-LCAM-C081.json | 4 - .../pipeline_config/SLG-LCAM-C082.json | 4 - .../pipeline_config/SLG-LCAM-C083.json | 4 - .../pipeline_config/SLG-LCAM-C091.json | 9 - .../pipeline_config/SLG-LCAM-C092.json | 9 - .../pipeline_config/SLG-LCAM-C103.json | 14 -- .../pipeline_config/SLG-LCAM-C103_proc.json | 5 +- .../pipeline_config/SLG-LCAM-C111_proc.json | 16 ++ .../pipeline_config/SLG-LCAM-C111_sp.json | 12 + .../pipeline_config/SLG-LCAM-L101.json | 4 - .../pipeline_config/SLG-LCAM-L102.json | 4 - .../pipeline_config/SLG-LCAM-L103.json | 9 - .../pipeline_config/SLG-LCAM-L104.json | 4 - .../pipeline_config/SLG-LCAM-L121.json | 4 - .../pipeline_config/SLG-LCAM-L122.json | 4 - .../pipeline_config/SLG-LCAM-L123.json | 4 - .../pipeline_config/SLG-LCAM-L124.json | 4 - .../pipeline_config/SLG-LCAM-L131.json | 4 - .../pipeline_config/SLG-LCAM-L141.json | 9 - ...G-LCAM-C041test.json => alain_1MP_sp.json} | 4 +- .../pipeline_config/permanent_instances.json | 26 ++- configuration/pipeline_config/servers.json | 77 ++++--- configuration/pipeline_config/simulation.json | 4 - .../pipeline_config/simulation_sp.json | 24 +- .../user_scripts/Bernina_restart_cam.py | 26 +++ .../Bernina_tt_kb_populate_pvs.py | 26 +++ .../user_scripts/SARES11-SPEC125-M1_2tt.py | 19 +- .../user_scripts/SARES11-SPEC125-M1_tt.py | 2 +- .../user_scripts/SARES11-SPEC125-M3_spec.py | 6 +- .../SARES30-CAMS156-SMX-OAV_jetprojections.py | 4 +- .../user_scripts/SAROP11-ATT01_proc.py | 87 +++++-- .../user_scripts/SAROP21-ATT01PD_proc.py | 145 ++++++++++++ .../user_scripts/SAROP21-ATT01_proc.py | 216 ++++++++---------- configuration/user_scripts/bunch_length_op.py | 5 +- configuration/user_scripts/casts_pid.py | 142 ++++++++++++ configuration/user_scripts/cs_sum.py | 16 ++ configuration/user_scripts/laser_gauss_fit.py | 20 ++ configuration/user_scripts/pmos127B-2D.py | 163 +++++++++++++ configuration/user_scripts/pmos132-2D.py | 3 + .../user_scripts/psen_bsen_processing.py | 16 +- configuration/user_scripts/single_photon.c | 2 +- 236 files changed, 2279 insertions(+), 1551 deletions(-) create mode 100644 configuration/camera_config/SARES30-CAMS156-QC2.json create mode 100644 configuration/camera_config/SAROP10-PSETUP.json create mode 100644 configuration/camera_config/SATES20-HOLO-CAM01.json create mode 100644 configuration/camera_config/SATES21-ADTEST1-CAM1.json create mode 100644 configuration/camera_config/SATES21-ADTEST1-CAM2.json create mode 100644 configuration/camera_config/SATES21-ADTEST1-CAM3.json create mode 100644 configuration/camera_config/SATES21-ADTEST1-CAM4.json create mode 100644 configuration/camera_config/SATES30-CAMS182-GIGE5.json create mode 100644 configuration/camera_config/SATOP10-PSETUP.json delete mode 100644 configuration/camera_config/SLAAR11-LCAM-C421.json create mode 100644 configuration/camera_config/SLAAR12-LSPC-SPEC1.json create mode 100644 configuration/camera_config/SLAAR21-LCAM-C563.json create mode 100644 configuration/camera_config/SLAAR21-LCAM-C563_ep.json create mode 100644 configuration/camera_config/SLG-LCAM-C111.json create mode 100644 configuration/pipeline_config/Bernina_tt_kb_populate_pvs.json create mode 100644 configuration/pipeline_config/Bernina_tt_kb_restart_cam.json create mode 100644 configuration/pipeline_config/Bernina_tt_test.json delete mode 100644 configuration/pipeline_config/S10BC02-DSCR220.json delete mode 100644 configuration/pipeline_config/S10BC02-DSRM310.json delete mode 100644 configuration/pipeline_config/S10BD01-DSCR030.json delete mode 100644 configuration/pipeline_config/S10DI01-DSCR020.json delete mode 100644 configuration/pipeline_config/S10MA01-DSCR090.json delete mode 100644 configuration/pipeline_config/SARBD01-DSCR050.json delete mode 100644 configuration/pipeline_config/SARBD01-DSCR110.json delete mode 100644 configuration/pipeline_config/SARBD02-DSCR050.json delete mode 100644 configuration/pipeline_config/SARCL01-DSCR170.json delete mode 100644 configuration/pipeline_config/SARCL02-DSCR280.json create mode 100644 configuration/pipeline_config/SARES11-XMI125-C4P1_xy_db.json create mode 100644 configuration/pipeline_config/SARES30-CAMS156-QC2_sp.json delete mode 100644 configuration/pipeline_config/SARFE10-PPRM053.json delete mode 100644 configuration/pipeline_config/SARFE10-PPRM064.json delete mode 100644 configuration/pipeline_config/SARMA02-DSCR030.json delete mode 100644 configuration/pipeline_config/SAROP11-PPRM066.json delete mode 100644 configuration/pipeline_config/SAROP11-PPRM078.json delete mode 100644 configuration/pipeline_config/SAROP11-PPRM110.json create mode 100644 configuration/pipeline_config/SAROP11-PPRM110_proc.json delete mode 100644 configuration/pipeline_config/SAROP11-PPRM117.json delete mode 100644 configuration/pipeline_config/SAROP11-PPRM122.json delete mode 100644 configuration/pipeline_config/SAROP11-PPRM130.json delete mode 100644 configuration/pipeline_config/SAROP11-PSCR106.json create mode 100644 configuration/pipeline_config/SAROP21-ATT01PD_proc.json delete mode 100644 configuration/pipeline_config/SAROP21-PPRM094.json delete mode 100644 configuration/pipeline_config/SAROP21-PPRM102.json delete mode 100644 configuration/pipeline_config/SAROP21-PPRM133.json delete mode 100644 configuration/pipeline_config/SAROP21-PPRM138.json delete mode 100644 configuration/pipeline_config/SAROP21-PPRM146.json delete mode 100644 configuration/pipeline_config/SAROP21-PSCR097.json delete mode 100644 configuration/pipeline_config/SATBD01-DSCR050.json delete mode 100644 configuration/pipeline_config/SATBD01-DSCR110.json create mode 100644 configuration/pipeline_config/SATBD01-SDSCR210_sp.json delete mode 100644 configuration/pipeline_config/SATBD02-DSCR050.json delete mode 100644 configuration/pipeline_config/SATCL01-DSCR150.json create mode 100644 configuration/pipeline_config/SATES20-HOLO-CAM01_proc.json create mode 100644 configuration/pipeline_config/SATES20-HOLO-CAM01_sp.json create mode 100644 configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json create mode 100644 configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json create mode 100644 configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json create mode 100644 configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json create mode 100644 configuration/pipeline_config/SATES21-CAM154-GIGE1_sp.json create mode 100644 configuration/pipeline_config/SATES21-CAMS154-GIGE9_proc.json create mode 100644 configuration/pipeline_config/SATES30-CAMS182-GIGE5_sp.json delete mode 100644 configuration/pipeline_config/SATMA01-DSCR030.json create mode 100644 configuration/pipeline_config/SATOP21-PMOS127_sp.json delete mode 100644 configuration/pipeline_config/SATSY02-DSCR220.json delete mode 100644 configuration/pipeline_config/SINBC01-DSCR040.json delete mode 100644 configuration/pipeline_config/SINBC02-DSCR220.json delete mode 100644 configuration/pipeline_config/SINBC02-DSRM310.json delete mode 100644 configuration/pipeline_config/SINBD01-DSCR010.json delete mode 100644 configuration/pipeline_config/SINDI01-DSCR080.json delete mode 100644 configuration/pipeline_config/SINDI02-DLAC055.json delete mode 100644 configuration/pipeline_config/SINEG01-DSCR190.json delete mode 100644 configuration/pipeline_config/SINEG01-DSCR350.json delete mode 100644 configuration/pipeline_config/SINLH01-DSCR080.json delete mode 100644 configuration/pipeline_config/SINLH02-DSCR220.json delete mode 100644 configuration/pipeline_config/SINLH02-DSCR250.json delete mode 100644 configuration/pipeline_config/SINLH03-DSCR070.json delete mode 100644 configuration/pipeline_config/SINSB03-DSCR110.json create mode 100644 configuration/pipeline_config/SLAAR02-LPMO02-C322_sp.json create mode 100644 configuration/pipeline_config/SLAAR12-LSPC-SPEC1_sp.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-C563_ep_sp.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-C563_epics_sp.json create mode 100644 configuration/pipeline_config/SLAAR21-LCAM-C563_sp.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C011.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C012.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C013.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C021.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C031.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C032.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C041.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C042.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C044.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C051.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C052.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C061.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C062.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C063.json create mode 100644 configuration/pipeline_config/SLG-LCAM-C071_proc.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C081.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C082.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C083.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C091.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C092.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-C103.json create mode 100644 configuration/pipeline_config/SLG-LCAM-C111_proc.json create mode 100644 configuration/pipeline_config/SLG-LCAM-C111_sp.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L101.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L102.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L103.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L104.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L121.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L122.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L123.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L124.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L131.json delete mode 100644 configuration/pipeline_config/SLG-LCAM-L141.json rename configuration/pipeline_config/{SLG-LCAM-C041test.json => alain_1MP_sp.json} (77%) delete mode 100644 configuration/pipeline_config/simulation.json create mode 100644 configuration/user_scripts/Bernina_restart_cam.py create mode 100644 configuration/user_scripts/Bernina_tt_kb_populate_pvs.py create mode 100644 configuration/user_scripts/SAROP21-ATT01PD_proc.py create mode 100644 configuration/user_scripts/casts_pid.py create mode 100644 configuration/user_scripts/cs_sum.py create mode 100644 configuration/user_scripts/laser_gauss_fit.py create mode 100644 configuration/user_scripts/pmos127B-2D.py diff --git a/configuration/camera_config/S10BD01-DSCR030.json b/configuration/camera_config/S10BD01-DSCR030.json index 8198e4f..d4a68ba 100644 --- a/configuration/camera_config/S10BD01-DSCR030.json +++ b/configuration/camera_config/S10BD01-DSCR030.json @@ -1,22 +1,24 @@ { - "name": "S10BD01-DSCR030", "camera_calibration": { - "angle_horizontal": 0.0, - "angle_vertical": 15.8, - "reference_marker_height": 6000.0, "reference_marker": [ - 940, - 1070, - 1175, - 1771 + 785, + 786, + 963, + 1403 ], - "reference_marker_width": 2000.0 + "reference_marker_width": 2000.0, + "reference_marker_height": 6000.0, + "angle_horizontal": 0.0, + "angle_vertical": 15.8 }, - "source": "S10BD01-DSCR030", + "mirror_x": false, "mirror_y": false, "rotate": 1, - "mirror_x": false, + "roi": null, + "image_background": null, "source_type": "bsread", + "name": "S10BD01-DSCR030", + "source": "S10BD01-DSCR030", "group": [ "Electrons" ], diff --git a/configuration/camera_config/S10DI01-DSCR020.json b/configuration/camera_config/S10DI01-DSCR020.json index 82fc84c..f46ce92 100644 --- a/configuration/camera_config/S10DI01-DSCR020.json +++ b/configuration/camera_config/S10DI01-DSCR020.json @@ -1,21 +1,26 @@ { - "name": "S10DI01-DSCR020", - "camera_calibration": { - "angle_horizontal": 8.0, - "angle_vertical": 0.0, - "reference_marker_height": 16000.0, - "reference_marker": [ - 703, - 69, - 1483, - 2127 - ], - "reference_marker_width": 6000.0 - }, - "source": "S10DI01-DSCR020", - "mirror_y": true, - "rotate": 0, - "mirror_x": true, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 638, + 44, + 1418, + 2102 + ], + "reference_marker_width": 6000.0, + "reference_marker_height": 16000.0, + "angle_horizontal": 8.0, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "S10DI01-DSCR020", + "source": "S10DI01-DSCR020", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/S10MA01-DSCR090.json b/configuration/camera_config/S10MA01-DSCR090.json index c1db8b9..8663e81 100644 --- a/configuration/camera_config/S10MA01-DSCR090.json +++ b/configuration/camera_config/S10MA01-DSCR090.json @@ -1,21 +1,26 @@ { - "name": "S10MA01-DSCR090", - "camera_calibration": { - "angle_horizontal": 8.0, - "angle_vertical": 0.0, - "reference_marker_height": 16000.0, - "reference_marker": [ - 455, - 33, - 1138, - 1862 - ], - "reference_marker_width": 6000.0 - }, - "source": "S10MA01-DSCR090", - "mirror_y": true, - "rotate": 0, - "mirror_x": true, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 400, + 124, + 1083, + 1953 + ], + "reference_marker_width": 6000.0, + "reference_marker_height": 16000.0, + "angle_horizontal": 8.0, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "S10MA01-DSCR090", + "source": "S10MA01-DSCR090", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SARBD01-DSCR050.json b/configuration/camera_config/SARBD01-DSCR050.json index ad1d0bb..ecc8bf3 100644 --- a/configuration/camera_config/SARBD01-DSCR050.json +++ b/configuration/camera_config/SARBD01-DSCR050.json @@ -19,6 +19,6 @@ "group": [ "Electrons" ], - "source_type": "bsread", + "source_type": "epics", "alias": [] } \ No newline at end of file diff --git a/configuration/camera_config/SARBD01-DSCR110.json b/configuration/camera_config/SARBD01-DSCR110.json index 78bbfaf..5a1acf9 100644 --- a/configuration/camera_config/SARBD01-DSCR110.json +++ b/configuration/camera_config/SARBD01-DSCR110.json @@ -11,12 +11,18 @@ "angle_horizontal": 8.0, "angle_vertical": 0.0 }, - "mirror_x": true, - "mirror_y": true, - "rotate": 0, + "mirror_x": false, + "mirror_y": false, + "rotate": 2, + "roi": null, + "image_background": null, + "source_type": "bsread", "name": "SARBD01-DSCR110", "source": "SARBD01-DSCR110", - "source_type": "bsread", + "connections": 2, + "buffer_size": 0, + "debug": true, + "buffer_threshold": 0.5, "group": [ "Electrons" ], diff --git a/configuration/camera_config/SARCL01-DSCR170.json b/configuration/camera_config/SARCL01-DSCR170.json index 04814b2..36b0443 100644 --- a/configuration/camera_config/SARCL01-DSCR170.json +++ b/configuration/camera_config/SARCL01-DSCR170.json @@ -2,9 +2,9 @@ "camera_calibration": { "reference_marker": [ 633, - 662, + 731, 1456, - 939 + 1008 ], "reference_marker_width": 6000.0, "reference_marker_height": 2000.0, @@ -17,6 +17,7 @@ "roi": null, "image_background": null, "source_type": "bsread", + "_connections": 2, "name": "SARCL01-DSCR170", "source": "SARCL01-DSCR170", "prefix": "SARCL01-DSCR170", diff --git a/configuration/camera_config/SARES20-CAMS142-C2.json b/configuration/camera_config/SARES20-CAMS142-C2.json index 8aa73cd..4350090 100644 --- a/configuration/camera_config/SARES20-CAMS142-C2.json +++ b/configuration/camera_config/SARES20-CAMS142-C2.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 1184, - 1196, - 1186, - 1198 + 259, + 211, + 263, + 215 ], "reference_marker_width": 16.71604938271605, "reference_marker_height": 16.666666666666668, @@ -24,5 +24,7 @@ "Photonics", "Bernina" ], - "alias": [] + "alias": [ + "SAMPLECAM_XRD (SARES20-CAMS142-C2)" + ] } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-CAMS142-M1.json b/configuration/camera_config/SARES20-CAMS142-M1.json index 3bc2e84..2c09b1c 100644 --- a/configuration/camera_config/SARES20-CAMS142-M1.json +++ b/configuration/camera_config/SARES20-CAMS142-M1.json @@ -1,17 +1,17 @@ { "camera_calibration": { "reference_marker": [ - 572, - 396, - 574, - 398 + 3060, + 1028, + 3062, + 1030 ], - "reference_marker_width": 2.0, - "reference_marker_height": 2.0, + "reference_marker_width": 8.5, + "reference_marker_height": 9.333333333333334, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, - "mirror_x": true, + "mirror_x": false, "mirror_y": false, "rotate": 0, "roi": null, @@ -25,5 +25,7 @@ "Photonics", "Bernina" ], - "alias": [] + "alias": [ + "SAMPLECAM_INLINE (SARES20-CAMS142-M1)" + ] } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-CAMS142-M2.json b/configuration/camera_config/SARES20-CAMS142-M2.json index 25a3aba..8c86537 100644 --- a/configuration/camera_config/SARES20-CAMS142-M2.json +++ b/configuration/camera_config/SARES20-CAMS142-M2.json @@ -1,18 +1,18 @@ { "camera_calibration": { "reference_marker": [ - 1123, - 1490, - 1226, - 1591 + 1100, + 1230, + 1102, + 1232 ], - "reference_marker_width": 788.0, - "reference_marker_height": 685.0, + "reference_marker_width": 20.0, + "reference_marker_height": 12.356435643564357, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, - "mirror_x": true, - "mirror_y": false, + "mirror_x": false, + "mirror_y": true, "rotate": 3, "roi": null, "image_background": null, @@ -24,7 +24,5 @@ "Photonics", "Bernina" ], - "alias": [ - "SAMPLECAM_SIDEVIEW (SARES20-CAMS142-M2)" - ] + "alias": [] } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-CAMS142-M3.json b/configuration/camera_config/SARES20-CAMS142-M3.json index 25846f5..e47b164 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": [ - 652, - 546, - 656, - 570 + 2318, + 1162, + 2320, + 1164 ], - "reference_marker_width": 7.604, - "reference_marker_height": 43.592, + "reference_marker_width": 7.249523809523811, + "reference_marker_height": 11.906666666666666, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, @@ -25,6 +25,6 @@ "Bernina" ], "alias": [ - "SAMPLECAM_INLINE (SARES20-CAMS142-M3) (SARES20-CAMS142-M3)" + "SAMPLECAM_SIDEVIEW (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 bbfc0f3..5955888 100644 --- a/configuration/camera_config/SARES20-PROF141-M1.json +++ b/configuration/camera_config/SARES20-PROF141-M1.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 298, - 213, - 407, - 314 + 327, + 197, + 439, + 265 ], - "reference_marker_width": 324.0, - "reference_marker_height": 300.0, + "reference_marker_width": 400.0, + "reference_marker_height": 250.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SARES30-CAMS156-QC2.json b/configuration/camera_config/SARES30-CAMS156-QC2.json new file mode 100644 index 0000000..c34be82 --- /dev/null +++ b/configuration/camera_config/SARES30-CAMS156-QC2.json @@ -0,0 +1,27 @@ +{ + "camera_calibration": { + "reference_marker": [ + 200, + 200, + 400, + 400 + ], + "reference_marker_width": 200.0, + "reference_marker_height": 200.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SARES30-CAMS156-QC2", + "source": "SARES30-CAMS156-QC2", + "group": [ + "Photonics", + "Cristallina" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SARES30-CAMS156-SMX-OAV.json b/configuration/camera_config/SARES30-CAMS156-SMX-OAV.json index b502288..5454326 100644 --- a/configuration/camera_config/SARES30-CAMS156-SMX-OAV.json +++ b/configuration/camera_config/SARES30-CAMS156-SMX-OAV.json @@ -13,7 +13,7 @@ }, "mirror_x": true, "mirror_y": false, - "rotate": 0, + "rotate": 1, "roi": null, "image_background": null, "source_type": "bsread", @@ -21,5 +21,6 @@ "source": "SARES30-CAMS156-SMX-OAV", "group": "Cristallina", "forwarder_port": 9004, - "alias": [] + "alias": [], + "no_client_timeout": 0 } \ 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 c6bfd76..d05216d 100644 --- a/configuration/camera_config/SARES30-CAMS156-XE.json +++ b/configuration/camera_config/SARES30-CAMS156-XE.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 325, - 149, - 1132, - 953 + 485, + 261, + 1075, + 971 ], - "reference_marker_width": 400.0, - "reference_marker_height": 400.0, + "reference_marker_width": 1200.0, + "reference_marker_height": 1000.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SARFE10-PSSS059-LB.json b/configuration/camera_config/SARFE10-PSSS059-LB.json index b5725f7..d1d58a2 100644 --- a/configuration/camera_config/SARFE10-PSSS059-LB.json +++ b/configuration/camera_config/SARFE10-PSSS059-LB.json @@ -17,6 +17,12 @@ "roi": null, "image_background": null, "source_type": "bsread", + "hardware_configuration": { + "EXPOSURE": 9.9, + "HSSPEED": 1, + "REGIONX_START": 1, + "REGIONY_START": 500 + }, "prefix": "SARFE10-PSSS059-LB", "source": "SARFE10-PSSS059-LB", "name": "SARFE10-PSSS059-LB", diff --git a/configuration/camera_config/SARFE10-PSSS059.json b/configuration/camera_config/SARFE10-PSSS059.json index 87878ba..f8891b4 100644 --- a/configuration/camera_config/SARFE10-PSSS059.json +++ b/configuration/camera_config/SARFE10-PSSS059.json @@ -17,6 +17,16 @@ "roi": null, "image_background": null, "source_type": "bsread", + "hardware_configuration": { + "EXPOSURE": 9.9, + "HSSPEED": 1, + "REGIONX_START": 1, + "REGIONY_START": 500 + }, + "camera_calib_datetime": "2024-09-12 15:53:26", + "hardware": { + "SERIAL": 61001510 + }, "prefix": "SARFE10-PSSS059", "source": "SARFE10-PSSS059", "name": "SARFE10-PSSS059", diff --git a/configuration/camera_config/SAROP10-PSETUP.json b/configuration/camera_config/SAROP10-PSETUP.json new file mode 100644 index 0000000..8b58122 --- /dev/null +++ b/configuration/camera_config/SAROP10-PSETUP.json @@ -0,0 +1,15 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SAROP10-PSETUP", + "source": "", + "Aramis camera_calib_datetime": "2024-12-11 09:48:56", + "Alvra camera_calib_datetime": "2024-09-26 10:16:24", + "Bernina camera_calib_datetime": "2024-09-25 15:48:01", + "Cristallina camera_calib_datetime": "2024-09-25 15:48:08" +} \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM066.json b/configuration/camera_config/SAROP11-PPRM066.json index 2d62dfd..3833f10 100644 --- a/configuration/camera_config/SAROP11-PPRM066.json +++ b/configuration/camera_config/SAROP11-PPRM066.json @@ -20,7 +20,8 @@ "name": "SAROP11-PPRM066", "source": "SAROP11-PPRM066", "group": [ - "Photonics" + "Photonics", + "Alvra" ], "alias": [ "PROF_MIRR_ALV1 (SAROP11-PPRM066) (SAROP11-PPRM066)" diff --git a/configuration/camera_config/SAROP11-PPRM078.json b/configuration/camera_config/SAROP11-PPRM078.json index 56e704c..68166ae 100644 --- a/configuration/camera_config/SAROP11-PPRM078.json +++ b/configuration/camera_config/SAROP11-PPRM078.json @@ -17,6 +17,9 @@ "source_type": "epics", "name": "SAROP11-PPRM078", "source": "SAROP11-PPRM078", - "group": ["Photonics"], + "group": [ + "Photonics", + "Alvra" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM110.json b/configuration/camera_config/SAROP11-PPRM110.json index f01f3be..d5054ab 100644 --- a/configuration/camera_config/SAROP11-PPRM110.json +++ b/configuration/camera_config/SAROP11-PPRM110.json @@ -14,9 +14,12 @@ "mirror_x": true, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "source_type": "bsread", "name": "SAROP11-PPRM110", "source": "SAROP11-PPRM110", - "group": ["Photonics"], + "group": [ + "Photonics", + "Alvra" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PPRM117.json b/configuration/camera_config/SAROP11-PPRM117.json index 5605598..54556be 100644 --- a/configuration/camera_config/SAROP11-PPRM117.json +++ b/configuration/camera_config/SAROP11-PPRM117.json @@ -21,7 +21,7 @@ "source": "SAROP11-PPRM117", "group": [ "Photonics", - "Bernina", + "Alvra", "Beamline Aramis" ], "alias": [] diff --git a/configuration/camera_config/SAROP11-PPRM122.json b/configuration/camera_config/SAROP11-PPRM122.json index 81335ac..9869b04 100644 --- a/configuration/camera_config/SAROP11-PPRM122.json +++ b/configuration/camera_config/SAROP11-PPRM122.json @@ -14,9 +14,12 @@ "mirror_x": true, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "source_type": "bsread", "name": "SAROP11-PPRM122", "source": "SAROP11-PPRM122", - "group": ["Photonics"], + "group": [ + "Photonics", + "Alvra" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SAROP11-PSCR109.json b/configuration/camera_config/SAROP11-PSCR109.json index d05688b..2e157f1 100644 --- a/configuration/camera_config/SAROP11-PSCR109.json +++ b/configuration/camera_config/SAROP11-PSCR109.json @@ -14,10 +14,15 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "prefix": "SAROP11-PSCR109", "name": "SAROP11-PSCR109", "source": "SAROP11-PSCR109", - "group": ["Photonics"], + "group": [ + "Photonics", + "Alvra" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM138.json b/configuration/camera_config/SAROP21-PPRM138.json index d5664f3..83beb63 100644 --- a/configuration/camera_config/SAROP21-PPRM138.json +++ b/configuration/camera_config/SAROP21-PPRM138.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 322, - 273, - 358, - 314 + 394, + 259, + 428, + 300 ], "reference_marker_width": 500.0, "reference_marker_height": 500.0, diff --git a/configuration/camera_config/SATBD02-DSCR050.json b/configuration/camera_config/SATBD02-DSCR050.json index 6aba910..20072b9 100644 --- a/configuration/camera_config/SATBD02-DSCR050.json +++ b/configuration/camera_config/SATBD02-DSCR050.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 727, + 843, 100, - 1392, - 1898 + 1516, + 1911 ], "reference_marker_width": 6000.0, "reference_marker_height": 16000.0, diff --git a/configuration/camera_config/SATCL01-DSCR150.json b/configuration/camera_config/SATCL01-DSCR150.json index 4562b2b..ba92916 100644 --- a/configuration/camera_config/SATCL01-DSCR150.json +++ b/configuration/camera_config/SATCL01-DSCR150.json @@ -2,9 +2,9 @@ "camera_calibration": { "reference_marker": [ 961, - 156, + 178, 1645, - 1973 + 1995 ], "reference_marker_width": 6000.0, "reference_marker_height": 16000.0, @@ -14,9 +14,13 @@ "mirror_x": true, "mirror_y": true, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SATCL01-DSCR150", "source": "SATCL01-DSCR150", - "group": ["Electrons"], + "group": [ + "Electrons" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SATES20-HOLO-CAM01.json b/configuration/camera_config/SATES20-HOLO-CAM01.json new file mode 100644 index 0000000..d28ddaa --- /dev/null +++ b/configuration/camera_config/SATES20-HOLO-CAM01.json @@ -0,0 +1,18 @@ +{ + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "prefix": "SATES20-HOLO-CAM01", + "source": "SATES20-HOLO-CAM01", + "name": "SATES20-HOLO-CAM01", + "protocol": "tcp", + "_forwarder_port": 9043, + "group": [ + "Photonics", + "Maloja" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SATES21-ADTEST1-CAM1.json b/configuration/camera_config/SATES21-ADTEST1-CAM1.json new file mode 100644 index 0000000..b83337e --- /dev/null +++ b/configuration/camera_config/SATES21-ADTEST1-CAM1.json @@ -0,0 +1,14 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SATES21-ADTEST1-CAM1", + "protocol": "tcp", + "source": "SATES21-ADTEST1-CAM1", + "_debug": true, + "group": [ + "Photonics" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SATES21-ADTEST1-CAM2.json b/configuration/camera_config/SATES21-ADTEST1-CAM2.json new file mode 100644 index 0000000..7ff39a2 --- /dev/null +++ b/configuration/camera_config/SATES21-ADTEST1-CAM2.json @@ -0,0 +1,14 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SATES21-ADTEST1-CAM2", + "protocol": "tcp", + "source": "SATES21-ADTEST1-CAM2", + "_debug": true, + "group": [ + "Photonics" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SATES21-ADTEST1-CAM3.json b/configuration/camera_config/SATES21-ADTEST1-CAM3.json new file mode 100644 index 0000000..f3c230e --- /dev/null +++ b/configuration/camera_config/SATES21-ADTEST1-CAM3.json @@ -0,0 +1,14 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SATES21-ADTEST1-CAM3", + "protocol": "tcp", + "source": "SATES21-ADTEST1-CAM3", + "_debug": true, + "group": [ + "Photonics" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SATES21-ADTEST1-CAM4.json b/configuration/camera_config/SATES21-ADTEST1-CAM4.json new file mode 100644 index 0000000..fbb5c2f --- /dev/null +++ b/configuration/camera_config/SATES21-ADTEST1-CAM4.json @@ -0,0 +1,14 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SATES21-ADTEST1-CAM4", + "protocol": "tcp", + "source": "SATES21-ADTEST1-CAM4", + "_debug": true, + "group": [ + "Photonics" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SATES21-CAMS154-GIGE10.json b/configuration/camera_config/SATES21-CAMS154-GIGE10.json index ec7a9a5..e34c366 100644 --- a/configuration/camera_config/SATES21-CAMS154-GIGE10.json +++ b/configuration/camera_config/SATES21-CAMS154-GIGE10.json @@ -14,7 +14,8 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "source_type": "bsread", + "protocol": "tcp", "name": "SATES21-CAMS154-GIGE10", "source": "SATES21-CAMS154-GIGE10", "group": [ diff --git a/configuration/camera_config/SATES21-CAMS154-GIGE11.json b/configuration/camera_config/SATES21-CAMS154-GIGE11.json index 0e22335..28031e2 100644 --- a/configuration/camera_config/SATES21-CAMS154-GIGE11.json +++ b/configuration/camera_config/SATES21-CAMS154-GIGE11.json @@ -14,7 +14,8 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "source_type": "bsread", + "protocol": "tcp", "name": "SATES21-CAMS154-GIGE11", "source": "SATES21-CAMS154-GIGE11", "group": [ diff --git a/configuration/camera_config/SATES21-CAMS154-GIGE9.json b/configuration/camera_config/SATES21-CAMS154-GIGE9.json index e8fa785..6a5a2e5 100644 --- a/configuration/camera_config/SATES21-CAMS154-GIGE9.json +++ b/configuration/camera_config/SATES21-CAMS154-GIGE9.json @@ -1,20 +1,10 @@ { - "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 - }, + "camera_calibration": null, "mirror_x": false, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "source_type": "bsread", + "protocol": "tcp", "name": "SATES21-CAMS154-GIGE9", "source": "SATES21-CAMS154-GIGE9", "group": [ diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE1.json b/configuration/camera_config/SATES30-CAMS182-GIGE1.json index 0b9be76..b3f0a5c 100644 --- a/configuration/camera_config/SATES30-CAMS182-GIGE1.json +++ b/configuration/camera_config/SATES30-CAMS182-GIGE1.json @@ -1,6 +1,6 @@ { "camera_calibration": null, - "mirror_x": false, + "mirror_x": true, "mirror_y": false, "rotate": 0, "roi": null, @@ -15,5 +15,6 @@ "Furka" ], "check_timestamp": true, - "debug": true + "debug": true, + "no_client_timeout": 0 } \ No newline at end of file diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE3.json b/configuration/camera_config/SATES30-CAMS182-GIGE3.json index 39e17bb..a695a53 100644 --- a/configuration/camera_config/SATES30-CAMS182-GIGE3.json +++ b/configuration/camera_config/SATES30-CAMS182-GIGE3.json @@ -5,12 +5,16 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", - "source": "SATES30-CAMS182-GIGE3", + "source_type": "bsread", + "protocol": "tcp", + "source": "SATES30-CAMS182-GIGE3:RF", "name": "SATES30-CAMS182-GIGE3", "prefix": "SATES30-CAMS182-GIGE3", "group": [ "Photonics", "Furka" + ], + "alias": [ + "FURKA_SIDEVIEW (SATES30-CAMS182-GIGE3)" ] } \ No newline at end of file diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE4.json b/configuration/camera_config/SATES30-CAMS182-GIGE4.json index 0f355b0..4ced804 100644 --- a/configuration/camera_config/SATES30-CAMS182-GIGE4.json +++ b/configuration/camera_config/SATES30-CAMS182-GIGE4.json @@ -1,12 +1,24 @@ { - "camera_calibration": null, - "mirror_x": true, + "camera_calibration": { + "reference_marker": [ + 64, + 193, + 258, + 415 + ], + "reference_marker_width": 500.0, + "reference_marker_height": 500.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", - "source": "SATES30-CAMS182-GIGE4", + "source_type": "bsread", + "protocol": "tcp", + "source": "SATES30-CAMS182-GIGE4:RF", "name": "SATES30-CAMS182-GIGE4", "prefix": "SATES30-CAMS182-GIGE4", "group": [ diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE5.json b/configuration/camera_config/SATES30-CAMS182-GIGE5.json new file mode 100644 index 0000000..014c02f --- /dev/null +++ b/configuration/camera_config/SATES30-CAMS182-GIGE5.json @@ -0,0 +1,28 @@ +{ + "camera_calibration": { + "reference_marker": [ + 100, + 100, + 113, + 113 + ], + "reference_marker_width": 500.0, + "reference_marker_height": 500.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "bsread", + "protocol": "tcp", + "source": "SATES30-CAMS182-GIGE5", + "name": "SATES30-CAMS182-GIGE5", + "prefix": "SATES30-CAMS182-GIGE5", + "group": [ + "Photonics", + "Furka" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/SATFE10-PSRD066.json b/configuration/camera_config/SATFE10-PSRD066.json index 697b238..bbe1f9f 100644 --- a/configuration/camera_config/SATFE10-PSRD066.json +++ b/configuration/camera_config/SATFE10-PSRD066.json @@ -14,9 +14,12 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "source_type": "bsread", + "forwarder_port": 9006, "name": "SATFE10-PSRD066", "source": "SATFE10-PSRD066", - "group": ["Photonics"], + "group": [ + "Photonics" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SATMA01-DSCR030.json b/configuration/camera_config/SATMA01-DSCR030.json index a2d02d3..cdfbbc2 100644 --- a/configuration/camera_config/SATMA01-DSCR030.json +++ b/configuration/camera_config/SATMA01-DSCR030.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 628, - 442, - 1103, - 604 + 764, + 402, + 1239, + 564 ], "reference_marker_width": 6000.0, "reference_marker_height": 2000.0, diff --git a/configuration/camera_config/SATOP10-PSETUP.json b/configuration/camera_config/SATOP10-PSETUP.json new file mode 100644 index 0000000..e503416 --- /dev/null +++ b/configuration/camera_config/SATOP10-PSETUP.json @@ -0,0 +1,14 @@ +{ + "camera_calibration": null, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SATOP10-PSETUP", + "source": "", + "Athos camera_calib_datetime": "2024-09-27 15:49:45", + "Furka camera_calib_datetime": "2024-09-27 14:37:57", + "Maloja camera_calib_datetime": "2024-09-27 14:37:50" +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PMOS127-2D.json b/configuration/camera_config/SATOP21-PMOS127-2D.json index a996270..58f516c 100644 --- a/configuration/camera_config/SATOP21-PMOS127-2D.json +++ b/configuration/camera_config/SATOP21-PMOS127-2D.json @@ -24,8 +24,15 @@ "buffer_size": 0, "forwarder_port": [], "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], "alias": [], - "protocol": "tcp" + "protocol": "tcp", + "hardware_configuration": { + "EXPOSURE": 9.9, + "HSSPEED": 1, + "REGIONX_START": 465, + "REGIONY_START": 1 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP21-PMOS127B-2D.json b/configuration/camera_config/SATOP21-PMOS127B-2D.json index 5aed64e..064f733 100644 --- a/configuration/camera_config/SATOP21-PMOS127B-2D.json +++ b/configuration/camera_config/SATOP21-PMOS127B-2D.json @@ -2,7 +2,7 @@ "camera_calibration": null, "mirror_x": false, "mirror_y": false, - "rotate": 0, + "rotate": 1, "roi": null, "image_background": null, "source_type": "epics", diff --git a/configuration/camera_config/SATOP31-PMOS132-2D.json b/configuration/camera_config/SATOP31-PMOS132-2D.json index 91a23e0..86ba210 100644 --- a/configuration/camera_config/SATOP31-PMOS132-2D.json +++ b/configuration/camera_config/SATOP31-PMOS132-2D.json @@ -24,8 +24,16 @@ "buffer_size": 0, "forwarder_port": 9002, "group": [ - "Photonics" + "Photonics", + "Beamline Athos" ], + "camera_calib_datetime": "2024-09-05 11:41:07", "alias": [], - "protocol": "tcp" + "protocol": "tcp", + "hardware_configuration": { + "EXPOSURE": 9.9, + "HSSPEED": 1, + "REGIONX_START": 1, + "REGIONY_START": 300 + } } \ No newline at end of file diff --git a/configuration/camera_config/SATOP31-PSRD132.json b/configuration/camera_config/SATOP31-PSRD132.json index 64a13fd..0c25d36 100644 --- a/configuration/camera_config/SATOP31-PSRD132.json +++ b/configuration/camera_config/SATOP31-PSRD132.json @@ -17,6 +17,7 @@ "roi": null, "image_background": null, "source_type": "bsread", + "forwarder_port": 9004, "group": [ "Photonics" ], diff --git a/configuration/camera_config/SATOP31-PSRD175.json b/configuration/camera_config/SATOP31-PSRD175.json index ac1cc46..bd30665 100644 --- a/configuration/camera_config/SATOP31-PSRD175.json +++ b/configuration/camera_config/SATOP31-PSRD175.json @@ -17,6 +17,7 @@ "roi": null, "image_background": null, "source_type": "bsread", + "forwarder_port": 9008, "group": [ "Photonics" ], diff --git a/configuration/camera_config/SATSY03-DSCR140.json b/configuration/camera_config/SATSY03-DSCR140.json index d8f39da..8c3c59c 100644 --- a/configuration/camera_config/SATSY03-DSCR140.json +++ b/configuration/camera_config/SATSY03-DSCR140.json @@ -2,9 +2,9 @@ "camera_calibration": { "reference_marker": [ 918, - 182, + 137, 1586, - 2004 + 1959 ], "reference_marker_width": 6000.0, "reference_marker_height": 16000.0, @@ -14,10 +14,14 @@ "mirror_x": true, "mirror_y": true, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "source": "SATSY03-DSCR140", "name": "SATSY03-DSCR140", "prefix": "SATSY03-DSCR140", - "group": ["Electrons"], + "group": [ + "Electrons" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SINBC01-DSCR040.json b/configuration/camera_config/SINBC01-DSCR040.json index fbb0d1f..82e18e1 100644 --- a/configuration/camera_config/SINBC01-DSCR040.json +++ b/configuration/camera_config/SINBC01-DSCR040.json @@ -1,21 +1,26 @@ { - "name": "SINBC01-DSCR040", - "camera_calibration": { - "angle_horizontal": 15.8, - "angle_vertical": 0.0, - "reference_marker_height": 16000.0, - "reference_marker": [ - 50, - 5, - 1114, - 1181 - ], - "reference_marker_width": 16000.0 - }, - "source": "SINBC01-DSCR040", - "mirror_y": true, - "rotate": 0, - "mirror_x": true, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 430, + 5, + 1494, + 1181 + ], + "reference_marker_width": 16000.0, + "reference_marker_height": 16000.0, + "angle_horizontal": 15.8, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SINBC01-DSCR040", + "source": "SINBC01-DSCR040", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SINBD01-DSCR010.json b/configuration/camera_config/SINBD01-DSCR010.json index da68654..d5b0944 100644 --- a/configuration/camera_config/SINBD01-DSCR010.json +++ b/configuration/camera_config/SINBD01-DSCR010.json @@ -1,21 +1,26 @@ { - "name": "SINBD01-DSCR010", - "camera_calibration": { - "angle_horizontal": 0.0, - "angle_vertical": 0.0, - "reference_marker_height": 30000.0, - "reference_marker": [ - 68, - 46, - 1655, - 1594 - ], - "reference_marker_width": 30000.0 - }, - "source": "SINBD01-DSCR010", - "mirror_y": true, - "rotate": 0, - "mirror_x": false, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 68, + 46, + 1655, + 1594 + ], + "reference_marker_width": 30000.0, + "reference_marker_height": 30000.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SINBD01-DSCR010", + "source": "SINBD01-DSCR010", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SINEG01-DSCR190.json b/configuration/camera_config/SINEG01-DSCR190.json index e7c748c..a348103 100644 --- a/configuration/camera_config/SINEG01-DSCR190.json +++ b/configuration/camera_config/SINEG01-DSCR190.json @@ -1,12 +1,12 @@ { "camera_calibration": { "reference_marker": [ - 24, - 49, - 1147, - 1156 + 273, + 82, + 832, + 1188 ], - "reference_marker_width": 30000.0, + "reference_marker_width": 15000.0, "reference_marker_height": 30000.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 diff --git a/configuration/camera_config/SINEG01-DSCR350.json b/configuration/camera_config/SINEG01-DSCR350.json index c8bf131..78556d5 100644 --- a/configuration/camera_config/SINEG01-DSCR350.json +++ b/configuration/camera_config/SINEG01-DSCR350.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 120, - 245, - 1251, - 1504 + 116, + 244, + 1257, + 1502 ], "reference_marker_width": 16000.0, "reference_marker_height": 16000.0, diff --git a/configuration/camera_config/SINLH01-DSCR080.json b/configuration/camera_config/SINLH01-DSCR080.json index bb2194b..f661983 100644 --- a/configuration/camera_config/SINLH01-DSCR080.json +++ b/configuration/camera_config/SINLH01-DSCR080.json @@ -1,21 +1,26 @@ { - "name": "SINLH01-DSCR080", - "camera_calibration": { - "angle_horizontal": 15.8, - "angle_vertical": 0.0, - "reference_marker_height": 16000.0, - "reference_marker": [ - 72, - 10, - 1141, - 1185 - ], - "reference_marker_width": 16000.0 - }, - "source": "SINLH01-DSCR080", - "mirror_y": true, - "rotate": 0, - "mirror_x": true, - "group": ["Electrons"], - "alias": [] -} + "camera_calibration": { + "reference_marker": [ + 92, + 45, + 1161, + 1220 + ], + "reference_marker_width": 16000.0, + "reference_marker_height": 16000.0, + "angle_horizontal": 15.8, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": true, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "name": "SINLH01-DSCR080", + "source": "SINLH01-DSCR080", + "group": [ + "Electrons" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SINLH02-DSCR250.json b/configuration/camera_config/SINLH02-DSCR250.json index 18eaafe..46c1af6 100644 --- a/configuration/camera_config/SINLH02-DSCR250.json +++ b/configuration/camera_config/SINLH02-DSCR250.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 47, - 29, - 568, - 628 + 34, + 15, + 555, + 614 ], "reference_marker_width": 16000.0, "reference_marker_height": 16000.0, @@ -14,9 +14,13 @@ "mirror_x": true, "mirror_y": true, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SINLH02-DSCR250", "source": "SINLH02-DSCR250", - "group": ["Electrons"], + "group": [ + "Electrons" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SINSB03-DSCR110.json b/configuration/camera_config/SINSB03-DSCR110.json index 5abd442..c7a3a3d 100644 --- a/configuration/camera_config/SINSB03-DSCR110.json +++ b/configuration/camera_config/SINSB03-DSCR110.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 587, - 61, - 1353, - 2111 + 612, + 48, + 1378, + 2098 ], "reference_marker_width": 6000.0, "reference_marker_height": 16000.0, diff --git a/configuration/camera_config/SINSB05-DSCR140.json b/configuration/camera_config/SINSB05-DSCR140.json index 99d99b3..29c8433 100644 --- a/configuration/camera_config/SINSB05-DSCR140.json +++ b/configuration/camera_config/SINSB05-DSCR140.json @@ -1,22 +1,26 @@ { "camera_calibration": { "reference_marker": [ - 86, - 16, - 1155, - 1185 + 401, + 278, + 1470, + 865 ], "reference_marker_width": 16000.0, - "reference_marker_height": 16000.0, + "reference_marker_height": 8000.0, "angle_horizontal": 15.8, "angle_vertical": 0.0 }, "mirror_x": true, "mirror_y": true, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "source": "SINSB05-DSCR140", "name": "SINSB05-DSCR140", - "group": ["Electrons"], + "group": [ + "Electrons" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR02-LPMO01-C321.json b/configuration/camera_config/SLAAR02-LPMO01-C321.json index cb3b5b9..6172e0f 100644 --- a/configuration/camera_config/SLAAR02-LPMO01-C321.json +++ b/configuration/camera_config/SLAAR02-LPMO01-C321.json @@ -1,8 +1,21 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 381, + 238, + 582, + 445 + ], + "reference_marker_width": 200.0, + "reference_marker_height": 206.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": true, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "bsread", "name": "SLAAR02-LPMO01-C321", "protocol": "tcp", diff --git a/configuration/camera_config/SLAAR02-LPMO02-C322.json b/configuration/camera_config/SLAAR02-LPMO02-C322.json index 366b6ca..b8b7b26 100644 --- a/configuration/camera_config/SLAAR02-LPMO02-C322.json +++ b/configuration/camera_config/SLAAR02-LPMO02-C322.json @@ -1,8 +1,21 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 61, + 49, + 73, + 57 + ], + "reference_marker_width": 12.0, + "reference_marker_height": 8.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": true, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "bsread", "name": "SLAAR02-LPMO02-C322", "protocol": "tcp", diff --git a/configuration/camera_config/SLAAR11-LCAM-C421.json b/configuration/camera_config/SLAAR11-LCAM-C421.json deleted file mode 100644 index 766597e..0000000 --- a/configuration/camera_config/SLAAR11-LCAM-C421.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "camera_calibration": { - "reference_marker": [ - 0, - 0, - 100, - 100 - ], - "reference_marker_width": 100.0, - "reference_marker_height": 100.0, - "angle_horizontal": 0.0, - "angle_vertical": 0.0 - }, - "mirror_x": false, - "mirror_y": false, - "rotate": 0, - "source_type": "epics", - "name": "SLAAR11-LCAM-C421", - "source": "SLAAR11-LCAM-C421", - "group": ["Laser"], - "alias": [] -} diff --git a/configuration/camera_config/SLAAR12-LSPC-SPEC1.json b/configuration/camera_config/SLAAR12-LSPC-SPEC1.json new file mode 100644 index 0000000..35f3a19 --- /dev/null +++ b/configuration/camera_config/SLAAR12-LSPC-SPEC1.json @@ -0,0 +1,9 @@ +{ + "source_type": "bsread", + "name": "SLAAR12-LSPC-SPEC1", + "source": "SLAAR12-CPCW-SPEC01", + "group": [ + "Laser" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-C561.json b/configuration/camera_config/SLAAR21-LCAM-C561.json index c7f185f..5944dd2 100644 --- a/configuration/camera_config/SLAAR21-LCAM-C561.json +++ b/configuration/camera_config/SLAAR21-LCAM-C561.json @@ -1,5 +1,16 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 162, + 162, + 273, + 184 + ], + "reference_marker_width": 111.0, + "reference_marker_height": 22.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": false, "rotate": 0, diff --git a/configuration/camera_config/SLAAR21-LCAM-C562.json b/configuration/camera_config/SLAAR21-LCAM-C562.json index f0915c1..549139b 100644 --- a/configuration/camera_config/SLAAR21-LCAM-C562.json +++ b/configuration/camera_config/SLAAR21-LCAM-C562.json @@ -1,5 +1,16 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 364, + 250, + 468, + 358 + ], + "reference_marker_width": 104.0, + "reference_marker_height": 108.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": false, "rotate": 0, diff --git a/configuration/camera_config/SLAAR21-LCAM-C563.json b/configuration/camera_config/SLAAR21-LCAM-C563.json new file mode 100644 index 0000000..855158c --- /dev/null +++ b/configuration/camera_config/SLAAR21-LCAM-C563.json @@ -0,0 +1,27 @@ +{ + "camera_calibration": { + "reference_marker": [ + 364, + 250, + 468, + 358 + ], + "reference_marker_width": 104.0, + "reference_marker_height": 108.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", + "source": "SLAAR21-LCAM-C563", + "group": [ + "Laser", + "Bernina" + ], + "alias": [], + "name": "SLAAR21-LCAM-C563" +} \ No newline at end of file diff --git a/configuration/camera_config/SLAAR21-LCAM-C563_ep.json b/configuration/camera_config/SLAAR21-LCAM-C563_ep.json new file mode 100644 index 0000000..28af9be --- /dev/null +++ b/configuration/camera_config/SLAAR21-LCAM-C563_ep.json @@ -0,0 +1,27 @@ +{ + "camera_calibration": { + "reference_marker": [ + 364, + 250, + 468, + 358 + ], + "reference_marker_width": 104.0, + "reference_marker_height": 108.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", + "source": "EPICS:SLAAR21-LCAM-C563", + "group": [ + "Laser", + "Bernina" + ], + "alias": [], + "name": "SLAAR21-LCAM-C563_ep" +} \ 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 ef83420..f0f408c 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CS841.json +++ b/configuration/camera_config/SLAAR21-LCAM-CS841.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 0, - 0, + 627, 1, - 1 + 695, + 190 ], - "reference_marker_width": 1.0, - "reference_marker_height": 1.0, + "reference_marker_width": 68.0, + "reference_marker_height": 189.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SLAAR21-LCAM-CS843.json b/configuration/camera_config/SLAAR21-LCAM-CS843.json index 7fa5c40..3a6ffec 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CS843.json +++ b/configuration/camera_config/SLAAR21-LCAM-CS843.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 0, - 0, - 1, - 1 + 29, + 17, + 40, + 26 ], - "reference_marker_width": 1.0, - "reference_marker_height": 1.0, + "reference_marker_width": 11.0, + "reference_marker_height": 9.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SLAAR21-LCAM-CS844.json b/configuration/camera_config/SLAAR21-LCAM-CS844.json index ed49dae..481459c 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CS844.json +++ b/configuration/camera_config/SLAAR21-LCAM-CS844.json @@ -1,5 +1,16 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 309, + 196, + 492, + 403 + ], + "reference_marker_width": 183.0, + "reference_marker_height": 206.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": true, "rotate": 0, diff --git a/configuration/camera_config/SLAAR21-LCAM-CT1C1.json b/configuration/camera_config/SLAAR21-LCAM-CT1C1.json index 39f0d7a..f37ca87 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CT1C1.json +++ b/configuration/camera_config/SLAAR21-LCAM-CT1C1.json @@ -1,5 +1,16 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 31, + 19, + 37, + 23 + ], + "reference_marker_width": 6.0, + "reference_marker_height": 4.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": false, "rotate": 0, diff --git a/configuration/camera_config/SLAAR21-LCAM-CT1C2.json b/configuration/camera_config/SLAAR21-LCAM-CT1C2.json index 460b55c..f50ba15 100644 --- a/configuration/camera_config/SLAAR21-LCAM-CT1C2.json +++ b/configuration/camera_config/SLAAR21-LCAM-CT1C2.json @@ -1,5 +1,16 @@ { - "camera_calibration": null, + "camera_calibration": { + "reference_marker": [ + 206, + 65, + 481, + 416 + ], + "reference_marker_width": 276.0, + "reference_marker_height": 350.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, "mirror_y": false, "rotate": 0, diff --git a/configuration/camera_config/SLG-LCAM-C071.json b/configuration/camera_config/SLG-LCAM-C071.json index 33243b3..aa7c860 100644 --- a/configuration/camera_config/SLG-LCAM-C071.json +++ b/configuration/camera_config/SLG-LCAM-C071.json @@ -14,10 +14,15 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, - "source_type": "epics", + "roi": null, + "debug": true, + "image_background": null, + "source_type": "bsread", "prefix": "SLG-LCAM-C071", "name": "SLG-LCAM-C071", "source": "SLG-LCAM-C071", - "group": ["Laser"], + "group": [ + "Laser" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/SLG-LCAM-C111.json b/configuration/camera_config/SLG-LCAM-C111.json new file mode 100644 index 0000000..d64c4e5 --- /dev/null +++ b/configuration/camera_config/SLG-LCAM-C111.json @@ -0,0 +1,24 @@ +{ + "camera_calibration": { + "reference_marker": [ + 119, + 103, + 170, + 154 + ], + "reference_marker_width": 703.0, + "reference_marker_height": 703.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, + "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "bsread", + "name": "SLG-LCAM-C111", + "source": "SLG-LCAM-C111", + "group": [ + "Laser" + ], + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/permanent_instances.json b/configuration/camera_config/permanent_instances.json index 6a00739..4e6c009 100644 --- a/configuration/camera_config/permanent_instances.json +++ b/configuration/camera_config/permanent_instances.json @@ -7,6 +7,9 @@ "SARES11-SPEC125-M1": "SARES11-SPEC125-M1", "SARES11-SPEC125-M2": "SARES11-SPEC125-M2", "SARES11-SPEC125-M3": "SARES11-SPEC125-M3", + "SARES20-CAMS142-C1": "SARES20-CAMS142-C1", + "SARES20-CAMS142-C2": "SARES20-CAMS142-C2", + "SARES20-CAMS142-C3": "SARES20-CAMS142-C3", "SARES20-CAMS142-M1": "SARES20-CAMS142-M1", "SARES20-CAMS142-M2": "SARES20-CAMS142-M2", "SARES20-CAMS142-M3": "SARES20-CAMS142-M3", @@ -19,11 +22,16 @@ "SARFE10-PPRM064": "SARFE10-PPRM064", "SARFE10-PSSS059": "SARFE10-PSSS059", "SARFE10-PSSS059-LB": "SARFE10-PSSS059-LB", + "SAROP11-PPRM110": "SAROP11-PPRM110", "SAROP11-PPRM122": "SAROP11-PPRM122", "SAROP31-PPRM113": "SAROP31-PPRM113", "SAROP31-PPRM150": "SAROP31-PPRM150", "SAROP31-PSCD153": "SAROP31-PSCD153", "SATBD02-DSCR050": "SATBD02-DSCR050", + "SATES21-ADTEST1-CAM1": "SATES21-ADTEST1-CAM1", + "SATES21-ADTEST1-CAM2": "SATES21-ADTEST1-CAM2", + "SATES21-ADTEST1-CAM3": "SATES21-ADTEST1-CAM3", + "SATES21-ADTEST1-CAM4": "SATES21-ADTEST1-CAM4", "SATES21-CAMS-PATT1": "SATES21-CAMS-PATT1", "SATES21-CAMS154-GIGE6": "SATES21-CAMS154-GIGE6", "SATES21-CAMS154-GIGE7": "SATES21-CAMS154-GIGE7", @@ -35,9 +43,15 @@ "SATES30-CAMS182-GIGE2": "SATES30-CAMS182-GIGE2", "SATES30-RIXS-CAM01": "SATES30-RIXS-CAM01", "SATES31-CAMS187-RIXS1": "SATES31-CAMS187-RIXS1", + "SATFE10-PSRD066": "SATFE10-PSRD066", + "SATOP11-PSAS079": "SATOP11-PSAS079", "SATOP21-PMOS127-2D": "SATOP21-PMOS127-2D", + "SATOP21-PSCA162": "SATOP21-PSCA162", "SATOP31-PMOS132-2D": "SATOP31-PMOS132-2D", + "SATOP31-PSRD132": "SATOP31-PSRD132", + "SATOP31-PSRD175": "SATOP31-PSRD175", "SINDI02-DSCR075": "SINDI02-DSCR075", "SLAAR02-LPMO01-C321": "SLAAR02-LPMO01-C321", - "SLAAR02-LPMO02-C322": "SLAAR02-LPMO02-C322" + "SLAAR02-LPMO02-C322": "SLAAR02-LPMO02-C322", + "SLAAR12-LSPC-SPEC1": "SLAAR12-LSPC-SPEC1" } \ No newline at end of file diff --git a/configuration/camera_config/servers.json b/configuration/camera_config/servers.json index ebad84b..9063bfb 100644 --- a/configuration/camera_config/servers.json +++ b/configuration/camera_config/servers.json @@ -17,9 +17,7 @@ "expanding": false, "instances": [ "SARFE10-PPRM064", - "SATOP31-PMOS132-2D", - "SATOP21-PMOS127-2D", - "SATOP11-PSAS079" + "SATOP21-PSCA162" ] }, "http://sf-daqsync-08.psi.ch:8880": { @@ -50,7 +48,8 @@ "expanding": false, "instances": [ "SARFE10-PSSS059", - "SARFE10-PSSS059-LB" + "SARFE10-PSSS059-LB", + "#SATOP31-PSRD132" ] }, "http://sf-daqsync-12.psi.ch:8880": { @@ -70,7 +69,10 @@ "SATES21-CAMS154-GIGE7", "SATES21-CAMS154-GIGE7b", "SATES21-CAMS154-GIGE8", - "SSL-LCAM-C0103", + "SATES21-CAMS154-GIGE9", + "SATES21-CAMS154-GIGE10", + "SATES21-CAMS154-GIGE11", + "#SSL-LCAM-C0103", "SSL-LCAM-C0104" ] }, @@ -84,11 +86,14 @@ "SARES11-XMI125-C4P1", "SARES11-XPR125-C4P2", "SARES11-XPR125-C4P3", + "SAROP11-PPRM110", "SARES12-XPR128-C4F1", "#SLAAR11-LCAM-C452", "#SLAAR11-LCAM-C421", + "SAROP11-PPRM110", "#SARES12-CAMS128-M1", - "SAROP11-PPRM122" + "SAROP11-PPRM122", + "SLAAR12-LSPC-SPEC1" ] }, "http://sf-daqsync-14.psi.ch:8880": { @@ -100,6 +105,9 @@ "SARES20-CAMS142-M3", "SARES20-CAMS142-M4", "SARES20-CAMS142-M5", + "SARES20-CAMS142-C1", + "SARES20-CAMS142-C2", + "SARES20-CAMS142-C3", "SARES20-PROF141-M1", "SARES20-PROF142-M1", "SARES20-PROF146-M1", @@ -121,9 +129,9 @@ "SATES30-CAMS182-GIGE2", "SATES30-CAMS182-GIGE3", "SATES30-CAMS182-GIGE4", + "SATES30-CAMS182-GIGE5", "SATES30-RIXS-CAM01", - "furka_jungfrau", - "SATOP11-PSAS079" + "furka_jungfrau" ] }, "http://sf-daqsync-16.psi.ch:8880": { @@ -134,17 +142,25 @@ "SAROP31-PPRM150", "SARES30-CAMS156-XE", "SARES30-CAMS156-SMX-OAV", - "SAROP31-PSCD153" + "SAROP31-PSCD153", + "SARES30-CAMS156-X8M" ] }, "http://sf-daqsync-17.psi.ch:8880": { "enabled": true, "expanding": false, "instances": [ - "#SATES30-CAMS182-GIGE2", - "#SARCL01-DSCR170", - "#SATBD02-DSCR050", - "#SINDI02-DSCR075" + "SATOP31-PMOS132-2D", + "SATOP21-PMOS127-2D", + "SATES21-ADTEST1-CAM1", + "SATES21-ADTEST1-CAM2", + "SATES21-ADTEST1-CAM3", + "SATES21-ADTEST1-CAM4", + "SATOP11-PSAS079", + "SATOP21-PMOS127B-2D", + "SATOP31-PSRD175", + "SATOP31-PSRD132", + "SATFE10-PSRD066" ] }, "http://sf-daqsync-18.psi.ch:8880": { diff --git a/configuration/camera_config/simulation.json b/configuration/camera_config/simulation.json index a2040e1..fca9a4a 100644 --- a/configuration/camera_config/simulation.json +++ b/configuration/camera_config/simulation.json @@ -14,12 +14,13 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "simulation", "name": "simulation", "source": "", "dtype": "uint16", "_size_x": 2560, "_size_y": 2160, - "image_background": null, "frame_rate": 10 } \ No newline at end of file diff --git a/configuration/pipeline_config/Bernina_tt_kb_populate_pvs.json b/configuration/pipeline_config/Bernina_tt_kb_populate_pvs.json new file mode 100644 index 0000000..7cb5995 --- /dev/null +++ b/configuration/pipeline_config/Bernina_tt_kb_populate_pvs.json @@ -0,0 +1,19 @@ +{ + "name": "Bernina_tt_kb_populate_pvs", + "pipeline_type": "stream", + "bsread_address": "", + "bsread_channels": [ + "SAROP21-ATT01:edge_pos", + "SAROP21-ATT01:arrival_time", + "SAROP21-ATT01:xcorr_ampl" + ], + "bs_edge_fs": "SAROP21-ATT01:arrival_time", + "bs_edge_px": "SAROP21-ATT01:edge_pos", + "bs_edge_mx": "SAROP21-ATT01:xcorr_ampl", + "ca_edge_fs": "SLAAR21-SPECTT:AT", + "ca_edge_px": "SLAAR21-SPECTT:PX", + "ca_edge_mx": "SLAAR21-SPECTT:MX", + "function": "Bernina_tt_kb_populate_pvs.py", + "mode": "PUSH", + "type": "stream" +} \ No newline at end of file diff --git a/configuration/pipeline_config/Bernina_tt_kb_restart_cam.json b/configuration/pipeline_config/Bernina_tt_kb_restart_cam.json new file mode 100644 index 0000000..10235e5 --- /dev/null +++ b/configuration/pipeline_config/Bernina_tt_kb_restart_cam.json @@ -0,0 +1,13 @@ +{ + "name": "Bernina_tt_kb_restart_cam", + "pipeline_type": "stream", + "bsread_address": "", + "bsread_channels": [ + "SAR-CVME-TIFALL5:EvtSet" + ], + "camera": "SARES20-CAMS142-M5", + "pipeline": "SARES20-CAMS142-M5_psen_db", + "function": "Bernina_restart_cam.py", + "type": "stream", + "mode": "PUSH" +} \ No newline at end of file diff --git a/configuration/pipeline_config/Bernina_tt_test.json b/configuration/pipeline_config/Bernina_tt_test.json new file mode 100644 index 0000000..64658f8 --- /dev/null +++ b/configuration/pipeline_config/Bernina_tt_test.json @@ -0,0 +1,47 @@ +{ + "name": "Bernina_tt_test", + "_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", + "tt_sig": "SARES20-CAMS142-M5.roi_signal_x_profile", + "events": "SAR-CVME-TIFALL5:EvtSet", + "function": "Bernina_tt_test.py", + "mode": "PUB", + "no_client_timeout": 0, + "processing_threads": 1, + "allow_type_changes": false, + "abort_on_timeout": true, + "abort_on_error": false, + "debug": true, + "block": false, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true, + "stream_timeout": 20, + "pipeline_type": "stream", + "reload": true, + "buffer_length": 10, + "calibration": [ + -4.09154356e-19, + -1.07115942e-15, + 1.47502787e-12 + ], + "roi": [ + 600, + 1450 + ], + "dpx_poly": 50, + "sigma_px": 30, + "reflen": 300, + "window": false, + "is_laser_dark": false, + "event_code_laser_delayed": 25, + "port": "9003" +} \ No newline at end of file diff --git a/configuration/pipeline_config/S10BC02-DSCR220.json b/configuration/pipeline_config/S10BC02-DSCR220.json deleted file mode 100644 index 0c4e1c8..0000000 --- a/configuration/pipeline_config/S10BC02-DSCR220.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "S10BC02-DSCR220", - "camera_name": "S10BC02-DSCR220", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.5, - "gfscale": 3.0 - }, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/S10BC02-DSRM310.json b/configuration/pipeline_config/S10BC02-DSRM310.json deleted file mode 100644 index 09f3aaa..0000000 --- a/configuration/pipeline_config/S10BC02-DSRM310.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "S10BC02-DSRM310", - "camera_name": "S10BC02-DSRM310", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/S10BD01-DSCR030.json b/configuration/pipeline_config/S10BD01-DSCR030.json deleted file mode 100644 index b096c97..0000000 --- a/configuration/pipeline_config/S10BD01-DSCR030.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "S10BD01-DSCR030", - "camera_name": "S10BD01-DSCR030", - "image_background": "S10BD01-DSCR030", - "image_threshold": null, - "image_region_of_interest": [ - 300, - 1776, - 1051, - 730 - ], - "image_good_region": { - "threshold": 0.3, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 20 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/S10DI01-DSCR020.json b/configuration/pipeline_config/S10DI01-DSCR020.json deleted file mode 100644 index 234d99c..0000000 --- a/configuration/pipeline_config/S10DI01-DSCR020.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "S10DI01-DSCR020", - "camera_name": "S10DI01-DSCR020", - "image_background": "S10DI01-DSCR020", - "image_threshold": null, - "image_region_of_interest": [ - 668, - 754, - 621, - 666 - ], - "image_good_region": { - "threshold": 0.3, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 3 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/S10MA01-DSCR090.json b/configuration/pipeline_config/S10MA01-DSCR090.json deleted file mode 100644 index 837bf76..0000000 --- a/configuration/pipeline_config/S10MA01-DSCR090.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "S10MA01-DSCR090", - "camera_name": "S10MA01-DSCR090", - "image_background": "S10MA01-DSCR090", - "image_threshold": null, - "image_region_of_interest": [ - 702, - 254, - 827, - 211 - ], - "image_good_region": { - "threshold": 0.5, - "gfscale": 3.0 - }, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARBD01-DSCR050.json b/configuration/pipeline_config/SARBD01-DSCR050.json deleted file mode 100644 index 3b3d8c7..0000000 --- a/configuration/pipeline_config/SARBD01-DSCR050.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SARBD01-DSCR050", - "camera_name": "SARBD01-DSCR050", - "image_background": null, - "image_threshold": 30.0, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARBD01-DSCR110.json b/configuration/pipeline_config/SARBD01-DSCR110.json deleted file mode 100644 index 4409f5c..0000000 --- a/configuration/pipeline_config/SARBD01-DSCR110.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SARBD01-DSCR110", - "camera_name": "SARBD01-DSCR110", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARBD02-DSCR050.json b/configuration/pipeline_config/SARBD02-DSCR050.json deleted file mode 100644 index e9b2d8d..0000000 --- a/configuration/pipeline_config/SARBD02-DSCR050.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "SARBD02-DSCR050", - "camera_name": "SARBD02-DSCR050", - "image_background": "SARBD02-DSCR050", - "image_threshold": null, - "image_region_of_interest": [ - 603, - 1333, - 448, - 1333 - ], - "image_good_region": { - "threshold": 0.3, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARCL01-DSCR170.json b/configuration/pipeline_config/SARCL01-DSCR170.json deleted file mode 100644 index 057cd74..0000000 --- a/configuration/pipeline_config/SARCL01-DSCR170.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "SARCL01-DSCR170", - "camera_name": "SARCL01-DSCR170", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.3, - "gfscale": 1.8 - }, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARCL02-DSCR280.json b/configuration/pipeline_config/SARCL02-DSCR280.json deleted file mode 100644 index acf3784..0000000 --- a/configuration/pipeline_config/SARCL02-DSCR280.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "SARCL02-DSCR280", - "camera_name": "SARCL02-DSCR280", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.3, - "gfscale": 1.8 - }, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json index d0f63ac..a205f41 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json @@ -1,12 +1,12 @@ { "image_background_enable": "passive", - "image_background": "SARES11-SPEC125-M1_20240316_160434_361645", + "image_background": "SARES11-SPEC125-M1_20241121_094305_572290", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "function": "SARES11-SPEC125-M1_tt.py", + "function": "SARES11-SPEC125-M1_2tt.py", "camera_name": "SARES11-SPEC125-M1", "name": "SARES11-SPEC125-M1_psen_db", "mode": "PUSH", @@ -14,8 +14,8 @@ "roi_signal": [ 0, 2048, - 75, - 425 + 50, + 250 ], "roi_signal2": [ 0, diff --git a/configuration/pipeline_config/SARES11-SPEC125-M2_db.json b/configuration/pipeline_config/SARES11-SPEC125-M2_db.json index 952899d..f10f37a 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M2_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M2_db.json @@ -12,9 +12,9 @@ "mode": "PUSH", "allow_type_changes": false, "roi_signal": [ - 900, - 1100, + 700, 1300, + 1400, 2000 ], "roi_background": [ diff --git a/configuration/pipeline_config/SARES11-SPEC125-M3_spec_db.json b/configuration/pipeline_config/SARES11-SPEC125-M3_spec_db.json index 9cf2af7..7a2bd8a 100644 --- a/configuration/pipeline_config/SARES11-SPEC125-M3_spec_db.json +++ b/configuration/pipeline_config/SARES11-SPEC125-M3_spec_db.json @@ -1,6 +1,6 @@ { - "image_background_enable": "true", - "image_background": "SARES11-SPEC125-M3_20240301_111425_179468", + "image_background_enable": "passive", + "image_background": "SARES11-SPEC125-M3_20240606_112442_775849", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -15,13 +15,13 @@ 0, 2048, 0, - 300 + 100 ], "roi_signal": [ 0, 2048, - 210, - 540 + 0, + 250 ], "no_client_timeout": 0, "pixel_bkg": 0, diff --git a/configuration/pipeline_config/SARES11-XMI125-C4P1_xy_db.json b/configuration/pipeline_config/SARES11-XMI125-C4P1_xy_db.json new file mode 100644 index 0000000..f5c690e --- /dev/null +++ b/configuration/pipeline_config/SARES11-XMI125-C4P1_xy_db.json @@ -0,0 +1,17 @@ +{ + "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": "SARES11-XMI125-C4P1", + "name": "SARES11-XMI125-C4P1_xy_db", + "function": "pprm.py", + "mode": "PUSH", + "port": "9013", + "allow_type_changes": false, + "block": false, + "reload": true +} \ 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 e6d4c8c..1a958cd 100644 --- a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json +++ b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json @@ -15,8 +15,8 @@ "roi_signal": [ 0, 2040, - 100, - 700 + 0, + 600 ], "roi_background": [ 300, @@ -24,6 +24,7 @@ 750, 100 ], + "invert": true, "no_client_timeout": 0, "port": "8011" } \ No newline at end of file diff --git a/configuration/pipeline_config/SARES21-PBPS141_proc.json b/configuration/pipeline_config/SARES21-PBPS141_proc.json index 450ee8d..83dd1ea 100644 --- a/configuration/pipeline_config/SARES21-PBPS141_proc.json +++ b/configuration/pipeline_config/SARES21-PBPS141_proc.json @@ -26,10 +26,10 @@ "down": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD2", "right": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD3", "left": "SARES21-PBPS141:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 2.5407263184489456e-05, - "down_calib": 2.229091390250418e-05, - "left_calib": 6.78613890412e-05, - "right_calib": 4.031360761636926e-05, + "up_calib": 2.4706101161799464e-05, + "down_calib": 2.224319211516208e-05, + "left_calib": 6.923236264022323e-05, + "right_calib": 4.3865559429761766e-05, "horiz_calib": -3.9446335571333027, "vert_calib": -7.009396901398793, "uJ_calib": 941.943984588351, @@ -94,5 +94,5 @@ 0.11052246554408188, 0.11072063526778356 ], - "calib_datetime": "2024-03-20 10:01:58" + "calib_datetime": "2024-12-14 13:38:38" } \ No newline at end of file diff --git a/configuration/pipeline_config/SARES30-CAMS156-QC2_sp.json b/configuration/pipeline_config/SARES30-CAMS156-QC2_sp.json new file mode 100644 index 0000000..88662ae --- /dev/null +++ b/configuration/pipeline_config/SARES30-CAMS156-QC2_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": "SARES30-CAMS156-QC2", + "name": "SARES30-CAMS156-QC2_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_db.json b/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_db.json index 7446857..9b17155 100644 --- a/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_db.json +++ b/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_db.json @@ -12,10 +12,10 @@ "mode": "PUSH", "allow_type_changes": false, "roi_signal": [ - 1000, - 1700, - 200, - 400 + 700, + 1200, + 270, + 350 ], "no_client_timeout": 0, "pixel_bkg": 0, diff --git a/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_sp.json b/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_sp.json index b66734b..02bf679 100644 --- a/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_sp.json +++ b/configuration/pipeline_config/SARES30-CAMS156-SMX-OAV_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SARES30-CAMS156-SMX-OAV", - "name": "SARES30-CAMS156-SMX-OAV_sp" + "name": "SARES30-CAMS156-SMX-OAV_sp", + "max_frame_rate": 5.1 } \ 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 e60889f..54393dd 100644 --- a/configuration/pipeline_config/SARFE10-PBPS053_proc.json +++ b/configuration/pipeline_config/SARFE10-PBPS053_proc.json @@ -3,12 +3,12 @@ "name": "SARFE10-PBPS053_proc", "bsread_address": "", "bsread_channels": [ - "SARFE10-CVME-PHO6212:Lnk9Ch12-DATA-SUM", - "SARFE10-CVME-PHO6212:Lnk9Ch13-DATA-SUM", - "SARFE10-CVME-PHO6212:Lnk9Ch14-DATA-SUM", - "SARFE10-CVME-PHO6212:Lnk9Ch15-DATA-SUM" + "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD0", + "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD1", + "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD2", + "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD3" ], - "mode": "PUB", + "mode": "PUSH", "allow_type_changes": false, "abort_on_timeout": true, "abort_on_error": true, @@ -18,20 +18,20 @@ "enforce_timestamp": true, "check_timestamp": true, "stream_timeout": 20, - "function": "pbps.py", + "function": "pbps_full.py", "reload": true, "no_client_timeout": 0, "port": "9004", - "up": "SARFE10-CVME-PHO6212:Lnk9Ch12-DATA-SUM", - "down": "SARFE10-CVME-PHO6212:Lnk9Ch13-DATA-SUM", - "right": "SARFE10-CVME-PHO6212:Lnk9Ch14-DATA-SUM", - "left": "SARFE10-CVME-PHO6212:Lnk9Ch15-DATA-SUM", - "up_calib": 0.9019792251279883, - "down_calib": 0.9101901672523649, - "left_calib": 2.8540405681826577, - "right_calib": 1.7025669687469098, - "horiz_calib": -4.139302732964825, - "vert_calib": -126.81245308629619, + "up": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD1", + "down": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD2", + "right": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD3", + "left": "SARFE10-PBPS053:Lnk9Ch0-PP_VAL_PD0", + "up_calib": 7.422824889622594e-05, + "down_calib": 8.76181530794276e-05, + "left_calib": 0.0002547313806644617, + "right_calib": 0.00015550629116251527, + "horiz_calib": -3.61814760810708, + "vert_calib": -5.805628403047177, "uJ_calib": 834.5191797495979, "threshold": 0, "queue_length": 5000, @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.062155212050384316, - -0.002481949209461889, - -0.08279673727713997 + 0.082551959012514, + -0.00039066650318789913, + -0.08327875465311899 ], "calib_y_range": [ -0.3, @@ -79,20 +79,20 @@ 0.3 ], "calib_y_norm": [ - 0.0012158223507226945, - 0.0009895194352891898, - -0.0035155741753873913 + 0.05176595614209831, + -0.0003035962724308957, + -0.05158202935505826 ], "calib_time": "2022-11-28 16:19:37", - "calib_datetime": "2023-11-06 10:34:27", + "calib_datetime": "2024-11-18 12:45:10", "calib_x_norm_std": [ - 0.1735115650061328, - 0.17207905200620544, - 0.1775636982193752 + 0.03978894634880693, + 0.03917647311976521, + 0.04068762148653039 ], "calib_y_norm_std": [ - 0.13451160000157428, - 0.1330699161650116, - 0.17699539123265604 + 0.0404015077325962, + 0.03440738347756294, + 0.043070158640609334 ] } \ No newline at end of file diff --git a/configuration/pipeline_config/SARFE10-PPRM053.json b/configuration/pipeline_config/SARFE10-PPRM053.json deleted file mode 100644 index 8ea8a51..0000000 --- a/configuration/pipeline_config/SARFE10-PPRM053.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SARFE10-PPRM053", - "name": "SARFE10-PPRM053", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARFE10-PPRM064.json b/configuration/pipeline_config/SARFE10-PPRM064.json deleted file mode 100644 index 1ff0f98..0000000 --- a/configuration/pipeline_config/SARFE10-PPRM064.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SARFE10-PPRM064", - "name": "SARFE10-PPRM064", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SARFE10-PSSS059-LB_psss.json b/configuration/pipeline_config/SARFE10-PSSS059-LB_psss.json index 3b35e60..dc33f28 100644 --- a/configuration/pipeline_config/SARFE10-PSSS059-LB_psss.json +++ b/configuration/pipeline_config/SARFE10-PSSS059-LB_psss.json @@ -1,6 +1,6 @@ { - "image_background_enable": false, - "image_background": "SARFE10-PSSS059_20230823_135245_228963", + "image_background_enable": true, + "image_background": "SARFE10-PSSS059-LB_20241201_084602_840726", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, diff --git a/configuration/pipeline_config/SARMA02-DSCR030.json b/configuration/pipeline_config/SARMA02-DSCR030.json deleted file mode 100644 index 00747fc..0000000 --- a/configuration/pipeline_config/SARMA02-DSCR030.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SARMA02-DSCR030", - "camera_name": "SARMA02-DSCR030", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 910, - 834, - 613, - 841 - ], - "image_good_region": null, - "image_slices": null -} \ 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 1b6d04d..6111698 100644 --- a/configuration/pipeline_config/SAROP11-PBPS110_proc.json +++ b/configuration/pipeline_config/SAROP11-PBPS110_proc.json @@ -3,12 +3,12 @@ "name": "SAROP11-PBPS110_proc", "bsread_address": "", "bsread_channels": [ - "SAROP11-CVME-PBPS2:Lnk9Ch11-DATA-SUM", - "SAROP11-CVME-PBPS2:Lnk9Ch13-DATA-SUM", - "SAROP11-CVME-PBPS2:Lnk9Ch14-DATA-SUM", - "SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM" + "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD0", + "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD1", + "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD2", + "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD3" ], - "mode": "PUB", + "mode": "PUSH", "allow_type_changes": false, "abort_on_timeout": true, "abort_on_error": false, @@ -18,23 +18,23 @@ "enforce_timestamp": true, "check_timestamp": true, "stream_timeout": 20, - "function": "pbps.py", + "function": "pbps_full.py", "reload": true, "no_client_timeout": 0, "port": "10007", - "up": "SAROP11-CVME-PBPS2:Lnk9Ch13-DATA-SUM", - "down": "SAROP11-CVME-PBPS2:Lnk9Ch11-DATA-SUM", - "right": "SAROP11-CVME-PBPS2:Lnk9Ch14-DATA-SUM", - "left": "SAROP11-CVME-PBPS2:Lnk9Ch15-DATA-SUM", - "up_calib": 0.8574867024668043, - "down_calib": 0.9974498310838109, - "left_calib": 0.5791694752773828, - "right_calib": 0.62647381481912, - "horiz_calib": -8.931334985795655, - "vert_calib": 4.958717648454337, + "up": "SAROP11-PBPS110:Lnk9Ch0-PP_VAL_PD1", + "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, "uJ_calib": 605.4608924473305, "threshold": 0, - "queue_length": 5000, + "queue_length": 1000, "xpos_all_x_pvname": "SAROP11-PBPS110:XPOS-ALL-HIST-X", "xpos_all_y_pvname": "SAROP11-PBPS110:XPOS-ALL-HIST-Y", "xpos_all_m_pvname": "SAROP11-PBPS110:XPOS-ALL-HIST-M", @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.03490877639586871, - 0.0006984807915246429, - -0.03227043040291743 + 0.08928964939169279, + -0.0004260470257601398, + -0.08487178680059977 ], "calib_y_range": [ -0.3, @@ -79,19 +79,19 @@ 0.3 ], "calib_y_norm": [ - -0.06369707174289907, - -0.00017609105205766817, - 0.057301953113259786 + 0.06886169723871727, + 0.0002235257511305972, + -0.0637002067170448 ], - "calib_datetime": "2024-03-12 09:03:37", + "calib_datetime": "2024-11-19 08:28:13", "calib_x_norm_std": [ - 0.03675990521374381, - 0.030460397988326768, - 0.0317401414261032 + 0.017475169999872805, + 0.01854660174469743, + 0.017759044318414286 ], "calib_y_norm_std": [ - 0.0674277517134674, - 0.06863030226873862, - 0.06684686066849438 + 0.024021607127917188, + 0.024252208065290107, + 0.023430804513813092 ] } \ 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 8fed251..14d13b0 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": 1.7066957360186802e-05, - "down_calib": 2.1124028125713994e-05, - "left_calib": 7.117113931727747e-06, - "right_calib": 6.8356120073813676e-06, - "horiz_calib": -5.4058736146902815, - "vert_calib": -7.901508167424239, + "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, "uJ_calib": 605.9512700123181, "threshold": 0, "queue_length": 1000, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.054915842404982776, - 5.1061117952404115e-05, - -0.05607454375009121 + 0.054969977322280913, + 0.0009656974192057046, + -0.05421255056625182 ], "calib_x_norm_std": [ - 0.07077072586478916, - 0.07067909543205898, - 0.07075255742888523 + 0.044412111433209785, + 0.03994837842564122, + 0.041061134090118044 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.03781833802878161, - -4.120068311556111e-05, - -0.038116532541071904 + 0.048947766395264214, + -0.0006253311131685033, + -0.05124185327866625 ], "calib_y_norm_std": [ - 0.10544108420653482, - 0.06415127814597306, - 0.06929011114763489 + 0.04700591017282901, + 0.039664252046486964, + 0.04249498877747604 ], - "calib_datetime": "2024-03-12 11:16:25" + "calib_datetime": "2024-11-14 17:03:33" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM066.json b/configuration/pipeline_config/SAROP11-PPRM066.json deleted file mode 100644 index 205da5c..0000000 --- a/configuration/pipeline_config/SAROP11-PPRM066.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PPRM066", - "name": "SAROP11-PPRM066", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM078.json b/configuration/pipeline_config/SAROP11-PPRM078.json deleted file mode 100644 index ecf9de5..0000000 --- a/configuration/pipeline_config/SAROP11-PPRM078.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PPRM078", - "name": "SAROP11-PPRM078", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM110.json b/configuration/pipeline_config/SAROP11-PPRM110.json deleted file mode 100644 index ab30c82..0000000 --- a/configuration/pipeline_config/SAROP11-PPRM110.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PPRM110", - "name": "SAROP11-PPRM110", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM110_proc.json b/configuration/pipeline_config/SAROP11-PPRM110_proc.json new file mode 100644 index 0000000..3e938ee --- /dev/null +++ b/configuration/pipeline_config/SAROP11-PPRM110_proc.json @@ -0,0 +1,18 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": { + "threshold": 0.5, + "gfscale": 3.0 + }, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SAROP11-PPRM110", + "name": "SAROP11-PPRM110_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "allow_type_changes": false, + "no_client_timeout": 0 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM117.json b/configuration/pipeline_config/SAROP11-PPRM117.json deleted file mode 100644 index 9540838..0000000 --- a/configuration/pipeline_config/SAROP11-PPRM117.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PPRM117", - "name": "SAROP11-PPRM117", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM122.json b/configuration/pipeline_config/SAROP11-PPRM122.json deleted file mode 100644 index 12d4dbe..0000000 --- a/configuration/pipeline_config/SAROP11-PPRM122.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PPRM122", - "name": "SAROP11-PPRM122", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM122_proc.json b/configuration/pipeline_config/SAROP11-PPRM122_proc.json index cd9a230..c9fe279 100644 --- a/configuration/pipeline_config/SAROP11-PPRM122_proc.json +++ b/configuration/pipeline_config/SAROP11-PPRM122_proc.json @@ -14,6 +14,5 @@ "function": "pprm_simple.py", "mode": "PUSH", "allow_type_changes": false, - "no_client_timeout": 0, - "port": "9012" + "no_client_timeout": 0 } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM122_sp.json b/configuration/pipeline_config/SAROP11-PPRM122_sp.json index 7f62a33..aa178ec 100644 --- a/configuration/pipeline_config/SAROP11-PPRM122_sp.json +++ b/configuration/pipeline_config/SAROP11-PPRM122_sp.json @@ -7,5 +7,9 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SAROP11-PPRM122", - "name": "SAROP11-PPRM122_sp" + "name": "SAROP11-PPRM122_sp", + "Marker": [ + 273, + 279 + ] } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PPRM130.json b/configuration/pipeline_config/SAROP11-PPRM130.json deleted file mode 100644 index 1273e90..0000000 --- a/configuration/pipeline_config/SAROP11-PPRM130.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PPRM130", - "name": "SAROP11-PPRM130", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP11-PSCR106.json b/configuration/pipeline_config/SAROP11-PSCR106.json deleted file mode 100644 index d18d796..0000000 --- a/configuration/pipeline_config/SAROP11-PSCR106.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP11-PSCR106", - "name": "SAROP11-PSCR106", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-ATT01PD_proc.json b/configuration/pipeline_config/SAROP21-ATT01PD_proc.json new file mode 100644 index 0000000..45d1102 --- /dev/null +++ b/configuration/pipeline_config/SAROP21-ATT01PD_proc.json @@ -0,0 +1,45 @@ +{ + "_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-ATT01PD_proc.py", + "device": "SAROP21-ATT01", + "mode": "PUB", + "name": "SAROP21-ATT01PD_proc", + "no_client_timeout": 0, + "processing_threads": 1, + "allow_type_changes": false, + "abort_on_timeout": true, + "abort_on_error": false, + "debug": true, + "block": false, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true, + "stream_timeout": 20, + "pipeline_type": "stream", + "reload": true, + "calib": [ + 0.34, + 0 + ], + "step_length": 150, + "edge_type": "rising", + "refinement": 1, + "buffer_length": 5, + "dark_event": 25, + "fel_on_event": 13, + "use_dark": true, + "filter_window": 50, + "filter": true, + "port": "9003" +} \ 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 9b89fd1..a332619 100644 --- a/configuration/pipeline_config/SAROP21-ATT01_proc.json +++ b/configuration/pipeline_config/SAROP21-ATT01_proc.json @@ -1,4 +1,5 @@ { + "name": "SAROP21-ATT01_proc", "_bsread_address": "", "_bsread_channels": [ "SARES20-CAMS142-M5.processing_parameters", @@ -9,12 +10,10 @@ "input_mode": "PULL", "input_stream2": "tcp://sf-daqsync-14.psi.ch:8011", "input_mode2": "SUB", - "prof_sig": "SARES20-CAMS142-M5.roi_signal_x_profile", + "tt_sig": "SARES20-CAMS142-M5.roi_signal_x_profile", "events": "SAR-CVME-TIFALL5:EvtSet", - "function": "SAROP21-ATT01_Debug_proc.py", - "device": "SAROP21-ATT01", - "mode": "PUB", - "name": "SAROP21-ATT01_proc", + "function": "SAROP21-ATT01_proc.py", + "mode": "PUSH", "no_client_timeout": 0, "processing_threads": 1, "allow_type_changes": false, @@ -28,18 +27,25 @@ "stream_timeout": 20, "pipeline_type": "stream", "reload": true, - "calib": [ - 0.34, - 0 + "dark_buffer_length": 3, + "calibration": [ + -6.12272004e-19, + -5.59406908e-16, + 1.47168639e-12 ], - "step_length": 150, - "edge_type": "rising", - "refinement": 1, - "buffer_length": 5, - "dark_event": 25, - "fel_on_event": 13, - "use_dark": true, - "filter_window": 50, - "filter": true, + "roi": [ + 600, + 1600 + ], + "dpx_poly": 50, + "sigma_px": 30, + "reflen": 300, + "window": false, + "is_laser_delayed": 1, + "is_laser_dark": 0, + "is_fel_dark": 0, + "event_code_laser_delayed": 25, + "event_code_laser_dark": 25, + "event_code_fel_dark": 201, "port": "9003" } \ 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 7d26519..0f53b48 100644 --- a/configuration/pipeline_config/SAROP21-PBPS103_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS103_proc.json @@ -10,19 +10,19 @@ "check_timestamp": true, "stream_timeout": 20, "queue_length": 5000, - "down_calib": 3.4835311189408505e-05, + "down_calib": 2.3055227044187093e-05, "xpos_odd_w_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-W", "ypos_all_y_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-Y", "ypos_all_w_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-W", "name": "SAROP21-PBPS103_proc", - "vert_calib": -4.274751754743584, + "vert_calib": -3.5699946932617297, "bsread_address": "", "right": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD3", "ypos_dif_w_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-W", "ypos_odd_x_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-X", "function": "pbps_full", "port": "9009", - "left_calib": 2.675102584833923e-05, + "left_calib": 1.237263363483627e-05, "down": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD2", "ypos_odd_w_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-W", "xpos_odd_y_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-Y", @@ -32,7 +32,7 @@ "ypos_evn_x_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-X", "uJ_calib": 605.9512700123181, "xpos_evn_m_pvname": "SAROP21-PBPS103:XPOS-EVN-HIST-M", - "horiz_calib": -4.169194856027137, + "horiz_calib": -4.624077177319615, "ypos_all_m_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-M", "ypos_dif_m_pvname": "SAROP21-PBPS103:YPOS-DIF-HIST-M", "bsread_channels": [ @@ -45,7 +45,7 @@ "ypos_evn_w_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-W", "pipeline_type": "stream", "ypos_all_x_pvname": "SAROP21-PBPS103:YPOS-ALL-HIST-X", - "right_calib": 2.9397218270582815e-05, + "right_calib": 1.3543960336349628e-05, "xpos_all_m_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-M", "xpos_odd_m_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-M", "left": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD0", @@ -58,7 +58,7 @@ "ypos_evn_y_pvname": "SAROP21-PBPS103:YPOS-EVN-HIST-Y", "xpos_odd_x_pvname": "SAROP21-PBPS103:XPOS-ODD-HIST-X", "threshold": 0, - "up_calib": 3.3449416187269636e-05, + "up_calib": 2.2192261682627932e-05, "ypos_odd_m_pvname": "SAROP21-PBPS103:YPOS-ODD-HIST-M", "xpos_all_x_pvname": "SAROP21-PBPS103:XPOS-ALL-HIST-X", "up": "SAROP21-PBPS103:Lnk9Ch0-PP_VAL_PD1", @@ -69,9 +69,9 @@ 0.3 ], "calib_x_norm": [ - 0.07245932647710113, - 0.0007428687559548202, - -0.07145335228211266 + 0.06504198929916899, + -0.00037671649680802346, + -0.06471363046922664 ], "calib_y_range": [ -0.3, @@ -79,19 +79,19 @@ 0.3 ], "calib_y_norm": [ - 0.07007885951195195, - -0.0010627512529587204, - -0.07028016819865021 + 0.09620221498791068, + 0.000914249037389552, + -0.07186526173200826 ], "calib_x_norm_std": [ - 0.3632906840285803, - 0.37199608189851374, - 0.36472905401015154 + 0.4319501839823468, + 0.42966366546873425, + 0.41432126450008017 ], "calib_y_norm_std": [ - 0.36804911447877003, - 0.37121251645629766, - 0.3832529355274168 + 0.4006992795066666, + 0.4175763601110324, + 0.4152970398611305 ], - "calib_datetime": "2024-03-19 08:19:24" + "calib_datetime": "2024-12-14 13:35:42" } \ 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 9f3ea78..c4ed61b 100644 --- a/configuration/pipeline_config/SAROP21-PBPS133_proc.json +++ b/configuration/pipeline_config/SAROP21-PBPS133_proc.json @@ -27,12 +27,12 @@ "down": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP21-PBPS133:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 3.657138309752593e-05, - "down_calib": 3.293884021553069e-05, - "left_calib": 3.042136017551908e-05, - "right_calib": 2.8269491022514274e-05, - "horiz_calib": -4.074132313053707, - "vert_calib": -4.15236780000663, + "up_calib": 2.5511380728988724e-05, + "down_calib": 2.4791995160602545e-05, + "left_calib": 1.5370123013857334e-05, + "right_calib": 1.5193702076784592e-05, + "horiz_calib": -4.534843553081889, + "vert_calib": -4.3269603212535435, "uJ_calib": 605.4608924473305, "threshold": 0, "queue_length": 3000, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.07320782521087467, - -2.2837453370357456e-05, - -0.07406279682503034 + 0.06724539939843528, + -9.569664259961293e-05, + -0.06506346483840013 ], "calib_x_norm_std": [ - 0.3744271614022286, - 0.37691342574470016, - 0.3769866399661188 + 0.46024145897167273, + 0.4418347310145162, + 0.45393690003400955 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.07263224590877575, - -0.0001412986075444677, - -0.07186362461575774 + 0.06955128194983921, + -1.5093161113802529e-05, + -0.06911419114286918 ], "calib_y_norm_std": [ - 0.3812013552811797, - 0.3735254424335754, - 0.37966320270546966 + 0.4592781918677793, + 0.4421628788359616, + 0.43842651811133554 ], - "calib_datetime": "2024-03-19 08:17:02" + "calib_datetime": "2024-12-14 13:37:16" } \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PPRM094.json b/configuration/pipeline_config/SAROP21-PPRM094.json deleted file mode 100644 index 96bfbfa..0000000 --- a/configuration/pipeline_config/SAROP21-PPRM094.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "camera_name": "SAROP21-PPRM094", - "name": "SAROP21-PPRM094", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PPRM102.json b/configuration/pipeline_config/SAROP21-PPRM102.json deleted file mode 100644 index ed4af55..0000000 --- a/configuration/pipeline_config/SAROP21-PPRM102.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "camera_name": "SAROP21-PPRM102", - "name": "SAROP21-PPRM102", - "image_background": null, - "image_threshold": 2.0, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.3, - "gfscale": 3.0 - }, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PPRM133.json b/configuration/pipeline_config/SAROP21-PPRM133.json deleted file mode 100644 index fdc6a06..0000000 --- a/configuration/pipeline_config/SAROP21-PPRM133.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "camera_name": "SAROP21-PPRM133", - "name": "SAROP21-PPRM133" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PPRM138.json b/configuration/pipeline_config/SAROP21-PPRM138.json deleted file mode 100644 index 76d7dcf..0000000 --- a/configuration/pipeline_config/SAROP21-PPRM138.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "camera_name": "SAROP21-PPRM138", - "name": "SAROP21-PPRM138" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PPRM146.json b/configuration/pipeline_config/SAROP21-PPRM146.json deleted file mode 100644 index ae388e8..0000000 --- a/configuration/pipeline_config/SAROP21-PPRM146.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "camera_name": "SAROP21-PPRM146", - "name": "SAROP21-PPRM146" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SAROP21-PSCR097.json b/configuration/pipeline_config/SAROP21-PSCR097.json deleted file mode 100644 index eecd54e..0000000 --- a/configuration/pipeline_config/SAROP21-PSCR097.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "camera_name": "SAROP21-PSCR097", - "name": "SAROP21-PSCR097", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.5, - "gfscale": 3.0 - }, - "image_slices": null -} \ 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 0f578e1..c8cf350 100644 --- a/configuration/pipeline_config/SAROP31-PBPS113_proc.json +++ b/configuration/pipeline_config/SAROP31-PBPS113_proc.json @@ -26,12 +26,12 @@ "down": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 3.2162285644477015e-06, - "down_calib": 2.686025186836689e-06, - "left_calib": 7.191318824013413e-06, - "right_calib": 6.221731562645122e-06, - "horiz_calib": -4.622530325295216, - "vert_calib": -6.5680883292690755, + "up_calib": 6.112243180044631e-06, + "down_calib": 6.903488349231238e-06, + "left_calib": 1.4826568879316594e-05, + "right_calib": 1.669499473373086e-05, + "horiz_calib": -3.8546972980109744, + "vert_calib": -9.481130021012225, "uJ_calib": 941.943984588351, "threshold": 0, "queue_length": 300, @@ -70,14 +70,14 @@ 0.3 ], "calib_x_norm": [ - 0.062008583273921745, - 0.000161060880907168, - -0.06779045703019593 + 0.07703441344318415, + 0.0003383787550382122, + -0.07861983217283357 ], "calib_x_norm_std": [ - 0.2947725292676816, - 0.2657684857799833, - 0.32908961232074957 + 0.0391449328058549, + 0.038860745910053576, + 0.038590290050160014 ], "calib_y_range": [ -0.3, @@ -85,14 +85,14 @@ 0.3 ], "calib_y_norm": [ - 0.04492293183928853, - 0.0002115753782590707, - -0.046427849380605714 + 0.02431607522002863, + 0.00022169764088300094, + -0.03896752058239902 ], "calib_y_norm_std": [ - 0.28905204240374804, - 0.27581528169237507, - 0.26272643245531174 + 0.03838679577153944, + 0.03615742902868593, + 0.03935126487068955 ], - "calib_datetime": "2024-03-07 11:03:02" + "calib_datetime": "2024-12-02 20:32:13" } \ 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 aa38edf..2d67a2d 100644 --- a/configuration/pipeline_config/SAROP31-PBPS149_proc.json +++ b/configuration/pipeline_config/SAROP31-PBPS149_proc.json @@ -27,15 +27,15 @@ "down": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD2", "right": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD3", "left": "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD0", - "up_calib": 3.410487286603764e-06, - "down_calib": 2.840098888153543e-06, - "left_calib": 6.792329471232909e-06, - "right_calib": 7.927196626185115e-06, - "horiz_calib": -3.27188419405682, - "vert_calib": -4.659469472017826, + "up_calib": 1.0648333133357636e-06, + "down_calib": 1.1619608846597561e-06, + "left_calib": 5.665196495300968e-07, + "right_calib": 7.619351533936384e-07, + "horiz_calib": -4.407085413339026, + "vert_calib": -4.425074700683255, "uJ_calib": 605.9512700123181, "threshold": 0.0, - "queue_length": 1000, + "queue_length": 300, "xpos_all_x_pvname": "SAROP31-PBPS149:XPOS-ALL-HIST-X", "xpos_all_y_pvname": "SAROP31-PBPS149:XPOS-ALL-HIST-Y", "xpos_all_m_pvname": "SAROP31-PBPS149:XPOS-ALL-HIST-M", @@ -71,14 +71,14 @@ 0.3 ], "calib_x_norm": [ - 0.09706963707150504, - -0.0009696404660613756, - -0.08631093644936216 + 0.06975180407503503, + 0.0024419852169023587, + -0.06639259607295536 ], "calib_x_norm_std": [ - 0.2932014657264347, - 0.3123681599095, - 0.26345958930990315 + 0.02713307608337581, + 0.026948505266373712, + 0.027683485418359032 ], "calib_y_range": [ -0.3, @@ -86,14 +86,14 @@ 0.3 ], "calib_y_norm": [ - 0.061626627664224554, - 0.000313613725527961, - -0.06714339725025664 + 0.07175361981329152, + 4.987914747499697e-05, + -0.06383731154598175 ], "calib_y_norm_std": [ - 0.2812064899750521, - 0.24982882741495327, - 0.3080603890537814 + 0.039556416370008306, + 0.03513687349902875, + 0.03069969838835131 ], - "calib_datetime": "2024-03-07 11:44:42" + "calib_datetime": "2024-12-02 21:02:40" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD01-DSCR050.json b/configuration/pipeline_config/SATBD01-DSCR050.json deleted file mode 100644 index 604b127..0000000 --- a/configuration/pipeline_config/SATBD01-DSCR050.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SATBD01-DSCR050", - "camera_name": "SATBD01-DSCR050", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD01-DSCR110.json b/configuration/pipeline_config/SATBD01-DSCR110.json deleted file mode 100644 index ac76e82..0000000 --- a/configuration/pipeline_config/SATBD01-DSCR110.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SATBD01-DSCR110", - "camera_name": "SATBD01-DSCR110", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD01-SDSCR210_sp.json b/configuration/pipeline_config/SATBD01-SDSCR210_sp.json new file mode 100644 index 0000000..5e84f3a --- /dev/null +++ b/configuration/pipeline_config/SATBD01-SDSCR210_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": "SATBD01-SDSCR210", + "name": "SATBD01-SDSCR210_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD02-DSCR050.json b/configuration/pipeline_config/SATBD02-DSCR050.json deleted file mode 100644 index 3fc139c..0000000 --- a/configuration/pipeline_config/SATBD02-DSCR050.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "SATBD02-DSCR050", - "camera_name": "SATBD02-DSCR050", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.3, - "gfscale": 1.8 - }, - "image_slices": null -} \ 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 595208a..0ac5775 100644 --- a/configuration/pipeline_config/SATBD02-DSCR050_sp.json +++ b/configuration/pipeline_config/SATBD02-DSCR050_sp.json @@ -1,21 +1,21 @@ { "image_background_enable": false, - "image_background": "SATBD02-DSCR050_20230923_150234_114901", + "image_background": "SATBD02-DSCR050_20240515_104756_839117", "image_threshold": null, "image_region_of_interest": [ - 371, - 1428, - 835, - 1077 + 551, + 1346, + 98, + 2051 ], "image_good_region": { - "threshold": 0.1, + "threshold": 0.05, "gfscale": 5.0 }, "image_slices": { - "number_of_slices": 81, - "scale": 3.0, - "orientation": "horizontal" + "number_of_slices": 11, + "scale": 1.0, + "orientation": "vertical" }, "pipeline_type": "processing", "camera_name": "SATBD02-DSCR050", @@ -25,7 +25,7 @@ "port": "9020", "reload": true, "function": "bunch_length_op", - "fw_threshold": 0.1, + "fw_threshold": 0.2, "replace": true, "abort_on_error": false } \ No newline at end of file diff --git a/configuration/pipeline_config/SATBD02-DSCR050_sp_rep.json b/configuration/pipeline_config/SATBD02-DSCR050_sp_rep.json index f765427..4cc68ba 100644 --- a/configuration/pipeline_config/SATBD02-DSCR050_sp_rep.json +++ b/configuration/pipeline_config/SATBD02-DSCR050_sp_rep.json @@ -8,8 +8,8 @@ "block": false, "function": "propagate_stream", "image_slices": { - "scale": 2, - "number_of_slices": 50 + "number_of_slices": 11, + "scale": 2 }, "no_client_timeout": 0, "input_stream": "tcp://sf-daqsync-10.psi.ch:9020" diff --git a/configuration/pipeline_config/SATCL01-DSCR150.json b/configuration/pipeline_config/SATCL01-DSCR150.json deleted file mode 100644 index 66b1ae3..0000000 --- a/configuration/pipeline_config/SATCL01-DSCR150.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SATCL01-DSCR150", - "camera_name": "SATCL01-DSCR150", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES20-HOLO-CAM01_proc.json b/configuration/pipeline_config/SATES20-HOLO-CAM01_proc.json new file mode 100644 index 0000000..6cbce94 --- /dev/null +++ b/configuration/pipeline_config/SATES20-HOLO-CAM01_proc.json @@ -0,0 +1,12 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "cs_test.py", + "camera_name": "SATES20-HOLO-CAM01", + "name": "SATES20-HOLO-CAM01_proc", + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES20-HOLO-CAM01_sp.json b/configuration/pipeline_config/SATES20-HOLO-CAM01_sp.json new file mode 100644 index 0000000..e00ea2d --- /dev/null +++ b/configuration/pipeline_config/SATES20-HOLO-CAM01_sp.json @@ -0,0 +1,12 @@ +{ + "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": "SATES20-HOLO-CAM01", + "name": "SATES20-HOLO-CAM01_sp", + "max_frame_rate": 5.1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json new file mode 100644 index 0000000..20ee0c3 --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM1_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-ADTEST1-CAM1", + "name": "SATES21-ADTEST1-CAM1_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json new file mode 100644 index 0000000..fe39dce --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM2_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-ADTEST1-CAM2", + "name": "SATES21-ADTEST1-CAM2_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json new file mode 100644 index 0000000..2469bb8 --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM3_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-ADTEST1-CAM3", + "name": "SATES21-ADTEST1-CAM3_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json b/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json new file mode 100644 index 0000000..9c7b317 --- /dev/null +++ b/configuration/pipeline_config/SATES21-ADTEST1-CAM4_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-ADTEST1-CAM4", + "name": "SATES21-ADTEST1-CAM4_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAM154-GIGE1_sp.json b/configuration/pipeline_config/SATES21-CAM154-GIGE1_sp.json new file mode 100644 index 0000000..52023d1 --- /dev/null +++ b/configuration/pipeline_config/SATES21-CAM154-GIGE1_sp.json @@ -0,0 +1,11 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "camera_name": "SATES21-CAM154-GIGE1", + "name": "SATES21-CAM154-GIGE1_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json b/configuration/pipeline_config/SATES21-CAMS-PATT1_spec_db.json index 7c3b768..4e6cf4d 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_20240312_091521_136866", + "image_background": "SATES21-CAMS-PATT1_20241106_175709_505906", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -17,19 +17,21 @@ "multiprocessing": false, "no_client_timeout": 0, "port": "9003", - "threshold": 10, "project_axis": 0, "reload": true, "roi_background": [ - 1, - 862, - 1, - 2560 + 7, + 836, + 35, + 2092 ], "roi_signal": [ - 1, - 862, - 1, - 2560 - ] + 7, + 836, + 35, + 2092 + ], + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE11_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE11_sp.json index 8a5947f..b60520b 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE11_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE11_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE11", - "name": "SATES21-CAMS154-GIGE11_sp" + "name": "SATES21-CAMS154-GIGE11_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json index 6e836b0..094abb5 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE6_proc.json @@ -8,7 +8,7 @@ "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE6", "name": "SATES21-CAMS154-GIGE6_proc", - "function": "martin_test.py", + "function": "pprm_simple.py", "mode": "PUSH", "allow_type_changes": false, "block": false, diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE8_sp.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE8_sp.json index 77dbb57..0b8a735 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-GIGE8_sp.json +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE8_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES21-CAMS154-GIGE8", - "name": "SATES21-CAMS154-GIGE8_sp" + "name": "SATES21-CAMS154-GIGE8_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-GIGE9_proc.json b/configuration/pipeline_config/SATES21-CAMS154-GIGE9_proc.json new file mode 100644 index 0000000..c8538b9 --- /dev/null +++ b/configuration/pipeline_config/SATES21-CAMS154-GIGE9_proc.json @@ -0,0 +1,9 @@ +{ + "pipeline_type": "processing", + "camera_name": "SATES21-CAMS154-GIGE9", + "name": "SATES21-CAMS154-GIGE9_proc", + "function": "pprm_simple.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json b/configuration/pipeline_config/SATES21-CAMS154-M1_spec_db.json index cbcf26f..9dc1810 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_20231213_092922_535843", + "image_background": "SATES21-CAMS154-M1_20241020_145222_846372", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -14,18 +14,21 @@ "processing_threads": 4, "thread_buffer_size": 30, "project_axis": 0, - "threshold": 5, + "threshold": 10, "roi_background": [ - 1, - 602, - 1, - 1420 + 0, + 884, + 0, + 2463 ], "roi_signal": [ - 1, - 602, - 1, - 1420 + 0, + 884, + 0, + 2463 ], - "reload": true + "reload": true, + "enforce_pid": true, + "enforce_timestamp": true, + "check_timestamp": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES21-CAMS154-M2_proc.json b/configuration/pipeline_config/SATES21-CAMS154-M2_proc.json index f80b9c6..0e81573 100644 --- a/configuration/pipeline_config/SATES21-CAMS154-M2_proc.json +++ b/configuration/pipeline_config/SATES21-CAMS154-M2_proc.json @@ -5,8 +5,10 @@ "image_region_of_interest": null, "image_good_region": null, "image_slices": null, - "pipeline_type": "cs_test.py", - "camera_name": "SATES21-CAMS154-PATT1", + "mode": "PUSH", + "pipeline_type": "processing", + "function": "profiles.py", + "camera_name": "SATES21-CAMS154-M2", "name": "SATES21-CAMS154-M2_proc", "reload": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json b/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json index f515c5e..fe86a73 100644 --- a/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json +++ b/configuration/pipeline_config/SATES24-CAMS161-M1_spec_db.json @@ -1,6 +1,6 @@ { "image_background_enable": "passive", - "image_background": "SATES24-CAMS161-M1_20231006_125934_629095", + "image_background": "SATES24-CAMS161-M1_20241129_124611_561516", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -12,20 +12,20 @@ "mode": "PUSH", "allow_type_changes": false, "roi_signal": [ - 91, - 834, - 173, - 1557 + 223, + 1249, + 243, + 1274 ], "processing_threads": 4, "thread_buffer_size": 30, - "project_axis": 0, + "project_axis": 1, "threshold": 10, "roi_background": [ - 91, - 834, - 173, - 1557 + 223, + 1249, + 243, + 1274 ], "reload": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-CAMS182-GIGE1_sp.json b/configuration/pipeline_config/SATES30-CAMS182-GIGE1_sp.json index d2079bd..d53a605 100644 --- a/configuration/pipeline_config/SATES30-CAMS182-GIGE1_sp.json +++ b/configuration/pipeline_config/SATES30-CAMS182-GIGE1_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES30-CAMS182-GIGE1", - "name": "SATES30-CAMS182-GIGE1_sp" + "name": "SATES30-CAMS182-GIGE1_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-CAMS182-GIGE2_sp.json b/configuration/pipeline_config/SATES30-CAMS182-GIGE2_sp.json index b16eacd..6ed74bd 100644 --- a/configuration/pipeline_config/SATES30-CAMS182-GIGE2_sp.json +++ b/configuration/pipeline_config/SATES30-CAMS182-GIGE2_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES30-CAMS182-GIGE2", - "name": "SATES30-CAMS182-GIGE2_sp" + "name": "SATES30-CAMS182-GIGE2_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-CAMS182-GIGE3_sp.json b/configuration/pipeline_config/SATES30-CAMS182-GIGE3_sp.json index db05c3d..d0db13f 100644 --- a/configuration/pipeline_config/SATES30-CAMS182-GIGE3_sp.json +++ b/configuration/pipeline_config/SATES30-CAMS182-GIGE3_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES30-CAMS182-GIGE3", - "name": "SATES30-CAMS182-GIGE3_sp" + "name": "SATES30-CAMS182-GIGE3_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-CAMS182-GIGE4_sp.json b/configuration/pipeline_config/SATES30-CAMS182-GIGE4_sp.json index 33b525f..80f9e0a 100644 --- a/configuration/pipeline_config/SATES30-CAMS182-GIGE4_sp.json +++ b/configuration/pipeline_config/SATES30-CAMS182-GIGE4_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SATES30-CAMS182-GIGE4", - "name": "SATES30-CAMS182-GIGE4_sp" + "name": "SATES30-CAMS182-GIGE4_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-CAMS182-GIGE5_sp.json b/configuration/pipeline_config/SATES30-CAMS182-GIGE5_sp.json new file mode 100644 index 0000000..e24aa92 --- /dev/null +++ b/configuration/pipeline_config/SATES30-CAMS182-GIGE5_sp.json @@ -0,0 +1,12 @@ +{ + "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": "SATES30-CAMS182-GIGE5", + "name": "SATES30-CAMS182-GIGE5_sp", + "max_frame_rate": 5.1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json b/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json index d1d8c57..422a269 100644 --- a/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json +++ b/configuration/pipeline_config/SATES30-RIXS-CAM01_proc.json @@ -1,6 +1,6 @@ { "image_background_enable": true, - "image_background": "SATES30-RIXS-CAM01_20240130_153206_238813", + "image_background": "SATES30-RIXS-CAM01_20241214_181504_911351", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -12,7 +12,7 @@ "mode": "PUB", "allow_type_changes": false, "block": false, - "threshold": 60.0, + "threshold": 120.0, "threshold_file": "", "_max_frame_rate": 5.1, "libs": "", diff --git a/configuration/pipeline_config/SATES30-RIXS-CAM01_sp.json b/configuration/pipeline_config/SATES30-RIXS-CAM01_sp.json index e92dde6..77e0d27 100644 --- a/configuration/pipeline_config/SATES30-RIXS-CAM01_sp.json +++ b/configuration/pipeline_config/SATES30-RIXS-CAM01_sp.json @@ -9,6 +9,6 @@ "camera_name": "SATES30-RIXS-CAM01", "name": "SATES30-RIXS-CAM01_sp", "max_frame_rate": 10.1, - "late_averaging": 1, + "late_averaging": 100, "function": "late_averaging.py" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json index 1379fb4..d1f5eb4 100644 --- a/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json +++ b/configuration/pipeline_config/SATES31-CAMS187-RIXS1_sp.json @@ -1,8 +1,13 @@ { "image_background_enable": false, - "image_background": "SATES31-CAMS187-RIXS1_20231024_235607_038268", + "image_background": "SATES31-CAMS187-RIXS1_20240529_115656_199325", "image_threshold": null, - "image_region_of_interest": null, + "image_region_of_interest": [ + 712, + 1438, + 304, + 62 + ], "image_good_region": null, "image_slices": null, "pipeline_type": "processing", diff --git a/configuration/pipeline_config/SATMA01-DSCR030.json b/configuration/pipeline_config/SATMA01-DSCR030.json deleted file mode 100644 index 747acb6..0000000 --- a/configuration/pipeline_config/SATMA01-DSCR030.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "SATMA01-DSCR030", - "camera_name": "SATMA01-DSCR030", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.3, - "gfscale": 1.8 - }, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP11-PSAS079_psas.json b/configuration/pipeline_config/SATOP11-PSAS079_psas.json index ee8391c..02827b6 100644 --- a/configuration/pipeline_config/SATOP11-PSAS079_psas.json +++ b/configuration/pipeline_config/SATOP11-PSAS079_psas.json @@ -1,6 +1,6 @@ { - "image_background_enable": true, - "image_background": "SATOP11-PSAS079_20240228_185208_689441", + "image_background_enable": false, + "image_background": "SATOP11-PSAS079_20241208_143639_046414", "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 b7552ba..b90faac 100644 --- a/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json +++ b/configuration/pipeline_config/SATOP21-PMOS127-2D_pmos.json @@ -1,14 +1,16 @@ { - "image_background_enable": true, - "image_background": "SATOP21-PMOS127-2D_20230503_074443_285170", + "image_background_enable": false, + "image_background": "SATOP21-PMOS127-2D_20240517_090650_703956", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "camera_name": "SATOP21-PMOS127-2D", + "camera_name": "SATOP21-PMOS127B-2D", + "e_axis": "SATOP21-PMOS127-2D:SPECTRUM_X", + "int_axis": "SATOP21-PMOS127-2D:SPECTRUM_Y", "name": "SATOP21-PMOS127-2D_pmos", - "function": "pmos132-2D.py", + "function": "pmos127B-2D.py", "mode": "PUSH", "allow_type_changes": false, "no_client_timeout": 0, diff --git a/configuration/pipeline_config/SATOP21-PMOS127_sp.json b/configuration/pipeline_config/SATOP21-PMOS127_sp.json new file mode 100644 index 0000000..bbfd66b --- /dev/null +++ b/configuration/pipeline_config/SATOP21-PMOS127_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": "SATOP21-PMOS127", + "name": "SATOP21-PMOS127_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json b/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json index a5f56ab..8f3f9ce 100644 --- a/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json +++ b/configuration/pipeline_config/SATOP31-PMOS132-2D_pmos.json @@ -1,6 +1,6 @@ { "image_background_enable": true, - "image_background": "SATOP31-PMOS132-2D_20240228_204901_018928", + "image_background": "SATOP31-PMOS132-2D_20241128_153410_104874", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -16,6 +16,6 @@ "processing_threads": 6, "thread_buffer_size": 30, "abort_on_error": false, - "pixel_bkg": 1, + "pixel_bkg": 2, "port": "9001" } \ No newline at end of file diff --git a/configuration/pipeline_config/SATSY02-DSCR220.json b/configuration/pipeline_config/SATSY02-DSCR220.json deleted file mode 100644 index e07a286..0000000 --- a/configuration/pipeline_config/SATSY02-DSCR220.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SATSY02-DSCR220", - "camera_name": "SATSY02-DSCR220", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINBC01-DSCR040.json b/configuration/pipeline_config/SINBC01-DSCR040.json deleted file mode 100644 index 08b48d1..0000000 --- a/configuration/pipeline_config/SINBC01-DSCR040.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "SINBC01-DSCR040", - "camera_name": "SINBC01-DSCR040", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 442, - 269, - 450, - 299 - ], - "image_good_region": null, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINBC01-DSCR040_sp.json b/configuration/pipeline_config/SINBC01-DSCR040_sp.json index a0691e6..5a8ebaa 100644 --- a/configuration/pipeline_config/SINBC01-DSCR040_sp.json +++ b/configuration/pipeline_config/SINBC01-DSCR040_sp.json @@ -5,6 +5,7 @@ "image_region_of_interest": null, "image_good_region": null, "image_slices": null, + "pipeline_type": "processing", "camera_name": "SINBC01-DSCR040", "name": "SINBC01-DSCR040_sp" } \ No newline at end of file diff --git a/configuration/pipeline_config/SINBC02-DSCR220.json b/configuration/pipeline_config/SINBC02-DSCR220.json deleted file mode 100644 index 2c140f0..0000000 --- a/configuration/pipeline_config/SINBC02-DSCR220.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINBC02-DSCR220", - "camera_name": "SINBC02-DSCR220", - "image_background": "SINBC02-DSCR220", - "image_threshold": null, - "image_region_of_interest": [ - 582, - 99, - 538, - 80 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINBC02-DSRM310.json b/configuration/pipeline_config/SINBC02-DSRM310.json deleted file mode 100644 index 2e2963b..0000000 --- a/configuration/pipeline_config/SINBC02-DSRM310.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINBC02-DSRM310", - "camera_name": "SINBC02-DSRM310", - "image_background": "SINBC02-DSRM310", - "image_threshold": null, - "image_region_of_interest": [ - 877, - 848, - 878, - 371 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINBD01-DSCR010.json b/configuration/pipeline_config/SINBD01-DSCR010.json deleted file mode 100644 index d2a125c..0000000 --- a/configuration/pipeline_config/SINBD01-DSCR010.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "SINBD01-DSCR010", - "camera_name": "SINBD01-DSCR010", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": { - "threshold": 0.5, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINDI01-DSCR080.json b/configuration/pipeline_config/SINDI01-DSCR080.json deleted file mode 100644 index 30d63ef..0000000 --- a/configuration/pipeline_config/SINDI01-DSCR080.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "SINDI01-DSCR080", - "camera_name": "SINDI01-DSCR080", - "image_background": "SINDI01-DSCR080", - "image_threshold": null, - "image_region_of_interest": [ - 441, - 273, - 441, - 313 - ], - "image_good_region": { - "threshold": 0.3, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINDI02-DLAC055.json b/configuration/pipeline_config/SINDI02-DLAC055.json deleted file mode 100644 index ab5b0b2..0000000 --- a/configuration/pipeline_config/SINDI02-DLAC055.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINDI02-DLAC055", - "camera_name": "SINDI02-DLAC055", - "image_background": "SINDI02-DLAC055", - "image_threshold": null, - "image_region_of_interest": [ - 449, - 435, - 306, - 376 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINEG01-DSCR190.json b/configuration/pipeline_config/SINEG01-DSCR190.json deleted file mode 100644 index 868791f..0000000 --- a/configuration/pipeline_config/SINEG01-DSCR190.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "SINEG01-DSCR190", - "camera_name": "SINEG01-DSCR190", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 215, - 810, - 215, - 727 - ], - "image_good_region": null, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINEG01-DSCR350.json b/configuration/pipeline_config/SINEG01-DSCR350.json deleted file mode 100644 index 4ef1f41..0000000 --- a/configuration/pipeline_config/SINEG01-DSCR350.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "SINEG01-DSCR350", - "camera_name": "SINEG01-DSCR350", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 425, - 652, - 582, - 703 - ], - "image_good_region": { - "threshold": 0.30000000000000004, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINLH01-DSCR080.json b/configuration/pipeline_config/SINLH01-DSCR080.json deleted file mode 100644 index 4686c75..0000000 --- a/configuration/pipeline_config/SINLH01-DSCR080.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINLH01-DSCR080", - "camera_name": "SINLH01-DSCR080", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 437, - 335, - 490, - 275 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINLH02-DSCR220.json b/configuration/pipeline_config/SINLH02-DSCR220.json deleted file mode 100644 index f9ed849..0000000 --- a/configuration/pipeline_config/SINLH02-DSCR220.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINLH02-DSCR220", - "camera_name": "SINLH02-DSCR220", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 258, - 63, - 269, - 57 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINLH02-DSCR250.json b/configuration/pipeline_config/SINLH02-DSCR250.json deleted file mode 100644 index 0a64525..0000000 --- a/configuration/pipeline_config/SINLH02-DSCR250.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINLH02-DSCR250", - "camera_name": "SINLH02-DSCR250", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 261, - 63, - 292, - 59 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINLH03-DSCR070.json b/configuration/pipeline_config/SINLH03-DSCR070.json deleted file mode 100644 index 8b7c19e..0000000 --- a/configuration/pipeline_config/SINLH03-DSCR070.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SINLH03-DSCR070", - "camera_name": "SINLH03-DSCR070", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 550, - 300, - 477, - 309 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SINSB03-DSCR110.json b/configuration/pipeline_config/SINSB03-DSCR110.json deleted file mode 100644 index 2067449..0000000 --- a/configuration/pipeline_config/SINSB03-DSCR110.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "SINSB03-DSCR110", - "camera_name": "SINSB03-DSCR110", - "image_background": "SINSB03-DSCR110", - "image_threshold": null, - "image_region_of_interest": [ - 688, - 545, - 771, - 673 - ], - "image_good_region": { - "threshold": 0.30000000000000004, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR02-LPMO02-C322_sp.json b/configuration/pipeline_config/SLAAR02-LPMO02-C322_sp.json new file mode 100644 index 0000000..07ca018 --- /dev/null +++ b/configuration/pipeline_config/SLAAR02-LPMO02-C322_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": "SLAAR02-LPMO02-C322", + "name": "SLAAR02-LPMO02-C322_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR12-LSPC-SPEC1_sp.json b/configuration/pipeline_config/SLAAR12-LSPC-SPEC1_sp.json new file mode 100644 index 0000000..c8ecdbd --- /dev/null +++ b/configuration/pipeline_config/SLAAR12-LSPC-SPEC1_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": "SLAAR12-LSPC-SPEC1", + "name": "SLAAR12-LSPC-SPEC1_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C563_ep_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C563_ep_sp.json new file mode 100644 index 0000000..2530ed0 --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-C563_ep_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-C563_ep", + "name": "SLAAR21-LCAM-C563_ep_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C563_epics_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C563_epics_sp.json new file mode 100644 index 0000000..e541b49 --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-C563_epics_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-C563_epics", + "name": "SLAAR21-LCAM-C563_epics_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLAAR21-LCAM-C563_sp.json b/configuration/pipeline_config/SLAAR21-LCAM-C563_sp.json new file mode 100644 index 0000000..0ba66af --- /dev/null +++ b/configuration/pipeline_config/SLAAR21-LCAM-C563_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-C563", + "name": "SLAAR21-LCAM-C563_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C011.json b/configuration/pipeline_config/SLG-LCAM-C011.json deleted file mode 100644 index ee2df0a..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C011.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C011", - "camera_name": "SLG-LCAM-C011", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C012.json b/configuration/pipeline_config/SLG-LCAM-C012.json deleted file mode 100644 index bf31b3e..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C012.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C012", - "camera_name": "SLG-LCAM-C012", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C013.json b/configuration/pipeline_config/SLG-LCAM-C013.json deleted file mode 100644 index 915038c..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C013.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C013", - "camera_name": "SLG-LCAM-C013", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C021.json b/configuration/pipeline_config/SLG-LCAM-C021.json deleted file mode 100644 index 978497b..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C021.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C021", - "camera_name": "SLG-LCAM-C021", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C031.json b/configuration/pipeline_config/SLG-LCAM-C031.json deleted file mode 100644 index 1164503..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C031.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C031", - "camera_name": "SLG-LCAM-C031", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C032.json b/configuration/pipeline_config/SLG-LCAM-C032.json deleted file mode 100644 index b124fac..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C032.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C032", - "camera_name": "SLG-LCAM-C032", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C041.json b/configuration/pipeline_config/SLG-LCAM-C041.json deleted file mode 100644 index 1c061f5..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C041.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "SLG-LCAM-C041", - "camera_name": "SLG-LCAM-C041", - "image_background": "SLG-LCAM-C041", - "image_threshold": null, - "image_region_of_interest": [ - 976, - 0, - 368, - 0 - ], - "image_good_region": { - "threshold": 0.3, - "gfscale": 3.0 - }, - "image_slices": { - "scale": 2.0, - "number_of_slices": 11 - } -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C042.json b/configuration/pipeline_config/SLG-LCAM-C042.json deleted file mode 100644 index 9193810..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C042.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C042", - "camera_name": "SLG-LCAM-C042", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C044.json b/configuration/pipeline_config/SLG-LCAM-C044.json deleted file mode 100644 index cb80902..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C044.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C044", - "camera_name": "SLG-LCAM-C044", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C051.json b/configuration/pipeline_config/SLG-LCAM-C051.json deleted file mode 100644 index a7517e1..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C051.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C051", - "camera_name": "SLG-LCAM-C051" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C052.json b/configuration/pipeline_config/SLG-LCAM-C052.json deleted file mode 100644 index b2eae0e..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C052.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C052", - "camera_name": "SLG-LCAM-C052" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C061.json b/configuration/pipeline_config/SLG-LCAM-C061.json deleted file mode 100644 index f712acf..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C061.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SLG-LCAM-C061", - "camera_name": "SLG-LCAM-C061", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 258, - 184, - 188, - 289 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C062.json b/configuration/pipeline_config/SLG-LCAM-C062.json deleted file mode 100644 index 24ceff3..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C062.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C062", - "camera_name": "SLG-LCAM-C062" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C063.json b/configuration/pipeline_config/SLG-LCAM-C063.json deleted file mode 100644 index 90134e2..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C063.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C063", - "camera_name": "SLG-LCAM-C063" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C071_proc.json b/configuration/pipeline_config/SLG-LCAM-C071_proc.json new file mode 100644 index 0000000..7373e81 --- /dev/null +++ b/configuration/pipeline_config/SLG-LCAM-C071_proc.json @@ -0,0 +1,16 @@ +{ + "image_background_enable": false, + "image_background": null, + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SLG-LCAM-C071_proc", + "camera_name": "SLG-LCAM-C071", + "function": "laser_gauss_fit.py", + "mode": "PUSH", + "allow_type_changes": false, + "block": false, + "reload": true +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C071_sp.json b/configuration/pipeline_config/SLG-LCAM-C071_sp.json index b4679fa..9847ea3 100644 --- a/configuration/pipeline_config/SLG-LCAM-C071_sp.json +++ b/configuration/pipeline_config/SLG-LCAM-C071_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "SLG-LCAM-C071", - "name": "SLG-LCAM-C071_sp" + "name": "SLG-LCAM-C071_sp", + "max_frame_rate": 5.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C081.json b/configuration/pipeline_config/SLG-LCAM-C081.json deleted file mode 100644 index 9b6679f..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C081.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C081", - "camera_name": "SLG-LCAM-C081" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C082.json b/configuration/pipeline_config/SLG-LCAM-C082.json deleted file mode 100644 index 3de56a1..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C082.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C082", - "camera_name": "SLG-LCAM-C082" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C083.json b/configuration/pipeline_config/SLG-LCAM-C083.json deleted file mode 100644 index 9230c41..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C083.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-C083", - "camera_name": "SLG-LCAM-C083" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C091.json b/configuration/pipeline_config/SLG-LCAM-C091.json deleted file mode 100644 index 7b4bb6b..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C091.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C091", - "camera_name": "SLG-LCAM-C091", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C092.json b/configuration/pipeline_config/SLG-LCAM-C092.json deleted file mode 100644 index 2016534..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C092.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-C092", - "camera_name": "SLG-LCAM-C092", - "image_background": "SLG-LCAM-C092", - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C103.json b/configuration/pipeline_config/SLG-LCAM-C103.json deleted file mode 100644 index 1720a8c..0000000 --- a/configuration/pipeline_config/SLG-LCAM-C103.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "SLG-LCAM-C103", - "camera_name": "SLG-LCAM-C103", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": [ - 786, - 184, - 358, - 198 - ], - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C103_proc.json b/configuration/pipeline_config/SLG-LCAM-C103_proc.json index fe59104..e94a591 100644 --- a/configuration/pipeline_config/SLG-LCAM-C103_proc.json +++ b/configuration/pipeline_config/SLG-LCAM-C103_proc.json @@ -1,6 +1,6 @@ { - "image_background_enable": "passive", - "image_background": "SLG-LCAM-C103_20230628_140541_204733", + "_image_background_enable": "passive", + "_image_background": "SLG-LCAM-C103_20230628_140541_204733", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -11,5 +11,6 @@ "function": "pprm_ccd_offset.py", "mode": "PUSH", "allow_type_changes": false, + "block": false, "reload": true } \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C111_proc.json b/configuration/pipeline_config/SLG-LCAM-C111_proc.json new file mode 100644 index 0000000..12db9ec --- /dev/null +++ b/configuration/pipeline_config/SLG-LCAM-C111_proc.json @@ -0,0 +1,16 @@ +{ + "_image_background_enable": "passive", + "_image_background": "", + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "name": "SLG-LCAM-C111_proc", + "camera_name": "SLG-LCAM-C111", + "function": "pprm_ccd_offset.py", + "mode": "PUSH", + "allow_type_changes": false, + "reload": true, + "block": false +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C111_sp.json b/configuration/pipeline_config/SLG-LCAM-C111_sp.json new file mode 100644 index 0000000..3007df7 --- /dev/null +++ b/configuration/pipeline_config/SLG-LCAM-C111_sp.json @@ -0,0 +1,12 @@ +{ + "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": "SLG-LCAM-C111", + "name": "SLG-LCAM-C111_sp", + "max_frame_rate": 5.1 +} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L101.json b/configuration/pipeline_config/SLG-LCAM-L101.json deleted file mode 100644 index d218595..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L101.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L101", - "camera_name": "SLG-LCAM-L101" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L102.json b/configuration/pipeline_config/SLG-LCAM-L102.json deleted file mode 100644 index 6ab2cc2..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L102.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L102", - "camera_name": "SLG-LCAM-L102" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L103.json b/configuration/pipeline_config/SLG-LCAM-L103.json deleted file mode 100644 index 33c11aa..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L103.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-L103", - "camera_name": "SLG-LCAM-L103", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L104.json b/configuration/pipeline_config/SLG-LCAM-L104.json deleted file mode 100644 index fd31eb9..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L104.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L104", - "camera_name": "SLG-LCAM-L104" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L121.json b/configuration/pipeline_config/SLG-LCAM-L121.json deleted file mode 100644 index cca5596..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L121.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L121", - "camera_name": "SLG-LCAM-L121" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L122.json b/configuration/pipeline_config/SLG-LCAM-L122.json deleted file mode 100644 index f07cd58..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L122.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L122", - "camera_name": "SLG-LCAM-L122" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L123.json b/configuration/pipeline_config/SLG-LCAM-L123.json deleted file mode 100644 index b3b16c1..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L123.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L123", - "camera_name": "SLG-LCAM-L123" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L124.json b/configuration/pipeline_config/SLG-LCAM-L124.json deleted file mode 100644 index 4ef9504..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L124.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L124", - "camera_name": "SLG-LCAM-L124" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L131.json b/configuration/pipeline_config/SLG-LCAM-L131.json deleted file mode 100644 index eda50e2..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L131.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "SLG-LCAM-L131", - "camera_name": "SLG-LCAM-L131" -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-L141.json b/configuration/pipeline_config/SLG-LCAM-L141.json deleted file mode 100644 index 5b6dd2e..0000000 --- a/configuration/pipeline_config/SLG-LCAM-L141.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "SLG-LCAM-L141", - "camera_name": "SLG-LCAM-L141", - "image_background": null, - "image_threshold": null, - "image_region_of_interest": null, - "image_good_region": null, - "image_slices": null -} \ No newline at end of file diff --git a/configuration/pipeline_config/SLG-LCAM-C041test.json b/configuration/pipeline_config/alain_1MP_sp.json similarity index 77% rename from configuration/pipeline_config/SLG-LCAM-C041test.json rename to configuration/pipeline_config/alain_1MP_sp.json index 6c70343..ba4d063 100644 --- a/configuration/pipeline_config/SLG-LCAM-C041test.json +++ b/configuration/pipeline_config/alain_1MP_sp.json @@ -6,6 +6,6 @@ "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "camera_name": "SLG-LCAM-C041", - "name": "SLG-LCAM-C041test" + "camera_name": "alain_1MP", + "name": "alain_1MP_sp" } \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index ee67c34..5714b51 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -1,21 +1,29 @@ { + "#Bernina_tt_kb_restart_cam": "Bernina_tt_kb_restart_cam", "#S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles", "#SARES11-SPEC125-M1_test": "SARES11-SPEC125-M1_test", "#SARES11-SPEC125-M3_sp": "SARES11-SPEC125-M3_sp", "#SARES11-SPEC125-M3_spec_db": "SARES11-SPEC125-M3_spec_db", "#SARES11-XMI125-C4P1_db": "SARES11-XMI125-C4P1_db", + "#SARES11-XMI125-C4P1_xy_db": "SARES11-XMI125-C4P1_xy_db", "#SARES12-CAMS128-M1_psen_db": "SARES12-CAMS128-M1_psen_db", "#SARES20-CAMS142-M1_psen_db": "SARES20-CAMS142-M1_psen_db", + "#SARES30-CAMS156-SMX-OAV_db": "SARES30-CAMS156-SMX-OAV_db", "#SARFE10-PSSS059_psss_avg": "SARFE10-PSSS059_psss_avg", "#SARFE10-PSSS059_store": "SARFE10-PSSS059_store", "#SAROP11-ATT01_proc": "SAROP11-ATT01_proc", + "#SAROP11-PPRM122_proc": "SAROP11-PPRM122_proc", + "#SAROP11-PPRM122_sp": "SAROP11-PPRM122_sp", + "#SAROP21-ATT01PD_proc": "SAROP21-ATT01PD_proc", "#SAROP21-PPRM102_proc": "SAROP21-PPRM102_proc", + "#SAROP31-PPRM113_proc": "SAROP31-PPRM113_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,7 +39,9 @@ "#test_proc_with_bs": "test_proc_with_bs", "#test_str": "test_str", "#test_stream": "test_stream", + "#test_tadej": "test_tadej", "#testdb_ib": "testdb_ib", + "Bernina_tt_kb_populate_pvs": "Bernina_tt_kb_populate_pvs", "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles", "SARBD01-DSCR110_sp1": "SARBD01-DSCR110_sp_rep", "SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles", @@ -45,7 +55,6 @@ "SARES20-PROF141-M1_proc": "SARES20-PROF141-M1_proc", "SARES20-PROF142-M1_proc": "SARES20-PROF142-M1_proc", "SARES21-PBPS141_proc": "SARES21-PBPS141_proc", - "SARES30-CAMS156-SMX-OAV_db": "SARES30-CAMS156-SMX-OAV_db", "SARES30-CAMS156-XE_proc": "SARES30-CAMS156-XE_proc", "SARFE10-PBPS053_proc": "SARFE10-PBPS053_proc", "SARFE10-PPRM064_proc": "SARFE10-PPRM064_proc", @@ -54,7 +63,7 @@ "SARFE10-PSSS059_sp_br": "SARFE10-PSSS059_sp_br", "SAROP11-PBPS110_proc": "SAROP11-PBPS110_proc", "SAROP11-PBPS122_proc": "SAROP11-PBPS122_proc", - "SAROP11-PPRM122_proc": "SAROP11-PPRM122_proc", + "SAROP11-PPRM110_proc": "SAROP11-PPRM110_proc", "SAROP21-ATT01_proc": "SAROP21-ATT01_proc", "SAROP21-PBPS103_proc": "SAROP21-PBPS103_proc", "SAROP21-PBPS133_proc": "SAROP21-PBPS133_proc", @@ -63,13 +72,17 @@ "SAROP21-PPRM138_proc": "SAROP21-PPRM138_proc", "SAROP31-PBPS113_proc": "SAROP31-PBPS113_proc", "SAROP31-PBPS149_proc": "SAROP31-PBPS149_proc", - "SAROP31-PPRM113_proc": "SAROP31-PPRM113_proc", "SAROP31-PPRM150_proc": "SAROP31-PPRM150_proc", "SATBD02-DSCR050_sp": "SATBD02-DSCR050_sp", "SATBD02-DSCR050_sp1": "SATBD02-DSCR050_sp_rep", + "SATES21-ADTEST1-CAM1_sp": "SATES21-ADTEST1-CAM1_sp", + "SATES21-ADTEST1-CAM2_sp": "SATES21-ADTEST1-CAM2_sp", + "SATES21-ADTEST1-CAM3_sp": "SATES21-ADTEST1-CAM3_sp", + "SATES21-ADTEST1-CAM4_sp": "SATES21-ADTEST1-CAM4_sp", "SATES21-CAMS-PATT1_spec_db": "SATES21-CAMS-PATT1_spec_db", - "SATES21-CAMS154-GIGE6_proc": "SATES21-CAMS154-GIGE6_proc", + "SATES21-CAMS154-GIGE9_proc": "SATES21-CAMS154-GIGE9_proc", "SATES21-CAMS154-M1_spec_db": "SATES21-CAMS154-M1_spec_db", + "SATES21-CAMS154-M2_proc": "SATES21-CAMS154-M2_proc", "SATES24-CAMS161-M1_spec_db": "SATES24-CAMS161-M1_spec_db", "SATES30-CAMS182-GIGE1_profiles": "SATES30-CAMS182-GIGE1_profiles", "SATES30-RIXS-CAM01_fit": "SATES30-RIXS-CAM01_fit", @@ -93,11 +106,12 @@ "SLAAR21-LCAM-CS844_proc": "SLAAR21-LCAM-CS844_proc", "SLAAR21-LCAM-CT1C1_proc": "SLAAR21-LCAM-CT1C1_proc", "SLAAR21-LCAM-CT1C2_proc": "SLAAR21-LCAM-CT1C2_proc", + "SLG-LCAM-C071_proc": "SLG-LCAM-C071_proc", + "SLG-LCAM-C111_proc": "SLG-LCAM-C111_proc", "SSL-LCAM-C0103_proc": "SSL-LCAM-C0103_proc", "SSL-LCAM-C0104_proc": "SSL-LCAM-C0104_proc", "simulation_3_sp": "simulation_3_sp", "simulation_sp": "simulation_sp", "test_furka": "test_furka", - "test_furka_proc": "test_furka_proc", - "test_tadej": "test_tadej" + "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 8d2c39e..9803529 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -22,46 +22,44 @@ "http://sf-daqsync-03.psi.ch:8881": { "cameras": [ "testdb", - "SATOP31-PMOS132-2D", - "SARFE10-PPRM064", - "SATOP11-PSAS079" + "SARFE10-PPRM064" ], "enabled": true, "expanding": false, "instances": [ "SARFE10-PBPS053_proc:9004", "SAROP21-ATT01_proc:9003", + "Bernina_tt_kb_populate_pvs:9030", + "#Bernina_tt_kb_restart_cam:9031", + "#SAROP21-ATT01PD_proc:9003", "SATOP31-ATT01_proc:9021", "test_stream:9006", "SARFE10-PSSS059_psss_avg:9012", - "SATOP11-PSAS079_psas:9019", "SAROP21-PBPS103_proc:9009", "SAROP11-PBPS110_proc:9007", + "SAROP11-PBPS122_proc:9010", "SAROP31-PBPS113_proc:9013", "SARFE10-PSSS059_sp_br:9005", "SAROP31-PBPS149_proc:9011", - "SAROP11-PBPS122_proc:9010", "SAROP11-ATT01_proc:9016", "SAROP21-PBPS133_proc:9008", "SAROP21-PBPS138_proc", - "SATOP31-PMOS132-2D_sp", "SARES21-PBPS141_proc:9018", - "SATOP21-PMOS127-2D_pmos:9017", "SARFE10-PPRM064_sp", - "SARFE10-PPRM064_proc:9014", - "SATOP31-PMOS132-2D_pmos:9001" + "SARFE10-PPRM064_proc:9014" ] }, "http://sf-daqsync-08.psi.ch:8881": { "cameras": [ - "simulation_2", "simulation", + "simulation_2", + "simulation_3", "alain" ], "enabled": true, "expanding": false, "instances": [ - "#simulation_3_proc:9020", + "simulation_3_proc:9020", "simulation_2_sp", "simulation2_sp", "test_alain_100Hz:9010", @@ -92,6 +90,8 @@ "SATBD02-DSCR050", "SARBD02-DSCR050", "SLG-LCAM-C103", + "SLG-LCAM-C111", + "SLG-LCAM-C071", "SARBD02-DSCR050" ], "enabled": true, @@ -113,6 +113,8 @@ "SARBD01-DSCR110_sp_rep", "SARCL01-DSCR170_profiles:9005", "SLG-LCAM-C103_proc:9006", + "SLG-LCAM-C111_proc:9008", + "SLG-LCAM-C071_proc:9009", "test_merge_disp_sp:9007" ] }, @@ -159,15 +161,17 @@ "SATES21-CAMS-PATT1_spec_db:9003", "SATES21-CAMS-PATT1_sp", "SSL-LCAM-C0103_sp", - "SATES21-CAMS154-M2_proc", + "SATES21-CAMS154-M2_proc:9021", "SATES21-CAMS154-GIGE1_proc:9051", "SATES21-CAMS154-GIGE2_proc:9052", "SATES21-CAMS154-GIGE3_proc:9053", "SATES21-CAMS154-GIGE4_proc:9054", "SATES21-CAMS154-GIGE5_proc:9055", "SATES21-CAMS154-GIGE6_proc:9056", - "SSL-LCAM-C0103_proc:9059", - "SSL-LCAM-C0104_proc:9061" + "#SATES21-CAMS154-GIGE8_proc:9058", + "#SATES21-CAMS154-GIGE9_proc", + "SATES21-CAMS154-GIGE10_sp", + "SATES21-CAMS154-GIGE11_sp" ] }, "http://sf-daqsync-13.psi.ch:8881": { @@ -179,11 +183,14 @@ "Alvra_spatial_encoding", "Alvra_spectral_encoding", "SARES12-XPR128-C4F1", - "SARES11-XMI125-C4P1" + "SARES11-XMI125-C4P1", + "SAROP11-PPRM110", + "SAROP11-PPRM122" ], "enabled": true, "expanding": false, "instances": [ + "#SAROP11-PBPS122_proc:9010", "SARES11-SPEC125-M1_psen_db:9001", "#SARES11-SPEC125-M1_test:9009", "#SARES11-SPEC125-M2_psen_db:9011", @@ -193,7 +200,10 @@ "SARES11-SPEC125-M2_db:9011", "#SARES11-SPEC125-M3_sp", "#SARES11-SPEC125-M3_spec_db", - "SAROP11-PPRM122_proc:9012" + "SAROP11-PPRM122_sp", + "SAROP11-PPRM122_proc:9012", + "SAROP11-PPRM110_proc:9013", + "SARES11-XMI125-C4P1_xy_db" ] }, "http://sf-daqsync-14.psi.ch:8881": { @@ -226,6 +236,7 @@ "SARES20-CAMS142-M4_psen_db:9001", "SARES20-CAMS142-M5_psen_db:8011", "SARES20-CAMS142-M5_psen_db_proxy:9011", + "Bernina_tt_test:9020", "SARES20-PROF142-M1_sp", "SARES20-PROF142-M1_proc:9016", "SARES20-PROF142-M1_ib:9036", @@ -238,6 +249,7 @@ "SARES20-PROF146-M1_proc:9018", "SARES20-DSDPPRM_proc:9014", "SLAAR21-LCAM-CS841_proc:9021", + "SARES21-PBPS141_proc", "SLAAR21-LCAM-CS842_proc:9022", "SLAAR21-LCAM-CS843_proc:9023", "SLAAR21-LCAM-CS844_proc:9024", @@ -258,6 +270,7 @@ "SATES30-CAMS182-GIGE2", "SATES30-CAMS182-GIGE3", "SATES30-CAMS182-GIGE4", + "SATES30-CAMS182-GIGE5", "SATES30-RIXS-CAM01", "furka_jungfrau" ], @@ -301,7 +314,25 @@ }, "http://sf-daqsync-17.psi.ch:8881": { "cameras": [ - "simulation_3", + "SATOP31-PMOS132-2D", + "SATOP21-PMOS127-2D", + "SATOP11-PSAS079" + ], + "enabled": true, + "expanding": false, + "instances": [ + "SATOP11-PSAS079_psas:9019", + "SATOP31-PMOS132-2D_sp", + "SATOP21-PMOS127-2D_pmos:9017", + "SATOP31-PMOS132-2D_pmos:9001", + "SATES21-ADTEST1-CAM1_sp", + "SATES21-ADTEST1-CAM2_sp", + "SATES21-ADTEST1-CAM3_sp", + "SATES21-ADTEST1-CAM4_sp" + ] + }, + "http://sf-daqsync-18.psi.ch:8881": { + "cameras": [ "SLG-LCAM-C042", "SLG-LCAM-C061", "SLG-LCAM-C063", @@ -314,7 +345,6 @@ "enabled": true, "expanding": false, "instances": [ - "simulation_3_proc:9020", "test_dispatcher_waveforms", "SLG-LCAM-C042_proc:9000", "SLG-LCAM-C061_proc:9001", @@ -323,15 +353,8 @@ "SLG-LCAM-C081_proc:9004", "SLG-LCAM-C082_proc:9005", "SLG-LCAM-C083_proc:9006", - "SLG-LCAM-C091_proc:9007" - ] - }, - "http://sf-daqsync-18.psi.ch:8881": { - "cameras": [], - "enabled": true, - "expanding": false, - "instances": [ - "test_tadej:9000", + "SLG-LCAM-C091_proc:9007", + "test_tadej:9020", "DET-FURKA-1_sp" ] } diff --git a/configuration/pipeline_config/simulation.json b/configuration/pipeline_config/simulation.json deleted file mode 100644 index 988cc69..0000000 --- a/configuration/pipeline_config/simulation.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "simulation", - "camera_name": "simulation" -} \ No newline at end of file diff --git a/configuration/pipeline_config/simulation_sp.json b/configuration/pipeline_config/simulation_sp.json index 4b4c7ce..727fa22 100644 --- a/configuration/pipeline_config/simulation_sp.json +++ b/configuration/pipeline_config/simulation_sp.json @@ -1,22 +1,32 @@ { "image_background_enable": false, - "image_background": "simulation_20231031_092133_801186", - "image_threshold": null, - "image_region_of_interest": null, + "image_background": "simulation_20241114_103340_976351", + "image_threshold": 0.0, + "image_region_of_interest": [ + 463, + 342, + 384, + 168 + ], "image_good_region": { - "threshold": 0.05, - "gfscale": 5.0 + "threshold": 0.5, + "gfscale": 6.0 }, "image_slices": null, "pipeline_type": "processing", "camera_name": "simulation", "name": "simulation_sp", "reload": true, - "function": "bunch_length_op", + "_function": "bunch_length_op", "fw_threshold": 0.1, "no_client_timeout": 0, "image_background_subtraction": true, "slice_orientation": "horizontal", "replace": true, - "fw_level": 0.5 + "fw_level": 0.5, + "rotation": { + "mode": "0.0", + "angle": 0.0, + "order": 1 + } } \ No newline at end of file diff --git a/configuration/user_scripts/Bernina_restart_cam.py b/configuration/user_scripts/Bernina_restart_cam.py new file mode 100644 index 0000000..4784c91 --- /dev/null +++ b/configuration/user_scripts/Bernina_restart_cam.py @@ -0,0 +1,26 @@ +#from collections import deque +#from numpy import mean +#from cam_server import PipelineClient, CamClient +initialized = False + + +def initialize(params): + global initialized, pc, cc, camera, pipeline, tx_av + camera = params["camera"] + pipeline = = params["pipeline"] + #pc = PipelineClient() + #cc = CamClient() + #tx_av = deque(maxlen=100) + initialized = True + + +def process(data, pulse_id, timestamp, params): + #if not initialized: + # initialize(params) + #tx = float(pc.get_instance_info(pipeline)["statistics"]["tx"].split("Hz")[0]) + #tx_av.append(tx) + output = {} + #if mean(tx_av) < 10: + # cc.stop_instance(camera) + # sleep(120) + return output \ No newline at end of file diff --git a/configuration/user_scripts/Bernina_tt_kb_populate_pvs.py b/configuration/user_scripts/Bernina_tt_kb_populate_pvs.py new file mode 100644 index 0000000..350d0c3 --- /dev/null +++ b/configuration/user_scripts/Bernina_tt_kb_populate_pvs.py @@ -0,0 +1,26 @@ +import epics +from threading import Thread +from cam_server.utils import create_thread_pvs, epics_lock +initialized = False + +def initialize(params): + global initialized, pv_fs, pv_px, pv_mx + epics.ca.clear_cache() + pv_fs, pv_px, pv_mx = create_thread_pvs([params["ca_edge_fs"], params["ca_edge_px"], params["ca_edge_mx"]]) + pv_fs.wait_for_connection() + pv_px.wait_for_connection() + pv_mx.wait_for_connection() + initialized = True + +def process(data, pid, timestanp, params): + if not initialized: + initialize(params) + px = None + fs = data[params["bs_edge_fs"]] + px = data[params["bs_edge_px"]] + mx = data[params["bs_edge_mx"]] + if fs: + pv_fs.put(fs) + pv_px.put(px) + pv_mx.put(mx) + return {} \ No newline at end of file diff --git a/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py b/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py index 9a92ce0..a2712a9 100644 --- a/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py +++ b/configuration/user_scripts/SARES11-SPEC125-M1_2tt.py @@ -11,8 +11,8 @@ import numpy as np _logger = getLogger(__name__) # Alvra spectral encoder constants/waveforms -px2fs = 2.152 # 2.35 calibration from 2023-06-22 -px2fs2 = 2.074 # 2.34 calibration from 2023-06-22 +px2fs = 2.125 # 2.35 calibration from 2023-06-22 +px2fs2 = 2.1 # 2.34 calibration from 2023-06-22 lambdas = np.linspace(504.17385, 608.07410, num=2048) # calibration from 2023-04-25 #lambdas = 528.34 + 0.0261*np.arange(0,2048) # calibration from 2021-10-06 #lambdas = np.linspace(510.57796, 628.63459, num=2048) # calibration from 2022-05-18 @@ -21,7 +21,8 @@ nus_new = np.linspace(nus[0], nus[-1], num=2048, endpoint=True) # frequency spac filters = { "YAG": np.concatenate((np.ones(20),signal.tukey(40)[20:40], np.zeros(2008), np.zeros(2048))), # back timetool YAG "SiN5": np.concatenate((signal.tukey(40)[25:40], np.zeros(2033), np.zeros(2048))), # back timetool SiN - "SiN2": np.concatenate((np.ones(5), signal.tukey(12)[9:11], signal.tukey(12)[0:4], np.ones(5), signal.tukey(40)[25:40], np.zeros(2017), np.zeros(2048))) # back timetool SiN + "SiN2": np.concatenate((np.ones(5), signal.tukey(12)[9:11], signal.tukey(12)[0:4], np.ones(5), signal.tukey(40)[25:40], np.zeros(2017), np.zeros(2048))), + "flat": np.concatenate((np.ones(2048), np.ones(2048))) # back timetool SiN } #bkg = None @@ -73,11 +74,13 @@ def edge(filter_name, backgrounds, signals, peakback): # interpolate to get unevenly sampled in frequency space (back to original wavelength space) sig_uninterp = interpolate(nus_new, nus, sig_filtered[..., 0:2048]) + 1 # peak via the derivative - sig_deriv = 20000 * gaussian_filter1d(sig_uninterp, 50, order=1) + #sig_deriv = 20000 * gaussian_filter1d(sig_uninterp, 30, order=1) + sig_deriv = 20000*np.gradient(sig_uninterp) sig_deriv -= peakback + sig_deriv *= signal.tukey(2048) # just added Nov 20 2024 #peak_pos = 1024 - (np.argmax(sig_deriv[500:1500], axis=-1) + 500) - peak_pos = 1024 - (np.argmax(sig_deriv[200:1800], axis=-1) + 200) - peak_amp = np.amax(sig_deriv[200:1800], axis=-1) + peak_pos = 1024 - (np.argmax(sig_deriv[400:1600], axis=-1) + 400) + peak_amp = np.amax(sig_deriv[400:1600], axis=-1) return peak_pos, peak_amp, sig_deriv, sig_uninterp @@ -115,8 +118,8 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata projection_background2 = get_roi_projection(background, roi_signal2, project_axis) projection_signal = get_roi_projection(image, roi_signal, project_axis) projection_signal2 = get_roi_projection(image, roi_signal2, project_axis) - peak_pos, peak_amp, sig_deriv, sig_uninterp = edge("YAG", projection_background, projection_signal, 0) - peak_pos2, peak_amp2, sig_deriv2, sig_uninterp2 = edge("YAG", projection_background2, projection_signal2, 0) + peak_pos, peak_amp, sig_deriv, sig_uninterp = edge("SiN5", projection_background, projection_signal, 0) + peak_pos2, peak_amp2, sig_deriv2, sig_uninterp2 = edge("SiN5", projection_background2, projection_signal2, 0) peak_pos *= px2fs peak_pos2 *= px2fs2 diff --git a/configuration/user_scripts/SARES11-SPEC125-M1_tt.py b/configuration/user_scripts/SARES11-SPEC125-M1_tt.py index 26e9711..3929744 100644 --- a/configuration/user_scripts/SARES11-SPEC125-M1_tt.py +++ b/configuration/user_scripts/SARES11-SPEC125-M1_tt.py @@ -11,7 +11,7 @@ import numpy as np _logger = getLogger(__name__) # Alvra spectral encoder constants/waveforms -px2fs = 2.152 # calibration from ... +px2fs = 2.152 #9.46 with all the glass in #2.152 # calibration from ... #lambdas = 528.34 + 0.0261*np.arange(0,2048) # calibration from 2021-10-06 lambdas = np.linspace(504.17385, 608.07410, num=2048) # calibration from 2023-04-25 #lambdas = np.linspace(510.57796, 628.63459, num=2048) # calibration from 2022-05-18 diff --git a/configuration/user_scripts/SARES11-SPEC125-M3_spec.py b/configuration/user_scripts/SARES11-SPEC125-M3_spec.py index c3ac69c..89cd611 100644 --- a/configuration/user_scripts/SARES11-SPEC125-M3_spec.py +++ b/configuration/user_scripts/SARES11-SPEC125-M3_spec.py @@ -18,9 +18,13 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata roi_background = parameters.get("roi_background") camera_name = parameters.get("camera_name") project_axis = parameters.get("project_axis", 0) + dark = parameters.get("background_data") + dark = dark.astype(int) spectrum = get_roi_projection(image, roi_signal, project_axis) - background = get_roi_projection(image, roi_background, project_axis) + background = get_roi_projection(dark, roi_signal, project_axis) + + spectrum -= background # ret = processor.process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata) # return ret diff --git a/configuration/user_scripts/SARES30-CAMS156-SMX-OAV_jetprojections.py b/configuration/user_scripts/SARES30-CAMS156-SMX-OAV_jetprojections.py index e191e02..55e0d3e 100644 --- a/configuration/user_scripts/SARES30-CAMS156-SMX-OAV_jetprojections.py +++ b/configuration/user_scripts/SARES30-CAMS156-SMX-OAV_jetprojections.py @@ -62,9 +62,9 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata processed_data[image_property_name + ".processing_parameters"] = json.dumps({"roi_signal": roi_signal}) if roi_signal: - jet_projection = get_roi_projection(image, roi_signal, 1) + jet_projection = get_roi_projection(image, roi_signal, 1) processed_data[image_property_name + ".jet_projection"] = jet_projection - jet_width = get_roi_projection(image, roi_signal, 0) + jet_width = get_roi_projection(image, roi_signal, 0) processed_data[image_property_name + ".jet_width"] = jet_width freq, spectrum, cut_freq = find_spacing(jet_projection, extend=10) diff --git a/configuration/user_scripts/SAROP11-ATT01_proc.py b/configuration/user_scripts/SAROP11-ATT01_proc.py index 03ebe4d..6d215b5 100644 --- a/configuration/user_scripts/SAROP11-ATT01_proc.py +++ b/configuration/user_scripts/SAROP11-ATT01_proc.py @@ -1,7 +1,8 @@ from collections import deque from logging import getLogger -from scipy.signal import savgol_filter + import numpy as np +from scipy.signal import savgol_filter _logger = getLogger(__name__) @@ -9,7 +10,7 @@ initialized = False def initialize(params): - global initialized, buffer, device, step_length, edge_type, refinement, dark_event, fel_on_event, use_dark, calib, use_filter, filter_window + global initialized, buffer_savgol, device, step_length, edge_type, refinement, dark_event, fel_on_event, use_dark, calib, use_filter, filter_window, buffer device = params["device"] step_length = params["step_length"] @@ -17,11 +18,12 @@ def initialize(params): refinement = params["refinement"] dark_event = params["dark_event"] fel_on_event = params["fel_on_event"] - buffer = deque(maxlen=params["buffer_length"]) + buffer_savgol = deque(maxlen=params["buffer_length"]) use_dark = params["use_dark"] calib = params["calib"] filter_window = params["filter_window"] - use_filter = params['filter'] + # use_filter = params['filter'] + buffer = deque(maxlen=params["buffer_length"]) initialized = True @@ -60,41 +62,84 @@ def find_edge(data, step_length=50, edge_type="falling", refinement=1): # correct edge_position for step_length edge_position += np.floor(step_length / 2) - return {"edge_pos": edge_position, "xcorr": xcorr, "xcorr_ampl": xcorr_amplitude, "signal":data} + return { + "edge_pos": edge_position, + "xcorr": xcorr, + "xcorr_ampl": xcorr_amplitude, + "signal": data, + } def process(data, pulse_id, timestamp, params): if not initialized: initialize(params) + output = {} # Read stream inputs prof_sig = data[params["prof_sig"]] - if use_filter: - prof_sig = savgol_filter(prof_sig,filter_window,3) + try: + prof_sig_savgol = savgol_filter(prof_sig, filter_window, 3) + except: + output[f"{device}:raw_wf"] = prof_sig + return output # added for intermitent cases with prof_sig shorter than filter window events = data[params["events"]] - if prof_sig.ndim == 1: - prof_sig = prof_sig[np.newaxis, :] - if events[dark_event] and use_dark: buffer.append(prof_sig) - edge_results = {"edge_pos": np.nan, "xcorr": np.nan, "xcorr_ampl": np.nan, "signal":np.nan} + if prof_sig_savgol.ndim == 1: + prof_sig_savgol = prof_sig_savgol[np.newaxis, :] + + if events[dark_event] and use_dark: + buffer_savgol.append(prof_sig_savgol) + edge_results = {"edge_pos": None, "xcorr": None, "xcorr_ampl": None, "signal": None} else: - if events[fel_on_event] and buffer: - prof_sig = prof_sig / np.mean(buffer, axis=0) - edge_results = find_edge(prof_sig, step_length, edge_type, refinement) + if events[fel_on_event] and buffer_savgol: + prof_sig_norm = prof_sig_savgol / np.mean(buffer_savgol, axis=0) + edge_results = find_edge(prof_sig_norm, step_length, edge_type, refinement) elif events[fel_on_event] and not use_dark: - edge_results = find_edge(prof_sig, step_length, edge_type, refinement) + edge_results = find_edge(prof_sig_savgol, step_length, edge_type, refinement) else: - edge_results = {"edge_pos": np.nan, "xcorr": np.nan, "xcorr_ampl": np.nan, "signal":np.nan} - - # calib edge - edge_results["arrival_time"] = edge_results["edge_pos"] * calib + edge_results = {"edge_pos": None, "xcorr": None, "xcorr_ampl": None, "signal": None} + # # calib edge + # edge_results["arrival_time"] = np.polyval(calib, edge_results["edge_pos"]) + # # sort edge by parity + # if pulse_id % 2 == 0: + # try: + # edge_results["arrival_time_even"] = edge_results["edge_pos"] * calib + # except: + # edge_results["arrival_time_even"] = None + # edge_results["arrival_time_odd"] = None + # else: + # edge_results["arrival_time_even"] = None + # try: + # edge_results["arrival_time_odd"] = edge_results["edge_pos"] * calib + # except: + # edge_results["arrival_time_odd"] = None + # # push pulse ID for debuging + # edge_results["pulse_id"] = pulse_id # Set bs outputs - output = {} for key, value in edge_results.items(): output[f"{device}:{key}"] = value - return output + # output[f"{device}:raw_wf"] = prof_sig + # output[f"{device}:raw_wf_savgol"] = prof_sig_savgol + # if events[dark_event]: + # output[f"{device}:dark_wf"] = prof_sig + # output[f"{device}:dark_wf_savgol"] = prof_sig_savgol + # else: + # output[f"{device}:dark_wf"] = None + # output[f"{device}:dark_wf_savgol"] = None + + # if buffer: + # output[f"{device}:avg_dark_wf"] = np.mean(buffer, axis=0) + # else: + # output[f"{device}:avg_dark_wf"] = None + + # if buffer_savgol: + # output[f"{device}:avg_dark_wf_savgol"] = np.mean(buffer_savgol, axis=0) + # else: + # output[f"{device}:avg_dark_wf_savgol"] = None + + return output diff --git a/configuration/user_scripts/SAROP21-ATT01PD_proc.py b/configuration/user_scripts/SAROP21-ATT01PD_proc.py new file mode 100644 index 0000000..6d215b5 --- /dev/null +++ b/configuration/user_scripts/SAROP21-ATT01PD_proc.py @@ -0,0 +1,145 @@ +from collections import deque +from logging import getLogger + +import numpy as np +from scipy.signal import savgol_filter + +_logger = getLogger(__name__) + +initialized = False + + +def initialize(params): + global initialized, buffer_savgol, device, step_length, edge_type, refinement, dark_event, fel_on_event, use_dark, calib, use_filter, filter_window, buffer + + device = params["device"] + step_length = params["step_length"] + edge_type = params["edge_type"] + refinement = params["refinement"] + dark_event = params["dark_event"] + fel_on_event = params["fel_on_event"] + buffer_savgol = deque(maxlen=params["buffer_length"]) + use_dark = params["use_dark"] + calib = params["calib"] + filter_window = params["filter_window"] + # use_filter = params['filter'] + buffer = deque(maxlen=params["buffer_length"]) + initialized = True + + +def _interpolate_row(y_known, x_known, x_interp): + y_interp = np.interp(x_interp, x_known, y_known) + return y_interp + + +def find_edge(data, step_length=50, edge_type="falling", refinement=1): + # refine data + data_length = data.shape[1] + refined_data = np.apply_along_axis( + _interpolate_row, + axis=1, + arr=data, + x_known=np.arange(data_length), + x_interp=np.arange(0, data_length - 1, refinement), + ) + + # prepare a step function and refine it + step_waveform = np.ones(shape=(step_length,)) + if edge_type == "rising": + step_waveform[: int(step_length / 2)] = -1 + elif edge_type == "falling": + step_waveform[int(step_length / 2) :] = -1 + + step_waveform = np.interp( + x=np.arange(0, step_length - 1, refinement), xp=np.arange(step_length), fp=step_waveform + ) + + # find edges + xcorr = np.apply_along_axis(np.correlate, 1, refined_data, v=step_waveform, mode="valid") + edge_position = np.argmax(xcorr, axis=1).astype(float) * refinement + xcorr_amplitude = np.amax(xcorr, axis=1) + + # correct edge_position for step_length + edge_position += np.floor(step_length / 2) + + return { + "edge_pos": edge_position, + "xcorr": xcorr, + "xcorr_ampl": xcorr_amplitude, + "signal": data, + } + + +def process(data, pulse_id, timestamp, params): + if not initialized: + initialize(params) + output = {} + + # Read stream inputs + prof_sig = data[params["prof_sig"]] + try: + prof_sig_savgol = savgol_filter(prof_sig, filter_window, 3) + except: + output[f"{device}:raw_wf"] = prof_sig + return output # added for intermitent cases with prof_sig shorter than filter window + events = data[params["events"]] + + if events[dark_event] and use_dark: + buffer.append(prof_sig) + if prof_sig_savgol.ndim == 1: + prof_sig_savgol = prof_sig_savgol[np.newaxis, :] + + if events[dark_event] and use_dark: + buffer_savgol.append(prof_sig_savgol) + edge_results = {"edge_pos": None, "xcorr": None, "xcorr_ampl": None, "signal": None} + else: + if events[fel_on_event] and buffer_savgol: + prof_sig_norm = prof_sig_savgol / np.mean(buffer_savgol, axis=0) + edge_results = find_edge(prof_sig_norm, step_length, edge_type, refinement) + elif events[fel_on_event] and not use_dark: + edge_results = find_edge(prof_sig_savgol, step_length, edge_type, refinement) + else: + edge_results = {"edge_pos": None, "xcorr": None, "xcorr_ampl": None, "signal": None} + + # # calib edge + # edge_results["arrival_time"] = np.polyval(calib, edge_results["edge_pos"]) + # # sort edge by parity + # if pulse_id % 2 == 0: + # try: + # edge_results["arrival_time_even"] = edge_results["edge_pos"] * calib + # except: + # edge_results["arrival_time_even"] = None + # edge_results["arrival_time_odd"] = None + # else: + # edge_results["arrival_time_even"] = None + # try: + # edge_results["arrival_time_odd"] = edge_results["edge_pos"] * calib + # except: + # edge_results["arrival_time_odd"] = None + # # push pulse ID for debuging + # edge_results["pulse_id"] = pulse_id + # Set bs outputs + 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 + + # if events[dark_event]: + # output[f"{device}:dark_wf"] = prof_sig + # output[f"{device}:dark_wf_savgol"] = prof_sig_savgol + # else: + # output[f"{device}:dark_wf"] = None + # output[f"{device}:dark_wf_savgol"] = None + + # if buffer: + # output[f"{device}:avg_dark_wf"] = np.mean(buffer, axis=0) + # else: + # output[f"{device}:avg_dark_wf"] = None + + # if buffer_savgol: + # output[f"{device}:avg_dark_wf_savgol"] = np.mean(buffer_savgol, axis=0) + # else: + # output[f"{device}:avg_dark_wf_savgol"] = None + + return output diff --git a/configuration/user_scripts/SAROP21-ATT01_proc.py b/configuration/user_scripts/SAROP21-ATT01_proc.py index 6d215b5..b0a0192 100644 --- a/configuration/user_scripts/SAROP21-ATT01_proc.py +++ b/configuration/user_scripts/SAROP21-ATT01_proc.py @@ -1,145 +1,117 @@ from collections import deque -from logging import getLogger - import numpy as np -from scipy.signal import savgol_filter - -_logger = getLogger(__name__) - +from scipy.signal.windows import hann +from scipy.special import erf initialized = False - def initialize(params): - global initialized, buffer_savgol, device, step_length, edge_type, refinement, dark_event, fel_on_event, use_dark, calib, use_filter, filter_window, buffer - - device = params["device"] - step_length = params["step_length"] - edge_type = params["edge_type"] - refinement = params["refinement"] - dark_event = params["dark_event"] - fel_on_event = params["fel_on_event"] - buffer_savgol = deque(maxlen=params["buffer_length"]) - use_dark = params["use_dark"] - calib = params["calib"] - filter_window = params["filter_window"] - # use_filter = params['filter'] - buffer = deque(maxlen=params["buffer_length"]) + global initialized, buffer + buffer = deque(maxlen=params["dark_buffer_length"]) initialized = True +def normstep(step): + """normalizing a test signal for np.correlate""" + step = step - np.mean(step) + step = step / np.sum(step**2) + return step -def _interpolate_row(y_known, x_known, x_interp): - y_interp = np.interp(x_interp, x_known, y_known) - return y_interp +def get_reference_function(sigma_px=30, reflen=300, window=None): + rng = reflen / np.sqrt(2) / sigma_px / 2 + ref = -erf(np.linspace(-rng, rng, reflen)) / 2 + if window: + if window == "hann": + ref = hann(len(ref)) * ref * 1.64 + ref = normstep(ref) + return ref +def find_signal(tt_sig, ref, roi=[None, None], dpx_poly = None): + """finding signal ref in d. + ref is expected to be properly normalized + return position is corrected to center location of the reference signal (as found in signal d) + """ + # need to invert both to get correct direction -def find_edge(data, step_length=50, edge_type="falling", refinement=1): - # refine data - data_length = data.shape[1] - refined_data = np.apply_along_axis( - _interpolate_row, - axis=1, - arr=data, - x_known=np.arange(data_length), - x_interp=np.arange(0, data_length - 1, refinement), - ) + dark = np.nanmean(buffer, axis=0) + ratio = (tt_sig/dark) - # prepare a step function and refine it - step_waveform = np.ones(shape=(step_length,)) - if edge_type == "rising": - step_waveform[: int(step_length / 2)] = -1 - elif edge_type == "falling": - step_waveform[int(step_length / 2) :] = -1 + x0 = (len(ref) + 1) // 2 + c = np.correlate(ratio[roi[0]:roi[1]], ref, "valid") - step_waveform = np.interp( - x=np.arange(0, step_length - 1, refinement), xp=np.arange(step_length), fp=step_waveform - ) + if roi[0]: + x0 += np.min(roi) + p, mx = get_max(c, dpx_poly=dpx_poly, offset=x0) + return p, mx, c, ratio, dark - # find edges - xcorr = np.apply_along_axis(np.correlate, 1, refined_data, v=step_waveform, mode="valid") - edge_position = np.argmax(xcorr, axis=1).astype(float) * refinement - xcorr_amplitude = np.amax(xcorr, axis=1) +def get_max(c, dpx_poly=None, offset=0): + """getting maximum from a correlation curve (optionally using polynomial fit)""" + im = c.argmax() + mx = c[im] - # correct edge_position for step_length - edge_position += np.floor(step_length / 2) + if dpx_poly: + try: + poly = np.polyfit(np.arange(-dpx_poly//2,dpx_poly//2),c[im-dpx_poly//2:im+dpx_poly//2], 5) + root = np.roots(np.polyder(poly,1)) + im+= np.real(root[np.argmin(np.abs(root))]) + except: + im=im + return im + offset, mx - return { - "edge_pos": edge_position, - "xcorr": xcorr, - "xcorr_ampl": xcorr_amplitude, - "signal": data, - } - - -def process(data, pulse_id, timestamp, params): +def process(data, pid, timestanp, params): if not initialized: initialize(params) - output = {} + + ## initialize all values sent to BS stream to None + edge_pos = None + arrival_time = None + xcorr = None + xcorr_ampl = None + ratio = None + dark = None + tt_sig = None - # Read stream inputs - prof_sig = data[params["prof_sig"]] - try: - prof_sig_savgol = savgol_filter(prof_sig, filter_window, 3) - except: - output[f"{device}:raw_wf"] = prof_sig - return output # added for intermitent cases with prof_sig shorter than filter window + + ## params used for evaluation + roi = params["roi"] + dpx_poly = params["dpx_poly"] + sigma_px = params["sigma_px"] + reflen = params["reflen"] + window = params["window"] + + ## get data and events for sorting + tt_sig = data[params["tt_sig"]] events = data[params["events"]] + is_laser_dark = params["is_laser_dark"] + is_fel_dark = params["is_fel_dark"] + is_laser_delayed = params["is_laser_delayed"] + if is_fel_dark: + is_fel_dark = events[params["event_code_fel_dark"]] + if is_laser_dark: + is_laser_dark = events[params["event_code_laser_dark"]] + if is_laser_delayed: + is_laser_delayed = events[params["event_code_laser_delayed"]] + - if events[dark_event] and use_dark: - buffer.append(prof_sig) - if prof_sig_savgol.ndim == 1: - prof_sig_savgol = prof_sig_savgol[np.newaxis, :] + # analyze + if (not is_laser_delayed) & (not is_fel_dark) & (not is_laser_dark): + if len(buffer) > params["dark_buffer_length"]-1: + ref = get_reference_function(sigma_px=sigma_px, reflen=reflen, window=window) + edge_pos, xcorr_ampl, xcorr, ratio, dark = find_signal(tt_sig, ref, roi=roi, dpx_poly=dpx_poly) + arrival_time = np.polyval(params["calibration"], edge_pos)*1e15 - if events[dark_event] and use_dark: - buffer_savgol.append(prof_sig_savgol) - edge_results = {"edge_pos": None, "xcorr": None, "xcorr_ampl": None, "signal": None} - else: - if events[fel_on_event] and buffer_savgol: - prof_sig_norm = prof_sig_savgol / np.mean(buffer_savgol, axis=0) - edge_results = find_edge(prof_sig_norm, step_length, edge_type, refinement) - elif events[fel_on_event] and not use_dark: - edge_results = find_edge(prof_sig_savgol, step_length, edge_type, refinement) - else: - edge_results = {"edge_pos": None, "xcorr": None, "xcorr_ampl": None, "signal": None} + # or add to dark reference + elif not (is_laser_dark): + buffer.append(tt_sig) - # # calib edge - # edge_results["arrival_time"] = np.polyval(calib, edge_results["edge_pos"]) - # # sort edge by parity - # if pulse_id % 2 == 0: - # try: - # edge_results["arrival_time_even"] = edge_results["edge_pos"] * calib - # except: - # edge_results["arrival_time_even"] = None - # edge_results["arrival_time_odd"] = None - # else: - # edge_results["arrival_time_even"] = None - # try: - # edge_results["arrival_time_odd"] = edge_results["edge_pos"] * calib - # except: - # edge_results["arrival_time_odd"] = None - # # push pulse ID for debuging - # edge_results["pulse_id"] = pulse_id - # Set bs outputs - for key, value in edge_results.items(): - output[f"{device}:{key}"] = value + # To populate Chris panel + edge_results = { + "SAROP21-ATT01:edge_pos": None if edge_pos is None else float(edge_pos), + "SAROP21-ATT01:arrival_time": arrival_time, + "SAROP21-ATT01:xcorr": xcorr, + "SAROP21-ATT01:xcorr_ampl": xcorr_ampl, + "SAROP21-ATT01:signal": ratio, + "SAROP21-ATT01:avg_dark_wf": dark, + "SAROP21-ATT01:raw_wf": tt_sig, + "SAROP21-ATT01:raw_wf_savgol": tt_sig, + } + return edge_results - # output[f"{device}:raw_wf"] = prof_sig - # output[f"{device}:raw_wf_savgol"] = prof_sig_savgol - - # if events[dark_event]: - # output[f"{device}:dark_wf"] = prof_sig - # output[f"{device}:dark_wf_savgol"] = prof_sig_savgol - # else: - # output[f"{device}:dark_wf"] = None - # output[f"{device}:dark_wf_savgol"] = None - - # if buffer: - # output[f"{device}:avg_dark_wf"] = np.mean(buffer, axis=0) - # else: - # output[f"{device}:avg_dark_wf"] = None - - # if buffer_savgol: - # output[f"{device}:avg_dark_wf_savgol"] = np.mean(buffer_savgol, axis=0) - # else: - # output[f"{device}:avg_dark_wf_savgol"] = None - - return output diff --git a/configuration/user_scripts/bunch_length_op.py b/configuration/user_scripts/bunch_length_op.py index 6e96752..e472f67 100644 --- a/configuration/user_scripts/bunch_length_op.py +++ b/configuration/user_scripts/bunch_length_op.py @@ -26,12 +26,13 @@ def gauss_op(x, y): sigma = abs(sigma) gauss = gauss_function_op(x, H, A, x0, sigma) y = y - H # remove offset + y[y < 0.0] = 0.0 # remove negative amplitude y = y / sum(y) if sum(y) != 0 else y # normalise to 1 - condition = np.abs(x - x0) > 5 * sigma + condition = np.abs(x - x0) > 5000 # 5 * sigma -> too jumpy y[condition] = 0.0 # remove outliers com = sum(x * y) x = x - com - rms = np.sqrt(np.abs(sum(x**2 * y))) # y can have negative values + rms = np.sqrt(np.abs(sum(x**2 * y))) return gauss, H, A, x0, sigma, com, rms def get_fw(x, y, level=0.5): diff --git a/configuration/user_scripts/casts_pid.py b/configuration/user_scripts/casts_pid.py new file mode 100644 index 0000000..fd83063 --- /dev/null +++ b/configuration/user_scripts/casts_pid.py @@ -0,0 +1,142 @@ +from logging import getLogger + +import epics +import numpy +import scipy.signal +import scipy.optimize + +_logger = getLogger(__name__) + +from cam_server.pipeline.data_processing import functions, processor + +pv_names = ["TEST1", "TEST2"] + +initialized = False +pv_connections = None + +def get_casts_connection(ioc_name): + global pv_names + + ret = OrderedDict() + + # Do once at startup + try: + for pv_name in pv_names: + # Create PV names here + input_pv_name = casts_prefix + ":TEST" + + # Fetch the paramts + input_pv = epics.PV(input_pv_name) + input_pv.wait_for_connection() + + #TODO store connections globally + ret[input_pv_name] = input_pv + + # set init true so this won't run again until script is restarted + initialized = True + + except Exception as e: + raise SystemExit(e) + + return ret + +def get_casts_values(): + global pv_connections + + ret = OrderedDict() + + for input_pv_name, pv_conn in pv_connections.items(): + + if pv_conn.connected: + ret[input_pv_name] = pv_conn.value + else + ret[input_pv_name] = 0 + + _logger.warning("input values fetched: " + str(ret)) + + return ret + +def crop(image, parameters): + + image_segment = 0 + image_matrix = 0 + + return image_segment, image_matrix + +def process_segment(image, params): + + pid, data = 0, 0 + + """ + input: image, params + return pid: int + data: + PV( int , pv_SSEG_ROW0 , "{CAST}:REG_7SEG_USER_SEG0" , PV_NONE); + PV( int , pv_SSEG_ROW1 , "{CAST}:REG_7SEG_USER_SEG1" , PV_NONE); + PV( int , pv_SSEG_ROW2 , "{CAST}:REG_7SEG_USER_SEG2" , PV_NONE); + PV( int , pv_SSEG_ROW3 , "{CAST}:REG_7SEG_USER_SEG3" , PV_NONE); + """ + + return pid, data + +def process_matrix(image, params): + + """ + input: image, params + return pid: int + data: + PV( int , pv_MATRIX_ROW1 , "{CAST}:REG_MATRIX_USER_ROW1" , PV_NONE); + PV( int , pv_MATRIX_ROW2 , "{CAST}:REG_MATRIX_USER_ROW2" , PV_NONE); + PV( int , pv_MATRIX_ROW3 , "{CAST}:REG_MATRIX_USER_ROW3" , PV_NONE); + PV( int , pv_MATRIX_ROW4 , "{CAST}:REG_MATRIX_USER_ROW4" , PV_NONE); + PV( int , pv_MATRIX_ROW5 , "{CAST}:REG_MATRIX_USER_ROW5" , PV_NONE); + PV( int , pv_MATRIX_ROW6 , "{CAST}:REG_MATRIX_USER_ROW6" , PV_NONE); + PV( int , pv_MATRIX_ROW7 , "{CAST}:REG_MATRIX_USER_ROW7" , PV_NONE); + PV( int , pv_MATRIX_ROW8 , "{CAST}:REG_MATRIX_USER_ROW8" , PV_NONE); + """ + + pid, data = 0, 0 + + return pid, data + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata=None): + global initialized + global pv_connections + + # Basic init + ret = OrderedDict() + prefix = parameters["camera_name"] + + # Do connection only once.. + if not initialized: + pv_connections = get_casts_connection(ioc_name="CASTMASTER") + + casts_values = get_casts_values() + + # example -- Calculate intensity + (x_profile, y_profile) = functions.get_x_y_profile(image) + intensity = x_profile.sum() + + # Crop image + image_segment, image_matrix = crop(image, casts_values) + + # Process matrix + matrix_pid, matrix_data = process_matrix(image_matrix, casts_values) + + # Process 7-segment + segment_pid, segment_data = process_segment(image_segment, casts_values) + + # Construct return dict + ret[prefix+":intensity"] = intensity + + ret[prefix+":matrix_pid"] = matrix_pid + ret[prefix+":matrix_diff"] = pulse_id - matrix_pid + + ret[prefix+":matrix_pid"] = segment_pid + ret[prefix+":matrix_diff"] = pulse_id - segment_pid + + # If softPV's can be created here without putting them in databuffer + # parts of matrix and segment could be exposed here + # otherwise only the retreived pid and difference + + return ret \ No newline at end of file diff --git a/configuration/user_scripts/cs_sum.py b/configuration/user_scripts/cs_sum.py new file mode 100644 index 0000000..a53e85c --- /dev/null +++ b/configuration/user_scripts/cs_sum.py @@ -0,0 +1,16 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger + +_logger = getLogger(__name__) + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + ret = OrderedDict() + prefix = parameters["camera_name"] + (x_profile, y_profile) = functions.get_x_y_profile(image) + + intensity = int(x_profile.sum()) + #ret[prefix+":intensity"] = intensity + ret[prefix+":EVENT_NUM"] = intensity + + return ret \ No newline at end of file diff --git a/configuration/user_scripts/laser_gauss_fit.py b/configuration/user_scripts/laser_gauss_fit.py new file mode 100644 index 0000000..7a0772c --- /dev/null +++ b/configuration/user_scripts/laser_gauss_fit.py @@ -0,0 +1,20 @@ +from collections import OrderedDict +from cam_server.pipeline.data_processing import functions +from logging import getLogger + +_logger = getLogger(__name__) + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata): + ret = OrderedDict() + prefix = parameters["camera_name"] + (x_profile, y_profile) = functions.get_x_y_profile(image) + _, _, _, x_fit_mean, x_fit_standard_deviation, _, _ = functions.gauss_fit(x_profile, x_axis) + #_, _, _, y_fit_mean, y_fit_standard_deviation, _, _ = functions.gauss_fit(y_profile, y_axis) + x_fwhm = functions.get_fw(x_axis,x_profile) + #y_fwhm = functions.get_fw(y_axis,y_profile) + intensity = x_profile.sum() + ret[prefix+":intensity"] = intensity + ret[prefix+":x_fit_mean"] = x_fit_mean + ret[prefix+":x_fwhm"] = x_fwhm + ret[prefix+":x_fit_standard_deviation"] = x_fit_standard_deviation + return ret \ No newline at end of file diff --git a/configuration/user_scripts/pmos127B-2D.py b/configuration/user_scripts/pmos127B-2D.py new file mode 100644 index 0000000..0995b47 --- /dev/null +++ b/configuration/user_scripts/pmos127B-2D.py @@ -0,0 +1,163 @@ +from logging import getLogger + +from cam_server.pipeline.data_processing import functions +from cam_server.utils import create_thread_pvs, epics_lock + + +import json + +import numpy +import scipy.signal +import scipy.optimize +import numba + +numba.set_num_threads(4) + +_logger = getLogger(__name__) + +channel_names = None +output_pv, center_pv, fwhm_pv, ymin_pv, ymax_pv, axis_pv = None, None, None, None, None, None +roi = [0, 0] +initialized = False +sent_pid = -1 + + +@numba.njit(parallel=True) +def get_spectrum(image, background): + y = image.shape[0] + x = image.shape[1] + + profile = numpy.zeros(x, dtype=numpy.uint32) + + for i in numba.prange(y): + for j in range(x): + v = image[i, j] + b = background[i, j] + if v > b: + v -= b + else: + v = 0 + profile[j] += v + return profile + + +def initialize(parameters): + global ymin_pv, ymax_pv, axis_pv, output_pv, center_pv, fwhm_pv + global channel_names + e_axis = parameters["e_axis"] + int_axis = parameters["int_axis"] + epics_pv_name_prefix = parameters["camera_name2"] + output_pv_name = int_axis + center_pv_name = epics_pv_name_prefix + ":SPECTRUM_CENTER" + fwhm_pv_name = epics_pv_name_prefix + ":SPECTRUM_FWHM" + ymin_pv_name = epics_pv_name_prefix + ":SPC_ROI_YMIN" + ymax_pv_name = epics_pv_name_prefix + ":SPC_ROI_YMAX" + axis_pv_name = e_axis + channel_names = [output_pv_name, center_pv_name, fwhm_pv_name, ymin_pv_name, ymax_pv_name, axis_pv_name] + + +def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata=None, background=None): + global roi, initialized, sent_pid + global channel_names + e_axis = parameters["e_axis"] + int_axis = parameters["int_axis"] + if not initialized: + initialize(parameters) + initialized = True + [output_pv, center_pv, fwhm_pv, ymin_pv, ymax_pv, axis_pv] = create_thread_pvs(channel_names) + processed_data = dict() + epics_pv_name_prefix = parameters["camera_name2"] + + if ymin_pv and ymin_pv.connected: + roi[0] = ymin_pv.value + if ymax_pv and ymax_pv.connected: + roi[1] = ymax_pv.value + if axis_pv and axis_pv.connected: + axis = axis_pv.value + else: + axis = None + + if axis is None: + _logger.warning("Energy axis not connected"); + return None + + if len(axis) < image.shape[1]: + _logger.warning("Energy axis length %d < image width %d", len(axis), image.shape[1]) + return None + + # match the energy axis to image width + axis = axis[:image.shape[1]] + + processing_image = image + #processing_image = image.astype(np.float32) - np.float32(parameters["pixel_bkg"]) + + nrows, ncols = processing_image.shape + + # validate background data if passive mode (background subtraction handled here) + background_image = parameters.pop('background_data', None) + if isinstance(background_image, numpy.ndarray): + if background_image.shape != processing_image.shape: + _logger.info("Invalid background shape: %s instead of %s" % ( + str(background_image.shape), str(processing_image.shape))) + background_image = None + else: + background_image = None + + processed_data[epics_pv_name_prefix + ":processing_parameters"] = json.dumps( + {"roi": roi, "background": None if (background_image is None) else parameters.get('image_background')}) + + # crop the image in y direction + ymin, ymax = int(roi[0]), int(roi[1]) + if nrows >= ymax > ymin >= 0: + if (nrows != ymax) or (ymin != 0): + processing_image = processing_image[ymin: ymax, :] + if background_image is not None: + background_image = background_image[ymin:ymax, :] + + # remove the background and collapse in y direction to get the spectrum + if background_image is not None: + spectrum = get_spectrum(processing_image, background_image) + else: + spectrum = processing_image.sum(0, 'uint32') + + # smooth the spectrum with savgol filter with 51 window size and 3rd order polynomial + smoothed_spectrum = scipy.signal.savgol_filter(spectrum, 51, 3) + + # check wether spectrum has only noise. the average counts per pixel at the peak + # should be larger than 1.5 to be considered as having real signals. + minimum, maximum = smoothed_spectrum.min(), smoothed_spectrum.max() + amplitude = maximum - minimum + skip = True + if amplitude > nrows * 1.5: + skip = False + # gaussian fitting + offset, amplitude, center, sigma = functions.gauss_fit_psss(smoothed_spectrum[::2], axis[::2], + offset=minimum, amplitude=amplitude, skip=skip, maxfev=20) + + spectrum_sum = numpy.sum(spectrum) + + # outputs + processed_data[epics_pv_name_prefix + ":SPECTRUM_Y_SUM"] = spectrum_sum + processed_data[int_axis] = spectrum + processed_data[e_axis] = axis + processed_data[epics_pv_name_prefix + ":SPECTRUM_CENTER"] = numpy.float64(center) + processed_data[epics_pv_name_prefix + ":SPECTRUM_FWHM"] = numpy.float64(2.355 * sigma) + if epics_lock.acquire(False): + try: + if pulse_id > sent_pid: + sent_pid = pulse_id + if output_pv and output_pv.connected: + output_pv.put(processed_data[int_axis]) + #_logger.debug("caput on %s for pulse_id %s", output_pv, pulse_id) + + if center_pv and center_pv.connected: + center_pv.put(processed_data[epics_pv_name_prefix + ":SPECTRUM_CENTER"]) + + if fwhm_pv and fwhm_pv.connected: + fwhm_pv.put(processed_data[epics_pv_name_prefix + ":SPECTRUM_FWHM"]) + finally: + epics_lock.release() + + return processed_data + + diff --git a/configuration/user_scripts/pmos132-2D.py b/configuration/user_scripts/pmos132-2D.py index 7802f91..5f4d45a 100644 --- a/configuration/user_scripts/pmos132-2D.py +++ b/configuration/user_scripts/pmos132-2D.py @@ -131,7 +131,10 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata offset, amplitude, center, sigma = functions.gauss_fit_psss(smoothed_spectrum[::2], axis[::2], offset=minimum, amplitude=amplitude, skip=skip, maxfev=20) + spectrum_sum = numpy.sum(spectrum) + # outputs + processed_data[epics_pv_name_prefix + ":SPECTRUM_Y_SUM"] = spectrum_sum processed_data[epics_pv_name_prefix + ":SPECTRUM_Y"] = spectrum processed_data[epics_pv_name_prefix + ":SPECTRUM_X"] = axis processed_data[epics_pv_name_prefix + ":SPECTRUM_CENTER"] = numpy.float64(center) diff --git a/configuration/user_scripts/psen_bsen_processing.py b/configuration/user_scripts/psen_bsen_processing.py index 61aa76a..5995e93 100644 --- a/configuration/user_scripts/psen_bsen_processing.py +++ b/configuration/user_scripts/psen_bsen_processing.py @@ -10,11 +10,14 @@ DEFAULT_ROI_SIGNAL = None DEFAULT_ROI_BACKGROUND = None -def get_roi_x_profile(image, roi): +def get_roi_x_profile(image, roi, invert=False): offset_x, size_x, offset_y, size_y = roi roi_image = image[offset_y:offset_y + size_y, offset_x:offset_x + size_x] - - return roi_image.sum(0).astype("int64") + img = roi_image.sum(0).astype("int64") + if invert: + return img[::-1] + else: + return img #_logger.warning("----- START ---- ") #pid = None @@ -38,17 +41,18 @@ def process_image(image, pulse_id, timestamp, x_axis, y_axis, parameters, bsdata image_property_name = parameters["camera_name"] roi_signal = parameters.get("roi_signal", DEFAULT_ROI_SIGNAL) roi_background = parameters.get("roi_background", DEFAULT_ROI_BACKGROUND) + invert = parameters.get("invert") processed_data[image_property_name + ".processing_parameters"] = json.dumps({"roi_signal": roi_signal, "roi_background": roi_background}) if roi_signal: - signal_profile = get_roi_x_profile(image, roi_signal) + signal_profile = get_roi_x_profile(image, roi_signal, invert) processed_data[image_property_name + ".roi_signal_x_profile"] = signal_profile processed_data[image_property_name + ".psen_signal_x_profile"] = signal_profile if roi_background: - processed_data[image_property_name + ".roi_background_x_profile"] = get_roi_x_profile(image, roi_background) - processed_data[image_property_name + ".bsen_signal_x_profile"] = get_roi_x_profile(image, roi_background) + processed_data[image_property_name + ".roi_background_x_profile"] = get_roi_x_profile(image, roi_background, invert) + processed_data[image_property_name + ".bsen_signal_x_profile"] = get_roi_x_profile(image, roi_background, invert) #sent = pid return processed_data \ No newline at end of file diff --git a/configuration/user_scripts/single_photon.c b/configuration/user_scripts/single_photon.c index 750b55b..81d2761 100644 --- a/configuration/user_scripts/single_photon.c +++ b/configuration/user_scripts/single_photon.c @@ -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 120 +#define MAX_NUM_EVENTS 400 #define EVENT_CHANNELS 7 double evt_p[EVENT_CHANNELS][MAX_NUM_EVENTS];