From db1afcd179d26c190b1d17a9aa1cce6865b09fe7 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 21 Jun 2021 17:27:36 +0200 Subject: [PATCH] June 2021 --- .../camera_config/SARES20-CAMS142-C1.json | 14 ++-- .../camera_config/SARES20-CAMS142-M3.json | 12 ++-- .../camera_config/SARES20-CAMS142-M5.json | 4 +- .../camera_config/SARES20-PROF141-M1.json | 2 +- .../camera_config/SATES24-CAMS161-M1.json | 9 ++- .../camera_config/SATOP11-PSCR086.json | 8 ++- configuration/camera_config/servers.json | 42 +++++------ configuration/camera_config/simulation_2.json | 6 +- .../SARES20-CAMS142-M5_psen_db.json | 4 +- .../pipeline_config/SARFE10-PSSS059_psss.json | 2 +- .../pipeline_config/permanent_instances.json | 3 +- configuration/pipeline_config/servers.json | 71 +++++++++++++------ 12 files changed, 103 insertions(+), 74 deletions(-) diff --git a/configuration/camera_config/SARES20-CAMS142-C1.json b/configuration/camera_config/SARES20-CAMS142-C1.json index 8337694..8941cab 100644 --- a/configuration/camera_config/SARES20-CAMS142-C1.json +++ b/configuration/camera_config/SARES20-CAMS142-C1.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 1661, - 1000, - 1680, - 1016 + 1310, + 1096, + 1331, + 1119 ], - "reference_marker_width": 1.0, - "reference_marker_height": 1.0, + "reference_marker_width": 21.0, + "reference_marker_height": 23.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, @@ -21,7 +21,7 @@ "name": "SARES20-CAMS142-C1", "source": "SARES20-CAMS142-C1", "alias": [ - "samplecam_sideview" + "camera (SARES20-CAMS142-C1)" ], "group": [ "Photonics", diff --git a/configuration/camera_config/SARES20-CAMS142-M3.json b/configuration/camera_config/SARES20-CAMS142-M3.json index 0350fa8..0249c3d 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": [ - 460, - 468, - 2087, - 1869 + 1894, + 1030, + 1905, + 1041 ], - "reference_marker_width": 2000.0, - "reference_marker_height": 2000.0, + "reference_marker_width": 15.0, + "reference_marker_height": 14.5, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SARES20-CAMS142-M5.json b/configuration/camera_config/SARES20-CAMS142-M5.json index 6a28914..8773bae 100644 --- a/configuration/camera_config/SARES20-CAMS142-M5.json +++ b/configuration/camera_config/SARES20-CAMS142-M5.json @@ -32,8 +32,8 @@ "roi_signal": [ 10, 2190, - 600, - 150 + 691, + 300 ], "roi_background": [ 10, diff --git a/configuration/camera_config/SARES20-PROF141-M1.json b/configuration/camera_config/SARES20-PROF141-M1.json index 314237c..80f962e 100644 --- a/configuration/camera_config/SARES20-PROF141-M1.json +++ b/configuration/camera_config/SARES20-PROF141-M1.json @@ -27,6 +27,6 @@ "Bernina" ], "alias": [ - "camera (SARES20-PROF141-M1)" + "camera_microscope (SARES20-PROF141-M1)" ] } \ No newline at end of file diff --git a/configuration/camera_config/SATES24-CAMS161-M1.json b/configuration/camera_config/SATES24-CAMS161-M1.json index 02288ce..8053fc9 100644 --- a/configuration/camera_config/SATES24-CAMS161-M1.json +++ b/configuration/camera_config/SATES24-CAMS161-M1.json @@ -2,11 +2,11 @@ "camera_calibration": { "reference_marker": [ 0, - 0, + 100, 100, 100 ], - "reference_marker_width": 100.0, + "reference_marker_width": 666.0, "reference_marker_height": 100.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 @@ -26,6 +26,5 @@ "Photonics", "Maloja" ], - "alias": [ - ] -} + "alias": [] +} \ No newline at end of file diff --git a/configuration/camera_config/SATOP11-PSCR086.json b/configuration/camera_config/SATOP11-PSCR086.json index 7f90420..45d7d29 100644 --- a/configuration/camera_config/SATOP11-PSCR086.json +++ b/configuration/camera_config/SATOP11-PSCR086.json @@ -14,9 +14,13 @@ "mirror_x": false, "mirror_y": false, "rotate": 0, + "roi": null, + "image_background": null, "source_type": "epics", "name": "SATOP11-PSCR086", "source": "SATOP11-PSCR086", - "group": ["Photonics"], + "group": [ + "Photonics" + ], "alias": [] -} +} \ No newline at end of file diff --git a/configuration/camera_config/servers.json b/configuration/camera_config/servers.json index 11c928c..d2684e7 100644 --- a/configuration/camera_config/servers.json +++ b/configuration/camera_config/servers.json @@ -1,50 +1,46 @@ { "http://sf-daqsync-01.psi.ch:8880": { "expanding": true, - "instances": [ - ] - }, - "http://sf-daqsync-09.psi.ch:8880": { - "expanding": true, - "instances": [ - ] - }, - "http://sf-daqsync-10.psi.ch:8880": { - "expanding": true, - "instances": [ - ] + "instances": [] }, "http://sf-daqsync-02.psi.ch:8880": { "expanding": false, "instances": [ - "SARFE10-PSSS059" + "SARFE10-PSSS059" ] }, "http://sf-daqsync-03.psi.ch:8880": { "expanding": false, - "instances": [ - ] + "instances": [] }, "http://sf-daqsync-04.psi.ch:8880": { "expanding": false, "instances": [ - "SATES21-CAMS154-M1", - "SATES24-CAMS161-M1" + "SATES21-CAMS154-M1", + "SATES24-CAMS161-M1" ] }, "http://sf-daqsync-05.psi.ch:8880": { "expanding": true, "instances": [ - "SARES11-SPEC125-M1", - "SARES11-SPEC125-M2" + "SARES11-SPEC125-M1", + "SARES11-SPEC125-M2" ] }, "http://sf-daqsync-06.psi.ch:8880": { "expanding": true, "instances": [ - "SARES20-CAMS142-M1", - "SARES20-CAMS142-M4", - "SARES20-CAMS142-M5" + "SARES20-CAMS142-M1", + "SARES20-CAMS142-M4", + "SARES20-CAMS142-M5" ] + }, + "http://sf-daqsync-09.psi.ch:8880": { + "expanding": true, + "instances": [] + }, + "http://sf-daqsync-10.psi.ch:8880": { + "expanding": true, + "instances": [] } -} +} \ No newline at end of file diff --git a/configuration/camera_config/simulation_2.json b/configuration/camera_config/simulation_2.json index addc607..279bb21 100644 --- a/configuration/camera_config/simulation_2.json +++ b/configuration/camera_config/simulation_2.json @@ -15,11 +15,11 @@ "mirror_y": false, "rotate": 0, "source_type": "simulation", - "name": "simulation_big", + "name": "simulation_2", "source": "", "frame_rate": 5, "size_x": 20, - "size_y":20, + "size_y": 20, "simulate_pulse_id": true, "image_type": "static_raw" -} +} \ 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 d3bd9a9..ba02636 100644 --- a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json +++ b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json @@ -13,8 +13,8 @@ "roi_signal": [ 300, 2040, - 480, - 200 + 300, + 100 ], "roi_background": [ 300, diff --git a/configuration/pipeline_config/SARFE10-PSSS059_psss.json b/configuration/pipeline_config/SARFE10-PSSS059_psss.json index a2e5f01..8e637f8 100644 --- a/configuration/pipeline_config/SARFE10-PSSS059_psss.json +++ b/configuration/pipeline_config/SARFE10-PSSS059_psss.json @@ -1,6 +1,6 @@ { "image_background_enable": true, - "image_background": "SARFE10-PSSS059:FPICTURE_11147675390_10", + "image_background": "SARFE10-PSSS059:FPICTURE_12044327802_100", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 5d98491..8982169 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -7,6 +7,7 @@ "SARES20-CAMS142-M1_psen_ib": "SARES20-CAMS142-M1_psen_ib1", "SARES20-CAMS142-M5_psen_db": "SARES20-CAMS142-M5_psen_db1", "SARES20-CAMS142-M5_psen_ib": "SARES20-CAMS142-M5_psen_ib1", + "SARES20-DSDPPRM_proc": "SARES20-DSDPPRM_proc", "SARES20-PROF141-M1_proc": "SARES20-PROF141-M1_proc1", "SARES20-PROF142-M1_ib": "SARES20-PROF142-M1_ib1", "SARES20-PROF142-M1_proc": "SARES20-PROF142-M1_proc1", @@ -19,5 +20,5 @@ "SATES21-CAMS154-M1_psen_ib": "SATES21-CAMS154-M1_psen_ib1", "SATES24-CAMS161-M1_psen_db": "SATES24-CAMS161-M1_psen_db1", "SATES24-CAMS161-M1_psen_ib": "SATES24-CAMS161-M1_psen_ib1", - "testdb_ib": "testdb_ib1" + "testdb_ib": "testdb_ib" } \ No newline at end of file diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index f3b5cfb..6ce00a2 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -4,16 +4,6 @@ "expanding": true, "instances": [] }, - "http://sf-daqsync-09.psi.ch:8881": { - "cameras": [], - "expanding": true, - "instances": [] - }, - "http://sf-daqsync-10.psi.ch:8881": { - "cameras": [], - "expanding": true, - "instances": [] - }, "http://sf-daqsync-02.psi.ch:8881": { "cameras": [ "SARFE10-PSSS059" @@ -25,26 +15,43 @@ ] }, "http://sf-daqsync-03.psi.ch:8881": { - "cameras": ["testdb","simulation_2"], + "cameras": [ + "testdb", + "simulation_2", + "simulation" + ], "expanding": false, - "instances": ["testdb_ib:9005", "simulation_2_sp", "SARFE10-PBPS053_proc:9004"] - }, + "instances": [ + "testdb_ib:9005", + "simulation_2_sp", + "SARFE10-PBPS053_proc:9004" + ] + }, "http://sf-daqsync-04.psi.ch:8881": { - "cameras": ["SATES21-CAMS154-M1", "SATES24-CAMS161-M1"], + "cameras": [ + "SATES21-CAMS154-M1", + "SATES24-CAMS161-M1" + ], "expanding": false, "instances": [ "bs_timing_test_perm:9000", - "SATES21-CAMS154-M1_sp", + "SATES21-CAMS154-M1_sp", "SATES21-CAMS154-M1_psen_ib:9000", "SATES21-CAMS154-M1_psen_db:9001", "SATES24-CAMS161-M1_sp", "SATES24-CAMS161-M1_psen_ib:9010", "SATES24-CAMS161-M1_psen_db:9011", - "SATES21-CAMS154-GIGE7_sp" + "SATES21-CAMS154-GIGE7_sp" ] }, "http://sf-daqsync-05.psi.ch:8881": { - "cameras": ["SARES11-SPEC125-M1", "SARES12-CAMS128-M1", "SARES11-SPEC125-M2", "Alvra_spatial_encoding", "Alvra_spectral_encoding"], + "cameras": [ + "SARES11-SPEC125-M1", + "SARES12-CAMS128-M1", + "SARES11-SPEC125-M2", + "Alvra_spatial_encoding", + "Alvra_spectral_encoding" + ], "expanding": false, "instances": [ "SARES11-SPEC125-M1_psen_ib:9000", @@ -56,7 +63,18 @@ ] }, "http://sf-daqsync-06.psi.ch:8881": { - "cameras": ["SARES20-CAMS142-M1", "SARES20-CAMS142-M4", "SARES20-CAMS142-M5", "Bernina_spectral_encoding", "Bernina_spatial_encoding", "SARES20-PROF142-M1", "SARES20-PROF141-M1", "SARES20-PROF146-M1" ,"SAROP21-PPRM138"], + "cameras": [ + "SARES20-CAMS142-M1", + "SARES20-CAMS142-M4", + "SARES20-CAMS142-M5", + "Bernina_spectral_encoding", + "Bernina_spatial_encoding", + "SARES20-PROF142-M1", + "SARES20-PROF141-M1", + "SARES20-PROF146-M1", + "SAROP21-PPRM138", + "SARES20-DSDPPRM" + ], "expanding": false, "instances": [ "SARES20-CAMS142-M1_psen_ib:9002", @@ -66,7 +84,7 @@ "SARES20-CAMS142-M5_psen_ib:9010", "SARES20-CAMS142-M5_psen_db:9011", "SARES20-PROF142-M1_sp", - "SARES20-PROF142-M1_ib:9005", + "SARES20-PROF142-M1_ib:9005", "SARES20-PROF142-M1_proc:9017", "SAROP21-PPRM138_proc:9015", "SAROP21-PPRM138_sp", @@ -74,8 +92,19 @@ "SARES20-PROF141-M1_proc:9016", "SARES20-PROF146-M1_sp", "SARES20-PROF146-M1_proc:9018", + "SARES20-DSDPPRM_proc:9014", "arrival_time_proc:9008", - "test_arrival" + "test_arrival" ] + }, + "http://sf-daqsync-09.psi.ch:8881": { + "cameras": [], + "expanding": true, + "instances": [] + }, + "http://sf-daqsync-10.psi.ch:8881": { + "cameras": [], + "expanding": true, + "instances": [] } -} +} \ No newline at end of file