October 2020

2020-10-13 11:12:02 +02:00
parent 212b144abe
commit ddaf7fd3ef
29 changed files with 228 additions and 208 deletions
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
-EPICS_CA_ADDR_LIST=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255 129.129.242.255 129.129.243.255
+EPICS_CA_ADDR_LIST=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255 172.27.0.255 129.129.242.255 129.129.243.255
 EPICS_CA_AUTO_ADDR_LIST=NO
 EPICS_CA_MAX_ARRAY_BYTES=40000000
--- a/configuration/camera_config/Bernina_DSD_screen.json
+++ b/configuration/camera_config/Bernina_DSD_screen.json
@@ -1,10 +1,10 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   0,
-   0,
-   100,
-   100
+   516,
+   491,
+   601,
+   630
  ],
  "reference_marker_width": 100.0,
  "reference_marker_height": 100.0,
--- a/configuration/camera_config/Bernina_spatial_encoding.json
+++ b/configuration/camera_config/Bernina_spatial_encoding.json
@@ -1,20 +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": "Bernina_spatial_encoding",
- "source": "SARES20-CAMS142-M4"
-}
--- a/configuration/camera_config/SARES11-SPEC125-M1.json
+++ b/configuration/camera_config/SARES11-SPEC125-M1.json
@@ -17,5 +17,7 @@
 "source_type": "bsread",
 "name": "SARES11-SPEC125-M1",
 "prefix": "SARES11-SPEC125-M1",
- "source": "SARES11-SPEC125-M1"
+ "source": "SARES11-SPEC125-M1",
+ "connections": 4,
+ "buffer_size": 100
 }
--- a/configuration/camera_config/SARES11-SPEC125-M2.json
+++ b/configuration/camera_config/SARES11-SPEC125-M2.json
@@ -17,5 +17,7 @@
 "source_type": "bsread",
 "name": "SARES11-SPEC125-M2",
 "prefix": "SARES11-SPEC125-M2",
- "source": "SARES11-SPEC125-M2"
+ "source": "SARES11-SPEC125-M2",
+ "connections":4,
+ "buffer_size": 100
 }
--- a/configuration/camera_config/SARES20-CAMS142-C1.json
+++ b/configuration/camera_config/SARES20-CAMS142-C1.json
@@ -1,21 +0,0 @@
-{
- "camera_calibration": {
-  "reference_marker": [
-   774,
-   615,
-   825,
-   667
-  ],
-  "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": 3,
- "source_type": "epics",
- "name": "SARES20-CAMS142-C1",
- "source": "SARES20-CAMS142-C1",
- "prefix": "SARES20-CAMS142-C1"
-}
--- a/configuration/camera_config/SARES20-CAMS142-C2.json
+++ b/configuration/camera_config/SARES20-CAMS142-C2.json
@@ -1,19 +1,21 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   1432,
-   861,
-   1456,
-   886
+   951,
+   1077,
+   972,
+   1093
  ],
-  "reference_marker_width": 369.0,
-  "reference_marker_height": 415.0,
+  "reference_marker_width": 1.0,
+  "reference_marker_height": 1.0,
  "angle_horizontal": 0.0,
  "angle_vertical": 0.0
 },
- "mirror_x": false,
+ "mirror_x": true,
 "mirror_y": false,
- "rotate": 0,
+ "rotate": 1,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "prefix": "SARES20-CAMS142-C2",
 "name": "SARES20-CAMS142-C2",
--- a/configuration/camera_config/SARES20-CAMS142-C3.json
+++ b/configuration/camera_config/SARES20-CAMS142-C3.json
@@ -3,6 +3,8 @@
 "mirror_x": false,
 "mirror_y": false,
 "rotate": 0,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "prefix": "SARES20-CAMS142-C3",
 "name": "SARES20-CAMS142-C3",
--- a/configuration/camera_config/SARES20-CAMS142-M1.json
+++ b/configuration/camera_config/SARES20-CAMS142-M1.json
@@ -1,19 +1,21 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   318,
-   133,
-   418,
-   233
+   836,
+   1137,
+   954,
+   1309
  ],
-  "reference_marker_width": 73.0,
-  "reference_marker_height": 73.0,
+  "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",
 "prefix": "SARES20-CAMS142-M1",
 "name": "SARES20-CAMS142-M1",
--- a/configuration/camera_config/SARES20-CAMS142-M2.json
+++ b/configuration/camera_config/SARES20-CAMS142-M2.json
@@ -1,19 +1,21 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   1440,
-   1148,
-   1455,
-   1161
+   1251,
+   983,
+   1352,
+   1083
  ],
-  "reference_marker_width": 40.625,
-  "reference_marker_height": 47.92,
+  "reference_marker_width": 103.0,
+  "reference_marker_height": 75.0,
  "angle_horizontal": 0.0,
  "angle_vertical": 0.0
 },
- "mirror_x": false,
- "mirror_y": true,
+ "mirror_x": true,
+ "mirror_y": false,
 "rotate": 0,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "prefix": "SARES20-CAMS142-M2",
 "name": "SARES20-CAMS142-M2",
--- a/configuration/camera_config/SARES20-CAMS142-M3.json
+++ b/configuration/camera_config/SARES20-CAMS142-M3.json
@@ -1,19 +1,21 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   924,
-   997,
-   936,
-   1005
+   460,
+   539,
+   487,
+   546
  ],
-  "reference_marker_width": 500.0,
-  "reference_marker_height": 500.0,
+  "reference_marker_width": 3000.0,
+  "reference_marker_height": 3000.0,
  "angle_horizontal": 0.0,
  "angle_vertical": 0.0
 },
 "mirror_x": false,
- "mirror_y": false,
+ "mirror_y": true,
 "rotate": 0,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "prefix": "SARES20-CAMS142-M3",
 "name": "SARES20-CAMS142-M3",
--- a/configuration/camera_config/SARES20-CAMS142-M4.json
+++ b/configuration/camera_config/SARES20-CAMS142-M4.json
@@ -17,5 +17,7 @@
 "source_type": "bsread",
 "prefix": "SARES20-CAMS142-M4",
 "name": "SARES20-CAMS142-M4",
- "source": "SARES20-CAMS142-M4"
-}
+ "source": "SARES20-CAMS142-M4",
+ "connections": 4,
+ "buffer_size": 100
+}
--- a/configuration/camera_config/SARES20-CAMS142-M5.json
+++ b/configuration/camera_config/SARES20-CAMS142-M5.json
@@ -17,5 +17,7 @@
 "source_type": "bsread",
 "prefix": "SARES20-CAMS142-M5",
 "name": "SARES20-CAMS142-M5",
- "source": "SARES20-CAMS142-M5"
+ "source": "SARES20-CAMS142-M5",
+ "connections": 4,
+ "buffer_size": 100
 }
--- a/configuration/camera_config/SARES20-PROF142-M1.json
+++ b/configuration/camera_config/SARES20-PROF142-M1.json
@@ -11,9 +11,11 @@
  "angle_horizontal": 0.0,
  "angle_vertical": 0.0
 },
- "mirror_x": true,
- "mirror_y": true,
+ "mirror_x": false,
+ "mirror_y": false,
 "rotate": 0,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "name": "SARES20-PROF142-M1",
 "prefix": "SARES20-PROF142-M1",
--- a/configuration/camera_config/SARFE10-PSSS059.json
+++ b/configuration/camera_config/SARFE10-PSSS059.json
@@ -14,8 +14,12 @@
 "mirror_x": false,
 "mirror_y": false,
 "rotate": 0,
- "source_type": "epics",
+ "roi": null,
+ "image_background": null,
+ "source_type": "bsread",
 "prefix": "SARFE10-PSSS059",
 "source": "SARFE10-PSSS059",
- "name": "SARFE10-PSSS059"
-}
+ "name": "SARFE10-PSSS059",
+ "connections": 4,
+ "buffer_size": 100
+}
--- a/configuration/camera_config/SAROP21-PPRM102.json
+++ b/configuration/camera_config/SAROP21-PPRM102.json
@@ -1,13 +1,13 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   360,
-   225,
-   374,
-   242
+   250,
+   215,
+   264,
+   237
  ],
-  "reference_marker_width": 200.0,
-  "reference_marker_height": 200.0,
+  "reference_marker_width": 300.0,
+  "reference_marker_height": 300.0,
  "angle_horizontal": 21.0,
  "angle_vertical": 0.0
 },
--- a/configuration/camera_config/SAROP21-PPRM138.json
+++ b/configuration/camera_config/SAROP21-PPRM138.json
@@ -1,19 +1,21 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   333,
-   279,
-   362,
-   312
+   332,
+   276,
+   367,
+   319
  ],
-  "reference_marker_width": 400.0,
-  "reference_marker_height": 400.0,
+  "reference_marker_width": 500.0,
+  "reference_marker_height": 500.0,
  "angle_horizontal": 21.0,
  "angle_vertical": 0.0
 },
 "mirror_x": true,
 "mirror_y": false,
 "rotate": 0,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "name": "SAROP21-PPRM138",
 "source": "SAROP21-PPRM138"
--- a/configuration/camera_config/SATFE10-PSCR066.json
+++ b/configuration/camera_config/SATFE10-PSCR066.json
@@ -1,19 +1,20 @@
 {
-    "name": "SATFE10-PSCR066",
-    "camera_calibration": {
-        "angle_horizontal": 0.0,
-        "angle_vertical": 0.0,
-        "reference_marker_height": 100.0,
-        "reference_marker": [
-            0,
-            0,
-            100,
-            100
-        ],
-        "reference_marker_width": 100.0
-    },
-    "source": "SATFE10-PSCR066",
-    "mirror_y": false,
-    "rotate": 0,
-    "mirror_x": false
-}
+ "camera_calibration": {
+  "reference_marker": [
+   141,
+   74,
+   570,
+   433
+  ],
+  "reference_marker_width": 12000.0,
+  "reference_marker_height": 10000.0,
+  "angle_horizontal": 0.0,
+  "angle_vertical": 0.0
+ },
+ "mirror_x": false,
+ "mirror_y": false,
+ "rotate": 0,
+ "source_type": "epics",
+ "name": "SATFE10-PSCR066",
+ "source": "SATFE10-PSCR066"
+}
--- a/configuration/camera_config/SATFE10-PSCR070.json
+++ b/configuration/camera_config/SATFE10-PSCR070.json
@@ -1,19 +1,20 @@
 {
-    "name": "SATFE10-PSCR070",
-    "camera_calibration": {
-        "angle_horizontal": 0.0,
-        "angle_vertical": 0.0,
-        "reference_marker_height": 100.0,
-        "reference_marker": [
-            0,
-            0,
-            100,
-            100
-        ],
-        "reference_marker_width": 100.0
-    },
-    "source": "SATFE10-PSCR070",
-    "mirror_y": false,
-    "rotate": 0,
-    "mirror_x": false
-}
+ "camera_calibration": {
+  "reference_marker": [
+   76,
+   142,
+   543,
+   466
+  ],
+  "reference_marker_width": 13000.0,
+  "reference_marker_height": 9000.0,
+  "angle_horizontal": 0.0,
+  "angle_vertical": 0.0
+ },
+ "mirror_x": false,
+ "mirror_y": false,
+ "rotate": 0,
+ "source_type": "epics",
+ "name": "SATFE10-PSCR070",
+ "source": "SATFE10-PSCR070"
+}
--- a/configuration/camera_config/SATSY03-DLAC080-CAM1.json
+++ b/configuration/camera_config/SATSY03-DLAC080-CAM1.json
@@ -1,19 +1,21 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   594,
-   339,
-   965,
-   712
+   606,
+   412,
+   777,
+   583
  ],
-  "reference_marker_width": 3000.0,
-  "reference_marker_height": 3000.0,
+  "reference_marker_width": 200.0,
+  "reference_marker_height": 200.0,
  "angle_horizontal": 0.0,
  "angle_vertical": 0.0
 },
 "mirror_x": true,
 "mirror_y": true,
 "rotate": 0,
+ "roi": null,
+ "image_background": null,
 "source_type": "epics",
 "name": "SATSY03-DLAC080-CAM1",
 "source": "SATSY03-DLAC080-CAM1"
--- a/configuration/camera_config/SLG-LCAM-C103.json
+++ b/configuration/camera_config/SLG-LCAM-C103.json
@@ -1,13 +1,13 @@
 {
 "camera_calibration": {
  "reference_marker": [
-   839,
-   175,
-   908,
-   252
+   119,
+   103,
+   170,
+   154
  ],
-  "reference_marker_width": 951.0,
-  "reference_marker_height": 1061.0,
+  "reference_marker_width": 703.0,
+  "reference_marker_height": 703.0,
  "angle_horizontal": 0.0,
  "angle_vertical": 0.0
 },
--- a/configuration/camera_config/new_camera_name.json
+++ b/configuration/camera_config/new_camera_name.json
@@ -15,6 +15,6 @@
 "mirror_y": false,
 "rotate": 0,
 "source_type": "epics",
- "source": "SLAAR21-LCAM-C561",
+ "source": "SLG-LCAM-C041",
 "name": "new_camera_name"
-}
+}
--- a/configuration/camera_config/servers.json
+++ b/configuration/camera_config/servers.json
@@ -4,14 +4,17 @@
        "instances": [
 	]
    },
-    "http://sf-daqsync-03.psi.ch:8880": {
-        "expanding": true,
+    "http://sf-daqsync-02.psi.ch:8880": {
+        "expanding": false,
        "instances": [
+                "SARFE10-PSSS059"
        ]
    },
    "http://sf-daqsync-04.psi.ch:8880": {
-        "expanding": true,
+        "expanding": false,
        "instances": [
+                "SATES21-CAMS154-M1",
+                "SATES24-CAMS161-M1"
        ]
    },
    "http://sf-daqsync-05.psi.ch:8880": {
@@ -22,10 +25,10 @@
        ]
    },
    "http://sf-daqsync-06.psi.ch:8880": {
-        "expanding": false,
+        "expanding": true,
        "instances": [
-                "SARES20-CAMS142-M4",
-                "SARES20-CAMS142-M5"
+		"SARES20-CAMS142-M4",
+		"SARES20-CAMS142-M5"
        ]
    }
 }
--- a/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json
+++ b/configuration/pipeline_config/SARES11-SPEC125-M1_psen_db.json
@@ -11,15 +11,15 @@
 "name": "SARES11-SPEC125-M1_psen_db",
 "mode": "PUSH",
 "roi_signal": [
-  0,
-  2048,
-  270,
-  60
+  760,
+  100,
+  1100,
+  100
 ],
 "roi_background": [
-  0,
-  2048,
-  200,
-  150
+  760,
+  100,
+  1900,
+  100
 ]
 }
--- a/configuration/pipeline_config/SARES11-SPEC125-M2_psen_db.json
+++ b/configuration/pipeline_config/SARES11-SPEC125-M2_psen_db.json
@@ -11,15 +11,15 @@
 "name": "SARES11-SPEC125-M2_psen_db",
 "mode": "PUSH",
 "roi_background": [
-  300,
-  2048,
-  600,
-  400
+  0,
+  2047,
+  25,
+  200
 ],
 "roi_signal": [
-  300,
-  2048,
-  1150,
-  400
+  0,
+  2047,
+  500,
+  200
 ]
 }
--- a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json
+++ b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json
@@ -11,15 +11,17 @@
 "name": "SARES20-CAMS142-M5_psen_db",
 "mode": "PUSH",
 "roi_signal": [
-  10,
-  2190,
-  760,
-  140
+  0,
+  2049,
+  350,
+  500
 ],
 "roi_background": [
-  10,
-  2190,
-  570,
-  140
- ]
+  0,
+  2049,
+  0,
+  200
+ ],
+ "no_client_timeout": 0,
+ "port": "9011"
 }
--- a/configuration/pipeline_config/SARES20-CAMS142-M5_psen_ib.json
+++ b/configuration/pipeline_config/SARES20-CAMS142-M5_psen_ib.json
@@ -8,5 +8,17 @@
 "pipeline_type": "store",
 "camera_name": "SARES20-CAMS142-M5",
 "name": "SARES20-CAMS142-M5_psen_ib",
- "stream_port": 0
-}
+ "stream_port": 0,
+ "roi_signal": [
+  10,
+  2190,
+  650,
+  150
+ ],
+ "roi_background": [
+  10,
+  2190,
+  850,
+  150
+ ]
+}
--- a/configuration/pipeline_config/permanent_instances.json
+++ b/configuration/pipeline_config/permanent_instances.json
@@ -7,5 +7,10 @@
    "SARES20-CAMS142-M4_psen_ib": "SARES20-CAMS142-M4_psen_ib1",
    "SARES20-CAMS142-M5_psen_db": "SARES20-CAMS142-M5_psen_db1",
    "SARES20-CAMS142-M5_psen_ib": "SARES20-CAMS142-M5_psen_ib1",
-    "bs_timing_test_perm": "bs_timing_test_perm1"
+    "SARFE10-PSSS059_psss": "SARFE10-PSSS059_psss1",
+    "SARFE10-PSSS059_store": "SARFE10-PSSS059_store1",
+    "SATES21-CAMS154-M1_psen_db": "SATES21-CAMS154-M1_psen_db1",
+    "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"
 }
--- a/configuration/pipeline_config/servers.json
+++ b/configuration/pipeline_config/servers.json
@@ -1,46 +1,55 @@
 {
    "http://sf-daqsync-01.psi.ch:8881": {
-        "cameras": [
-        ],
+        "cameras": [],
        "expanding": true,
+        "instances": []
+    },
+    "http://sf-daqsync-02.psi.ch:8881": {
+        "cameras": [
+            "SARFE10-PSSS059"
+        ],
+        "expanding": false,
        "instances": [
+            "SARFE10-PSSS059_psss:8889",
+            "SARFE10-PSSS059_store:8890"
        ]
    },
-    "http://sf-daqsync-03.psi.ch:8881": {
-        "cameras": [
-        ],
-        "expanding": true,
-        "instances": [
-        ]
-    }, 
    "http://sf-daqsync-04.psi.ch:8881": {
-        "cameras": [
-        ],
-        "expanding": true,
+        "cameras": ["SATES21-CAMS154-M1", "SATES24-CAMS161-M1"],
+        "expanding": false,
        "instances": [
-		"bs_timing_test_perm:9000"
+            "bs_timing_test_perm:9000",
+	    "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"
        ]
    },
    "http://sf-daqsync-05.psi.ch:8881": {
-        "cameras": [
-        ],
-        "expanding": true,
+        "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",
-                "SARES11-SPEC125-M1_psen_db:9001",
-                "SARES11-SPEC125-M2_psen_ib:9010",
-                "SARES11-SPEC125-M2_psen_db:9011"
+            "SARES11-SPEC125-M1_psen_ib:9000",
+            "SARES11-SPEC125-M1_psen_db:9001",
+            "SARES11-SPEC125-M2_psen_ib:9010",
+            "SARES11-SPEC125-M2_psen_db:9011",
+            "SARES12-CAMS128-M1_psen_ib:9002",
+            "SARES12-CAMS128-M1_psen_db:9003"
        ]
    },
    "http://sf-daqsync-06.psi.ch:8881": {
-        "cameras": [
-        ],
-        "expanding": true,
+        "cameras": ["SARES20-CAMS142-M4", "SARES20-CAMS142-M5", "Bernina_spectral_encoding", "Bernina_spatial_encoding"],
+        "expanding": false,
        "instances": [
-                "SARES20-CAMS142-M4_psen_ib:9000",
-                "SARES20-CAMS142-M4_psen_db:9001",
-                "SARES20-CAMS142-M5_psen_ib:9010",
-                "SARES20-CAMS142-M5_psen_db:9011"
+            "SARES20-CAMS142-M4_psen_ib:9000",
+            "SARES20-CAMS142-M4_psen_db:9001",
+            "SARES20-CAMS142-M5_psen_ib:9010",
+            "SARES20-CAMS142-M5_psen_db:9011",
+            "arrival_time_proc:9008",
+	    "test_arrival"
        ]
    }
 }