From 469a8a00afecca1e7f4a8a197f92f2e9e66a5ee6 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 Aug 2026 10:21:52 +0200 Subject: [PATCH] Cleaning permanent instances #1 --- .../camera_config/SARES20-PROF141-M1.json | 2 +- .../camera_config/SARES20-PROF146-M1.json | 2 +- .../camera_config/SATBD01-DSCR210.json | 8 ++-- .../pipeline_config/permanent_instances.json | 45 +++---------------- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/configuration/camera_config/SARES20-PROF141-M1.json b/configuration/camera_config/SARES20-PROF141-M1.json index a4ce519..8c25ab1 100644 --- a/configuration/camera_config/SARES20-PROF141-M1.json +++ b/configuration/camera_config/SARES20-PROF141-M1.json @@ -23,7 +23,7 @@ "forwarder_port": 9013, "_debug": true, "alias": [ - "PROF_KB (SARES20-PROF141-M1) (SARES20-PROF141-M1)" + "_PROF_KB_DEVICE (SARES20-PROF141-M1) (SARES20-PROF141-M1)" ], "group": [ "Laser", diff --git a/configuration/camera_config/SARES20-PROF146-M1.json b/configuration/camera_config/SARES20-PROF146-M1.json index c66b520..fb0651f 100644 --- a/configuration/camera_config/SARES20-PROF146-M1.json +++ b/configuration/camera_config/SARES20-PROF146-M1.json @@ -26,6 +26,6 @@ ], "forwarder_port": 9044, "alias": [ - "PROF_DSD (SARES20-PROF146-M1)(SARES20-PROF146-M1)" + "_PROF_DSD_DEVICE (SARES20-PROF146-M1)(SARES20-PROF146-M1)" ] } \ No newline at end of file diff --git a/configuration/camera_config/SATBD01-DSCR210.json b/configuration/camera_config/SATBD01-DSCR210.json index 84f0dd6..33e87cf 100644 --- a/configuration/camera_config/SATBD01-DSCR210.json +++ b/configuration/camera_config/SATBD01-DSCR210.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 1143, - 584, - 1474, - 1485 + 1197, + 609, + 1525, + 1494 ], "reference_marker_width": 6000.0, "reference_marker_height": 16000.0, diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 68efed4..469dd2c 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -1,18 +1,12 @@ { - "#AGalvotest1": "AGalvotest1", - "#AGalvotest2": "AGalvotest2", - "#Bernina_CEP_spatial_midIR_analysis": "Bernina_CEP_spatial_midIR_analysis", - "#Bernina_CEP_spatial_midIR_pvs": "Bernina_CEP_spatial_midIR_pvs", - "#Bernina_mid_IR_CEP_analysis": "Bernina_mid_IR_CEP_analysis", - "#Bernina_mid_IR_CEP_populate_pvs": "Bernina_mid_IR_CEP_populate_pvs", - "#Bernina_mid_IR_CEP_projection": "Bernina_mid_IR_CEP_projection", - "#Bernina_tt_kb_populate_pvs": "Bernina_tt_kb_populate_pvs", - "#Bernina_tt_kb_restart_cam": "Bernina_tt_kb_restart_cam", "#S10BC02-DSRM310_profiles": "S10BC02-DSRM310_profiles", + "#SARBD02-DSCR050_pref": "SARBD02-DSCR050_pref", + "#SARBD02-DSCR050_sp": "SARBD02-DSCR050_sp", + "#SARBD02-DSCR051_pref": "SARBD02-DSCR051_pref", + "#SARBD02-DSCR051_sp": "SARBD02-DSCR051_sp", + "#SARBD02-DSCR05x_merge": "SARBD02-DSCR05x_merge", "#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", @@ -42,43 +36,15 @@ "#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", "#SATOP21-PMOS127-2D_pmos": "SATOP21-PMOS127-2D_pmos", "#SATOP31-ATT01_proc": "SATOP31-ATT01_proc", "#SINBC02-DSRM310_profiles": "SINBC02-DSRM310_profiles", "#SLAAR21-LCAM-CS841_proc": "SLAAR21-LCAM-CS841_proc", "#SLG-LCAM-C103_proc": "SLG-LCAM-C103_proc", - "#SLG-LCAM-C103_sp": "SLG-LCAM-C103_sp", - "#jungfrau_proc": "jungfrau_proc", - "#simulation_3_proc": "simulation_3_proc", - "#simulation_3_sp": "simulation_3_sp", - "#simulation_4_sp": "simulation_4_sp", - "#simulation_sp": "simulation_sp", - "#test_dispatcher_waveforms": "test_dispatcher_waveforms", - "#test_furka": "test_furka", - "#test_furka_proc": "test_furka_proc", - "#test_ivan": "test_ivan", - "#test_load_file": "test_load_file", - "#test_merge": "test_merge", - "#test_merge_disp_sp": "test_merge_disp_sp", - "#test_proc_with_bs": "test_proc_with_bs", - "#test_str": "test_str", - "#test_stream": "test_stream", - "#test_tadej": "test_tadej", - "#testdb_ib": "testdb_ib", - "S10BC02-DSRM310_sp": "S10BC02-DSRM310_sp", "S10BD01-DSCR030_profiles": "S10BD01-DSCR030_profiles", - "SARBD01-DSCR110_sp1": "SARBD01-DSCR110_sp_rep", - "SARBD02-DSCR050_pref": "SARBD02-DSCR050_pref", - "SARBD02-DSCR050_sp": "SARBD02-DSCR050_sp", - "SARBD02-DSCR051_pref": "SARBD02-DSCR051_pref", - "SARBD02-DSCR051_sp": "SARBD02-DSCR051_sp", - "SARBD02-DSCR05x_merge": "SARBD02-DSCR05x_merge", "SARCL01-DSCR170_profiles": "SARCL01-DSCR170_profiles", "SARES11-SPEC125-M1_psen_db": "SARES11-SPEC125-M1_psen_db", "SARES11-SPEC125-M2_db": "SARES11-SPEC125-M2_db", - "SARES11-SPEC125-M2_sp": "SARES11-SPEC125-M2_sp", "SARES20-CAMS142-C1_fb": "SARES20-CAMS142-C1_fb", "SARES20-CAMS142-C2_fb": "SARES20-CAMS142-C2_fb", "SARES20-CAMS142-M3_proc": "SARES20-CAMS142-M3_proc", @@ -117,7 +83,6 @@ "SATES30-RIXS-CAM01_fit": "SATES30-RIXS-CAM01_fit", "SATES30-RIXS-CAM01_proc": "SATES30-RIXS-CAM01_proc", "SATES30-RIXS-CAM01_repeater": "SATES30-RIXS-CAM01_repeater", - "SATES30-RIXS-CAM01_sp": "SATES30-RIXS-CAM01_sp", "SATES31-CAMS187-PCO2_proc": "SATES31-CAMS187-PCO2_proc", "SATES31-CAMS187-RIXS1_proc": "SATES31-CAMS187-RIXS1_proc", "SATES31-CAMS187-RIXS1_proc_db_proxy": "SATES31-CAMS187-RIXS1_proc_db_proxy",