From 6e0ccff14ab2c066c8993e8550b1ce060d240c3f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jan 2020 14:26:06 +0100 Subject: [PATCH] User scripts --- .gitignore | 3 +- camera_environment | 2 +- .../camera_config/SARES20-CAMS142-C1.json | 19 +++++----- .../camera_config/SARES20-PROF142-M1.json | 20 +++++------ .../camera_config/SARES20-PROF142-M2.json | 21 ----------- .../camera_config/SARES20-PROF142-M3.json | 20 ----------- .../camera_config/SAROP21-PPRM094.json | 1 + .../camera_config/SAROP21-PPRM102.json | 12 +++---- .../camera_config/SAROP21-PPRM138.json | 12 +++---- .../camera_config/SATBD02-DSCR050.json | 35 ++++++++++--------- .../camera_config/SLAAR11-LAMIC-C451.json | 20 ----------- configuration/camera_config/simulation.json | 23 +++++++++--- 12 files changed, 72 insertions(+), 116 deletions(-) delete mode 100644 configuration/camera_config/SARES20-PROF142-M2.json delete mode 100644 configuration/camera_config/SARES20-PROF142-M3.json delete mode 100644 configuration/camera_config/SLAAR11-LAMIC-C451.json diff --git a/.gitignore b/.gitignore index c4b383c..e4564ba 100644 --- a/.gitignore +++ b/.gitignore @@ -145,4 +145,5 @@ ENV/ to_convert/*.json to_convert/*.npy -*_sp.json \ No newline at end of file +*_sp.json +./configuration/background_config diff --git a/camera_environment b/camera_environment index b10bff5..1bff0bd 100644 --- a/camera_environment +++ b/camera_environment @@ -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_AUTO_ADDR_LIST=NO -EPICS_CA_MAX_ARRAY_BYTES=40000000 \ No newline at end of file +EPICS_CA_MAX_ARRAY_BYTES=40000000 diff --git a/configuration/camera_config/SARES20-CAMS142-C1.json b/configuration/camera_config/SARES20-CAMS142-C1.json index 15f5b8b..c987826 100644 --- a/configuration/camera_config/SARES20-CAMS142-C1.json +++ b/configuration/camera_config/SARES20-CAMS142-C1.json @@ -1,20 +1,21 @@ { "camera_calibration": { "reference_marker": [ - 1321, - 532, - 1344, - 590 + 774, + 615, + 825, + 667 ], - "reference_marker_width": 15.0, - "reference_marker_height": 16.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, - "source_type": "bsread", + "rotate": 1, + "source_type": "epics", "name": "SARES20-CAMS142-C1", - "source": "SARES20-CAMS142-C1" + "source": "SARES20-CAMS142-C1", + "prefix": "SARES20-CAMS142-C1" } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-PROF142-M1.json b/configuration/camera_config/SARES20-PROF142-M1.json index 310f9c5..0d0cd5c 100644 --- a/configuration/camera_config/SARES20-PROF142-M1.json +++ b/configuration/camera_config/SARES20-PROF142-M1.json @@ -1,21 +1,21 @@ { "camera_calibration": { "reference_marker": [ - 0, - 0, - 93, - 93 + 416, + 275, + 438, + 286 ], - "reference_marker_width": 10.0, - "reference_marker_height": 10.0, + "reference_marker_width": 16.0, + "reference_marker_height": 8.0, "angle_horizontal": 0.0, "angle_vertical": 0.0 }, - "mirror_x": false, - "mirror_y": false, + "mirror_x": true, + "mirror_y": true, "rotate": 0, "source_type": "epics", - "source": "SARES20-PROF142-M1", "name": "SARES20-PROF142-M1", - "prefix": "SARES20-PROF142-M1" + "prefix": "SARES20-PROF142-M1", + "source": "SARES20-PROF142-M1" } \ No newline at end of file diff --git a/configuration/camera_config/SARES20-PROF142-M2.json b/configuration/camera_config/SARES20-PROF142-M2.json deleted file mode 100644 index dd0996c..0000000 --- a/configuration/camera_config/SARES20-PROF142-M2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "camera_calibration": { - "reference_marker": [ - 330, - 249, - 349, - 265 - ], - "reference_marker_width": 54.0, - "reference_marker_height": 45.3, - "angle_horizontal": 0.0, - "angle_vertical": 0.0 - }, - "mirror_x": false, - "mirror_y": false, - "rotate": 0, - "source_type": "bsread", - "prefix": "SARES20-PROF142-M2", - "name": "SARES20-PROF142-M2", - "source": "SARES20-PROF142-M2" -} \ No newline at end of file diff --git a/configuration/camera_config/SARES20-PROF142-M3.json b/configuration/camera_config/SARES20-PROF142-M3.json deleted file mode 100644 index 905b2ef..0000000 --- a/configuration/camera_config/SARES20-PROF142-M3.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "camera_calibration": { - "reference_marker": [ - 0, - 0, - 1000, - 500 - ], - "reference_marker_width": 1000.0, - "reference_marker_height": 500.0, - "angle_horizontal": 0.0, - "angle_vertical": 0.0 - }, - "mirror_x": false, - "mirror_y": false, - "rotate": 0, - "source_type": "bsread", - "name": "SARES20-PROF142-M3", - "source": "SARES20-PROF142-M3" -} \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM094.json b/configuration/camera_config/SAROP21-PPRM094.json index 4558b26..5f4189d 100644 --- a/configuration/camera_config/SAROP21-PPRM094.json +++ b/configuration/camera_config/SAROP21-PPRM094.json @@ -14,6 +14,7 @@ "mirror_x": true, "mirror_y": false, "rotate": 0, + "source_type": "epics", "name": "SAROP21-PPRM094", "source": "SAROP21-PPRM094" } \ No newline at end of file diff --git a/configuration/camera_config/SAROP21-PPRM102.json b/configuration/camera_config/SAROP21-PPRM102.json index 2c77734..af0bf77 100644 --- a/configuration/camera_config/SAROP21-PPRM102.json +++ b/configuration/camera_config/SAROP21-PPRM102.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 370, - 163, - 490, - 340 + 360, + 225, + 374, + 242 ], - "reference_marker_width": 2000.0, - "reference_marker_height": 2000.0, + "reference_marker_width": 200.0, + "reference_marker_height": 200.0, "angle_horizontal": 21.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SAROP21-PPRM138.json b/configuration/camera_config/SAROP21-PPRM138.json index cc4069d..0a848e1 100644 --- a/configuration/camera_config/SAROP21-PPRM138.json +++ b/configuration/camera_config/SAROP21-PPRM138.json @@ -1,13 +1,13 @@ { "camera_calibration": { "reference_marker": [ - 328, - 274, - 361, - 316 + 333, + 279, + 362, + 312 ], - "reference_marker_width": 500.0, - "reference_marker_height": 500.0, + "reference_marker_width": 400.0, + "reference_marker_height": 400.0, "angle_horizontal": 21.0, "angle_vertical": 0.0 }, diff --git a/configuration/camera_config/SATBD02-DSCR050.json b/configuration/camera_config/SATBD02-DSCR050.json index 9fcb507..4e65b4c 100644 --- a/configuration/camera_config/SATBD02-DSCR050.json +++ b/configuration/camera_config/SATBD02-DSCR050.json @@ -1,19 +1,20 @@ { - "name": "SATBD02-DSCR050", - "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": "SATBD02-DSCR050", - "mirror_y": false, - "rotate": 0, - "mirror_x": false + "camera_calibration": { + "reference_marker": [ + 1105, + 166, + 1807, + 1984 + ], + "reference_marker_width": 6000.0, + "reference_marker_height": 16000.0, + "angle_horizontal": 8.0, + "angle_vertical": 0.0 + }, + "mirror_x": true, + "mirror_y": true, + "rotate": 0, + "source_type": "epics", + "name": "SATBD02-DSCR050", + "source": "SATBD02-DSCR050" } \ No newline at end of file diff --git a/configuration/camera_config/SLAAR11-LAMIC-C451.json b/configuration/camera_config/SLAAR11-LAMIC-C451.json deleted file mode 100644 index e4110cb..0000000 --- a/configuration/camera_config/SLAAR11-LAMIC-C451.json +++ /dev/null @@ -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": true, - "rotate": 0, - "source_type": "epics", - "name": "SLAAR11-LAMIC-C451", - "source": "SLAAR11-LAMIC-C451" -} \ No newline at end of file diff --git a/configuration/camera_config/simulation.json b/configuration/camera_config/simulation.json index 067bef0..b8b2b87 100644 --- a/configuration/camera_config/simulation.json +++ b/configuration/camera_config/simulation.json @@ -1,9 +1,22 @@ { - "camera_calibration": null, - "name": "simulation", - "source_type": "simulation", - "rotate": 0, + "camera_calibration": { + "reference_marker": [ + 211, + 173, + 1063, + 793 + ], + "reference_marker_width": 30000.0, + "reference_marker_height": 30000.0, + "angle_horizontal": 0.0, + "angle_vertical": 0.0 + }, "mirror_x": false, + "mirror_y": false, + "rotate": 0, + "source_type": "simulation", + "name": "simulation", "source": "", - "mirror_y": false + + "frame_rate":5 } \ No newline at end of file