From a2f9af5d0324bd3a677a92d9fd74a1d84973f826 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Jun 2023 10:39:16 +0200 Subject: [PATCH] Before adding repeater to sf-daqsync-03 --- .../camera_config/SARES20-CAMS142-C1.json | 8 +++--- .../camera_config/SARES20-CAMS142-C2.json | 4 +-- .../camera_config/SARES20-CAMS142-C3.json | 8 +++--- .../camera_config/SATES30-CAMS182-GIGE4.json | 16 ++++++++++++ configuration/camera_config/simulation_3.json | 3 ++- .../SATES21-CAMS-PATT1_spec_db.json | 26 +++---------------- .../SATES21-CAMS154-M1_spec_db.json | 14 +++++----- .../SATES30-CAMS182-GIGE4_sp.json | 11 ++++++++ .../pipeline_config/new_camera_name_sp.json | 11 ++++++++ .../pipeline_config/permanent_instances.json | 1 + configuration/pipeline_config/servers.json | 4 ++- .../pipeline_config/simulation_3_proc.json | 14 ++++++++++ .../pipeline_config/simulation_sp.json | 15 ++++++++--- .../pipeline_config/test_load_file.json | 18 +++++++++++++ 14 files changed, 108 insertions(+), 45 deletions(-) create mode 100644 configuration/camera_config/SATES30-CAMS182-GIGE4.json create mode 100644 configuration/pipeline_config/SATES30-CAMS182-GIGE4_sp.json create mode 100644 configuration/pipeline_config/new_camera_name_sp.json create mode 100644 configuration/pipeline_config/simulation_3_proc.json create mode 100644 configuration/pipeline_config/test_load_file.json diff --git a/configuration/camera_config/SARES20-CAMS142-C1.json b/configuration/camera_config/SARES20-CAMS142-C1.json index bf43bd2..3c6263d 100644 --- a/configuration/camera_config/SARES20-CAMS142-C1.json +++ b/configuration/camera_config/SARES20-CAMS142-C1.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 1266, - 1337, - 1367, - 1438 + 1141, + 1025, + 1242, + 1127 ], "reference_marker_width": 23.5, "reference_marker_height": 21.2, diff --git a/configuration/camera_config/SARES20-CAMS142-C2.json b/configuration/camera_config/SARES20-CAMS142-C2.json index f4f42e9..7b41d97 100644 --- a/configuration/camera_config/SARES20-CAMS142-C2.json +++ b/configuration/camera_config/SARES20-CAMS142-C2.json @@ -1,9 +1,9 @@ { "camera_calibration": { "reference_marker": [ - 1029, + 1026, 842, - 1034, + 1036, 852 ], "reference_marker_width": 50.0, diff --git a/configuration/camera_config/SARES20-CAMS142-C3.json b/configuration/camera_config/SARES20-CAMS142-C3.json index c3c145d..2e00db0 100644 --- a/configuration/camera_config/SARES20-CAMS142-C3.json +++ b/configuration/camera_config/SARES20-CAMS142-C3.json @@ -1,10 +1,10 @@ { "camera_calibration": { "reference_marker": [ - 880, - 585, - 980, - 686 + 926, + 621, + 935, + 637 ], "reference_marker_width": 9.0, "reference_marker_height": 16.0, diff --git a/configuration/camera_config/SATES30-CAMS182-GIGE4.json b/configuration/camera_config/SATES30-CAMS182-GIGE4.json new file mode 100644 index 0000000..0f355b0 --- /dev/null +++ b/configuration/camera_config/SATES30-CAMS182-GIGE4.json @@ -0,0 +1,16 @@ +{ + "camera_calibration": null, + "mirror_x": true, + "mirror_y": false, + "rotate": 0, + "roi": null, + "image_background": null, + "source_type": "epics", + "source": "SATES30-CAMS182-GIGE4", + "name": "SATES30-CAMS182-GIGE4", + "prefix": "SATES30-CAMS182-GIGE4", + "group": [ + "Photonics", + "Furka" + ] +} \ No newline at end of file diff --git a/configuration/camera_config/simulation_3.json b/configuration/camera_config/simulation_3.json index ece991f..e251c4b 100644 --- a/configuration/camera_config/simulation_3.json +++ b/configuration/camera_config/simulation_3.json @@ -19,5 +19,6 @@ "source": "", "dtype": "uint16", "frame_rate": 2, - "protocol": "tcp" + "protocol": "tcp", + "simulate_pulse_id": true } \ 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 7be9aa7..227ca63 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_20230607_073009_718877", + "image_background": "SATES21-CAMS-PATT1_20230611_074429_793478", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -14,28 +14,10 @@ "processing_threads": 4, "thread_buffer_size": 30, "multiprocessing": false, - "project_axis": 0, "no_client_timeout": 0, "port": "9003", - "threshold": 20, - "roi_background": [ - 0, - 1154, - 0, - 1280 - ], - "roi_signal": [ - 0, - 1154, - 0, - 1280 - ], - "roi_radial": [ - 0, - 1154, - 0, - 1280 - ], - "radial_x0": "550", + "threshold": "12", + "project_axis": "0", + "radial_x0": "587", "radial_y0": "550" } \ 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 03cf984..56f860a 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_20230607_091358_573996", + "image_background": "SATES21-CAMS154-M1_20230611_061851_522487", "image_threshold": null, "image_region_of_interest": null, "image_good_region": null, @@ -14,16 +14,16 @@ "thread_buffer_size": 30, "project_axis": 0, "roi_signal": [ - 251, - 470, + 323, + 526, 0, - 2516 + 2523 ], "threshold": 5, "roi_background": [ - 251, - 470, + 323, + 526, 0, - 2516 + 2523 ] } \ 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 new file mode 100644 index 0000000..33b525f --- /dev/null +++ b/configuration/pipeline_config/SATES30-CAMS182-GIGE4_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": "SATES30-CAMS182-GIGE4", + "name": "SATES30-CAMS182-GIGE4_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/new_camera_name_sp.json b/configuration/pipeline_config/new_camera_name_sp.json new file mode 100644 index 0000000..d5255a0 --- /dev/null +++ b/configuration/pipeline_config/new_camera_name_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": "new_camera_name", + "name": "new_camera_name_sp" +} \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 53f7932..2cc21fc 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -66,6 +66,7 @@ "SLAAR21-LCAM-CS844_proc": "SLAAR21-LCAM-CS844_proc", "SLAAR21-LCAM-CT1C1_proc": "SLAAR21-LCAM-CT1C1_proc", "SLAAR21-LCAM-CT1C2_proc": "SLAAR21-LCAM-CT1C2_proc", + "simulation_3_proc": "simulation_3_proc", "simulation_sp1": "simulation_sp", "test_furka": "test_furka", "test_tadej": "test_tadej" diff --git a/configuration/pipeline_config/servers.json b/configuration/pipeline_config/servers.json index 8db0b7f..26bfe37 100644 --- a/configuration/pipeline_config/servers.json +++ b/configuration/pipeline_config/servers.json @@ -53,6 +53,7 @@ }, "http://sf-daqsync-08.psi.ch:8881": { "cameras": [ + "simulation_3", "simulation_2", "simulation", "alain" @@ -60,6 +61,7 @@ "enabled": true, "expanding": false, "instances": [ + "simulation_3_proc:10020", "simulation_2_sp", "simulation2_sp", "test_alain_100Hz:9010", @@ -67,7 +69,7 @@ "test_str:9000", "simulation_proc", "test_merge:9001", - "test_furka" + "test_furka:10002" ] }, "http://sf-daqsync-09.psi.ch:8881": { diff --git a/configuration/pipeline_config/simulation_3_proc.json b/configuration/pipeline_config/simulation_3_proc.json new file mode 100644 index 0000000..f1c5aa6 --- /dev/null +++ b/configuration/pipeline_config/simulation_3_proc.json @@ -0,0 +1,14 @@ +{ + "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": "simulation_3", + "name": "simulation_3_proc", + "mode": "PUSH", + "block": false, + "function": "pprm_simple" +} \ No newline at end of file diff --git a/configuration/pipeline_config/simulation_sp.json b/configuration/pipeline_config/simulation_sp.json index 3de278d..9bfe166 100644 --- a/configuration/pipeline_config/simulation_sp.json +++ b/configuration/pipeline_config/simulation_sp.json @@ -9,14 +9,21 @@ 159 ], "image_good_region": { - "threshold": 0.1, - "gfscale": 3.0 + "threshold": 0.7, + "gfscale": 8 + }, + "image_slices": { + "number_of_slices": 22, + "scale": 4, + "orientation": "horizontal" }, - "image_slices": null, "pipeline_type": "processing", "camera_name": "simulation", "name": "simulation_sp", "reload": true, "function": "beam_full_width", - "fw_threshold": 0.3 + "fw_threshold": 0.3, + "no_client_timeout": 0, + "image_background_subtraction": true, + "slice_orientation": "horizontal" } \ No newline at end of file diff --git a/configuration/pipeline_config/test_load_file.json b/configuration/pipeline_config/test_load_file.json new file mode 100644 index 0000000..445206a --- /dev/null +++ b/configuration/pipeline_config/test_load_file.json @@ -0,0 +1,18 @@ +{ + "image_background_enable": false, + "image_background": "SATES30-RIXS-CAM01_20230602_115820_621889", + "image_threshold": null, + "image_region_of_interest": null, + "image_good_region": null, + "image_slices": null, + "pipeline_type": "processing", + "_camera_name": "SATES30-RIXS-CAM01", + "camera_name": "SATES31-CAMS187-RIXS1", + "name": "test_load_file", + "function": "test_load_file.c", + "mode": "PUB", + "threshold": 10.0, + "max_frame_rate": 5.1, + "libs": "threshold_2d_start600_800.txt", + "reload": true +} \ No newline at end of file