From 3ea8e23e1fe1194b673392abae73a54640dc33eb Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Jan 2025 16:21:25 +0100 Subject: [PATCH] 01.2025 --- configuration/camera_config/ABRTL-DSCR-0440.json | 3 ++- configuration/camera_config/ABRTL-DSCR-0680.json | 3 ++- configuration/camera_config/ABRTL-DSCR-0870.json | 3 ++- configuration/camera_config/ALBDI-SM-1.json | 2 +- configuration/camera_config/ALBDI-SM-2.json | 2 +- configuration/camera_config/ALBDI-SM-3.json | 2 +- configuration/camera_config/ALBDI-SM-4.json | 2 +- configuration/camera_config/ALIDI-SM-3.json | 8 +++++++- configuration/camera_config/ALIDI-SM-4.json | 8 +++++++- configuration/camera_config/ALIDI-SM-5.json | 8 +++++++- configuration/camera_config/ALIDI-SM-E.json | 8 +++++++- configuration/camera_config/ARS01-DSCR-0750.json | 3 ++- configuration/camera_config/X01DD-FE-CAM1.json | 2 +- configuration/camera_config/X08DB-FE-CAM1.json | 2 +- .../{X09DA-FE-CCD1_sp.json => ALIDI-SM-3_proc.json} | 5 +++-- .../pipeline_config/ARS05-RCAM-0060_sp.json | 3 ++- .../pipeline_config/ARS05-RCAM-0140_sp.json | 3 ++- .../pipeline_config/ARS05-RCAM-0230_sp.json | 3 ++- .../pipeline_config/ARS05-RCAM-0310_sp.json | 3 ++- configuration/pipeline_config/X09DA-FE-CCD2_sp.json | 12 ------------ .../pipeline_config/permanent_instances.json | 2 +- 21 files changed, 54 insertions(+), 33 deletions(-) rename configuration/pipeline_config/{X09DA-FE-CCD1_sp.json => ALIDI-SM-3_proc.json} (71%) delete mode 100644 configuration/pipeline_config/X09DA-FE-CCD2_sp.json diff --git a/configuration/camera_config/ABRTL-DSCR-0440.json b/configuration/camera_config/ABRTL-DSCR-0440.json index 3277e91..7fdf9c4 100644 --- a/configuration/camera_config/ABRTL-DSCR-0440.json +++ b/configuration/camera_config/ABRTL-DSCR-0440.json @@ -1,4 +1,5 @@ { + "camera_calibration": null, "mirror_x": false, "mirror_y": false, "rotate": 0, @@ -9,6 +10,6 @@ "name": "ABRTL-DSCR-0440", "source": "ABRTL-DSCR-0440", "group": [ - "Booster2Ring" + "BTR" ] } \ No newline at end of file diff --git a/configuration/camera_config/ABRTL-DSCR-0680.json b/configuration/camera_config/ABRTL-DSCR-0680.json index cffd865..177e82a 100644 --- a/configuration/camera_config/ABRTL-DSCR-0680.json +++ b/configuration/camera_config/ABRTL-DSCR-0680.json @@ -1,4 +1,5 @@ { + "camera_calibration": null, "mirror_x": false, "mirror_y": false, "rotate": 0, @@ -9,6 +10,6 @@ "name": "ABRTL-DSCR-0680", "source": "ABRTL-DSCR-0680", "group": [ - "Booster2Ring" + "BTR" ] } \ No newline at end of file diff --git a/configuration/camera_config/ABRTL-DSCR-0870.json b/configuration/camera_config/ABRTL-DSCR-0870.json index 1a7fb37..4e3396a 100644 --- a/configuration/camera_config/ABRTL-DSCR-0870.json +++ b/configuration/camera_config/ABRTL-DSCR-0870.json @@ -1,4 +1,5 @@ { + "camera_calibration": null, "mirror_x": false, "mirror_y": false, "rotate": 0, @@ -9,6 +10,6 @@ "name": "ABRTL-DSCR-0870", "source": "ABRTL-DSCR-0870", "group": [ - "Booster2Ring" + "BTR" ] } \ No newline at end of file diff --git a/configuration/camera_config/ALBDI-SM-1.json b/configuration/camera_config/ALBDI-SM-1.json index 20363f4..0c11531 100644 --- a/configuration/camera_config/ALBDI-SM-1.json +++ b/configuration/camera_config/ALBDI-SM-1.json @@ -15,6 +15,6 @@ "enforce_pid": false, "enforce_timestamp": false, "group": [ - "Linac2Booster" + "LTB" ] } \ No newline at end of file diff --git a/configuration/camera_config/ALBDI-SM-2.json b/configuration/camera_config/ALBDI-SM-2.json index 3eea775..568d044 100644 --- a/configuration/camera_config/ALBDI-SM-2.json +++ b/configuration/camera_config/ALBDI-SM-2.json @@ -15,6 +15,6 @@ "enforce_pid": false, "enforce_timestamp": false, "group": [ - "Linac2Booster" + "LTB" ] } \ No newline at end of file diff --git a/configuration/camera_config/ALBDI-SM-3.json b/configuration/camera_config/ALBDI-SM-3.json index d448582..75695c6 100644 --- a/configuration/camera_config/ALBDI-SM-3.json +++ b/configuration/camera_config/ALBDI-SM-3.json @@ -16,6 +16,6 @@ "enforce_pid": false, "enforce_timestamp": false, "group": [ - "Linac2Booster" + "LTB" ] } \ No newline at end of file diff --git a/configuration/camera_config/ALBDI-SM-4.json b/configuration/camera_config/ALBDI-SM-4.json index ae81e6d..9dcda20 100644 --- a/configuration/camera_config/ALBDI-SM-4.json +++ b/configuration/camera_config/ALBDI-SM-4.json @@ -15,6 +15,6 @@ "enforce_pid": false, "enforce_timestamp": false, "group": [ - "Linac2Booster" + "LTB" ] } \ No newline at end of file diff --git a/configuration/camera_config/ALIDI-SM-3.json b/configuration/camera_config/ALIDI-SM-3.json index 3eff52a..937c00c 100644 --- a/configuration/camera_config/ALIDI-SM-3.json +++ b/configuration/camera_config/ALIDI-SM-3.json @@ -4,10 +4,16 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "prefix": "ALIDI-SM-3", "name": "ALIDI-SM-3", "source": "ALIDI-SM-3", + "connections": 1, + "buffer_size": 0, + "debug": false, + "check_timestamp": false, + "enforce_pid": false, + "enforce_timestamp": false, "group": [ "Linac" ] diff --git a/configuration/camera_config/ALIDI-SM-4.json b/configuration/camera_config/ALIDI-SM-4.json index fe05b7d..c0f18d2 100644 --- a/configuration/camera_config/ALIDI-SM-4.json +++ b/configuration/camera_config/ALIDI-SM-4.json @@ -4,10 +4,16 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "prefix": "ALIDI-SM-4", "name": "ALIDI-SM-4", "source": "ALIDI-SM-4", + "connections": 1, + "buffer_size": 0, + "debug": false, + "check_timestamp": false, + "enforce_pid": false, + "enforce_timestamp": false, "group": [ "Linac" ] diff --git a/configuration/camera_config/ALIDI-SM-5.json b/configuration/camera_config/ALIDI-SM-5.json index 134a90e..b0ab2d5 100644 --- a/configuration/camera_config/ALIDI-SM-5.json +++ b/configuration/camera_config/ALIDI-SM-5.json @@ -16,7 +16,13 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", + "connections": 1, + "buffer_size": 0, + "debug": false, + "check_timestamp": false, + "enforce_pid": false, + "enforce_timestamp": false, "prefix": "ALIDI-SM-5", "name": "ALIDI-SM-5", "source": "ALIDI-SM-5", diff --git a/configuration/camera_config/ALIDI-SM-E.json b/configuration/camera_config/ALIDI-SM-E.json index 5578102..3269dfa 100644 --- a/configuration/camera_config/ALIDI-SM-E.json +++ b/configuration/camera_config/ALIDI-SM-E.json @@ -4,10 +4,16 @@ "rotate": 0, "roi": null, "image_background": null, - "source_type": "epics", + "source_type": "bsread", "prefix": "ALIDI-SM-E", "name": "ALIDI-SM-E", "source": "ALIDI-SM-E", + "connections": 1, + "buffer_size": 0, + "debug": false, + "check_timestamp": false, + "enforce_pid": false, + "enforce_timestamp": false, "group": [ "Linac" ] diff --git a/configuration/camera_config/ARS01-DSCR-0750.json b/configuration/camera_config/ARS01-DSCR-0750.json index 094a718..afb829b 100644 --- a/configuration/camera_config/ARS01-DSCR-0750.json +++ b/configuration/camera_config/ARS01-DSCR-0750.json @@ -1,4 +1,5 @@ { + "camera_calibration": null, "mirror_x": false, "mirror_y": false, "rotate": 0, @@ -9,6 +10,6 @@ "name": "ARS01-DSCR-0750", "source": "ARS01-DSCR-0750", "group": [ - "Storage" + "Ring" ] } \ No newline at end of file diff --git a/configuration/camera_config/X01DD-FE-CAM1.json b/configuration/camera_config/X01DD-FE-CAM1.json index 8b55acb..ecce0b5 100644 --- a/configuration/camera_config/X01DD-FE-CAM1.json +++ b/configuration/camera_config/X01DD-FE-CAM1.json @@ -9,6 +9,6 @@ "name": "X01DD-FE-CAM1", "source": "X01DD-FE-CAM1", "group": [ - "Storage" + "Ring" ] } \ No newline at end of file diff --git a/configuration/camera_config/X08DB-FE-CAM1.json b/configuration/camera_config/X08DB-FE-CAM1.json index db9c925..0c6e493 100644 --- a/configuration/camera_config/X08DB-FE-CAM1.json +++ b/configuration/camera_config/X08DB-FE-CAM1.json @@ -9,6 +9,6 @@ "name": "X08DB-FE-CAM1", "source": "X08DB-FE-CAM1", "group": [ - "Storage" + "Ring" ] } \ No newline at end of file diff --git a/configuration/pipeline_config/X09DA-FE-CCD1_sp.json b/configuration/pipeline_config/ALIDI-SM-3_proc.json similarity index 71% rename from configuration/pipeline_config/X09DA-FE-CCD1_sp.json rename to configuration/pipeline_config/ALIDI-SM-3_proc.json index 79a7ab1..031589d 100644 --- a/configuration/pipeline_config/X09DA-FE-CCD1_sp.json +++ b/configuration/pipeline_config/ALIDI-SM-3_proc.json @@ -6,7 +6,8 @@ "image_good_region": null, "image_slices": null, "pipeline_type": "processing", - "camera_name": "X09DA-FE-CCD1", - "name": "X09DA-FE-CCD1_sp", + "camera_name": "ALIDI-SM-3", + "function": "epics_forwarder.py", + "name": "ALIDI-SM-3_proc", "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/ARS05-RCAM-0060_sp.json b/configuration/pipeline_config/ARS05-RCAM-0060_sp.json index 73df69d..ba801fe 100644 --- a/configuration/pipeline_config/ARS05-RCAM-0060_sp.json +++ b/configuration/pipeline_config/ARS05-RCAM-0060_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "ARS05-RCAM-0060", - "name": "ARS05-RCAM-0060_sp" + "name": "ARS05-RCAM-0060_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/ARS05-RCAM-0140_sp.json b/configuration/pipeline_config/ARS05-RCAM-0140_sp.json index 64636b0..7d6dfcb 100644 --- a/configuration/pipeline_config/ARS05-RCAM-0140_sp.json +++ b/configuration/pipeline_config/ARS05-RCAM-0140_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "ARS05-RCAM-0140", - "name": "ARS05-RCAM-0140_sp" + "name": "ARS05-RCAM-0140_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/ARS05-RCAM-0230_sp.json b/configuration/pipeline_config/ARS05-RCAM-0230_sp.json index 8c828ea..4ccc0eb 100644 --- a/configuration/pipeline_config/ARS05-RCAM-0230_sp.json +++ b/configuration/pipeline_config/ARS05-RCAM-0230_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "ARS05-RCAM-0230", - "name": "ARS05-RCAM-0230_sp" + "name": "ARS05-RCAM-0230_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/ARS05-RCAM-0310_sp.json b/configuration/pipeline_config/ARS05-RCAM-0310_sp.json index 6c6470e..92342fe 100644 --- a/configuration/pipeline_config/ARS05-RCAM-0310_sp.json +++ b/configuration/pipeline_config/ARS05-RCAM-0310_sp.json @@ -7,5 +7,6 @@ "image_slices": null, "pipeline_type": "processing", "camera_name": "ARS05-RCAM-0310", - "name": "ARS05-RCAM-0310_sp" + "name": "ARS05-RCAM-0310_sp", + "max_frame_rate": 10.1 } \ No newline at end of file diff --git a/configuration/pipeline_config/X09DA-FE-CCD2_sp.json b/configuration/pipeline_config/X09DA-FE-CCD2_sp.json deleted file mode 100644 index e9a893b..0000000 --- a/configuration/pipeline_config/X09DA-FE-CCD2_sp.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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": "X09DA-FE-CCD2", - "name": "X09DA-FE-CCD2_sp", - "max_frame_rate": 10.1 -} \ No newline at end of file diff --git a/configuration/pipeline_config/permanent_instances.json b/configuration/pipeline_config/permanent_instances.json index 8858b77..1d325f3 100644 --- a/configuration/pipeline_config/permanent_instances.json +++ b/configuration/pipeline_config/permanent_instances.json @@ -1,5 +1,4 @@ { - "#X09DA-FE-CCD1_sp": "X09DA-FE-CCD1_sp", "#emmitance_pipolar": "emmitance_pipolar", "#simulation_sp1": "simulation_sp", "ABODI-SM-1S1_proc": "ABODI-SM-1S1_proc", @@ -7,6 +6,7 @@ "ABRTL-DSCR-0440_proc": "ABRTL-DSCR-0440_proc", "ABRTL-DSCR-0680_proc": "ABRTL-DSCR-0680_proc", "ABRTL-DSCR-0870_proc": "ABRTL-DSCR-0870_proc", + "ALIDI-SM-3_proc": "ALIDI-SM-3_proc", "ALIDI-SM-4_proc": "ALIDI-SM-4_proc", "ALIDI-SM-5_proc": "ALIDI-SM-5_proc", "ALIDI-SM-E_proc": "ALIDI-SM-E_proc",