camserver_config/camserver_sf
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

June 2021

Browse Source
This commit is contained in:
root
2021-06-21 17:27:36 +02:00
parent 543b0acf7f
commit db1afcd179
12 changed files with 103 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration/camera_config/SARES20-CAMS142-C1.json
+7 -7
View File
@@ -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",
configuration/camera_config/SARES20-CAMS142-M3.json
+6 -6
View File
@@ -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
},
configuration/camera_config/SARES20-CAMS142-M5.json
+2 -2
View File
@@ -32,8 +32,8 @@
"roi_signal": [
10,
2190,
600,
150
691,
300
],
"roi_background": [
10,
configuration/camera_config/SARES20-PROF141-M1.json
+1 -1
View File
@@ -27,6 +27,6 @@
"Bernina"
],
"alias": [
"camera (SARES20-PROF141-M1)"
"camera_microscope (SARES20-PROF141-M1)"
]
}
configuration/camera_config/SATES24-CAMS161-M1.json
+4 -5
View File
@@ -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": []
}
configuration/camera_config/SATOP11-PSCR086.json
+6 -2
View File
@@ -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": []
}
}
configuration/camera_config/servers.json
+19 -23
View File
@@ -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": []
}
}
}
configuration/camera_config/simulation_2.json
+3 -3
View File
@@ -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"
}
}
configuration/pipeline_config/SARES20-CAMS142-M5_psen_db.json
+2 -2
View File
@@ -13,8 +13,8 @@
"roi_signal": [
300,
2040,
480,
200
300,
100
],
"roi_background": [
300,
configuration/pipeline_config/SARFE10-PSSS059_psss.json
+1 -1
View File
@@ -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,
configuration/pipeline_config/permanent_instances.json
+2 -1
View File
@@ -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"
}
configuration/pipeline_config/servers.json
+50 -21
View File
@@ -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": []
}
}
}