Merge branch 'tickets/DM-26599' into master

lsst · Sep 3, 2020 · 119be5e · 119be5e
2 parents 6f85c6d + e458102
commit 119be5e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/policy/cameraHeader.yaml b/policy/cameraHeader.yaml
@@ -257,22 +257,22 @@ RAFT_ITL:
     S00: &S00_ITL                       # Sensor (0, 0)
       << : *CCD_ITL
       id : 0
-      offset : [-42.37, -42.19]
+      offset : [-42.25, -42.25]
 
     S01: &S01_ITL                       # Sensor (0, 1)
       << : *S00_ITL
       id : 1
-      offset : [ -0.09, -42.32]
+      offset : [  0.00, -42.25]
 
     S02: &S02_ITL                       # Sensor (0, 2)
       << : *S00_ITL
       id : 2
-      offset : [ 42.18, -42.37]
+      offset : [ 42.25, -42.25]
 
     S10: &S10_ITL                       # Sensor (1, 0)
       << : *S00_ITL
       id : 3
-      offset : [-42.32,   0.08]
+      offset : [-42.25,   0.00]
 
     S11: &S11_ITL                       # Sensor (1, 1)
       << : *S00_ITL
@@ -282,21 +282,21 @@ RAFT_ITL:
     S12: &S12_ITL                       # Sensor (1, 2)
       << : *S00_ITL
       id : 5
-      offset : [ 42.28,   -0.10]
+      offset : [ 42.25,    0.00]
 
     S20: &S20_ITL                       # Sensor (2, 0)
       << : *S00_ITL
       id : 6
-      offset : [-42.19,  42.36]
+      offset : [-42.25,  42.25]
 
     S21: &S21_ITL                       # Sensor (2, 1)
       << : *S00_ITL
       id : 7
-      offset : [  0.10,  42.28]
+      offset : [  0.00,  42.25]
     S22: &S22_ITL                       # Sensor (2, 2)
       << : *S00_ITL
       id : 8
-      offset : [ 42.36,  42.20]
+      offset : [ 42.25,  42.25]
 #
 # Layout of CCDs within an E2V raft
 #
@@ -307,22 +307,22 @@ RAFT_E2V:
     S00: &S00_E2V                       # Sensor (0, 0)
       << : *CCD_E2V
       id : 0
-      offset : [-42.37, -42.19]
+      offset : [-42.25, -42.25]
 
     S01: &S01_E2V                       # Sensor (0, 1)
       << : *S00_E2V
       id : 1
-      offset : [ -0.09, -42.32]
+      offset : [  0.00, -42.25]
 
     S02: &S02_E2V                       # Sensor (0, 2)
       << : *S00_E2V
       id : 2
-      offset : [ 42.18, -42.37]
+      offset : [ 42.25, -42.25]
 
     S10: &S10_E2V                       # Sensor (1, 0)
       << : *S00_E2V
       id : 3
-      offset : [-42.32,   0.08]
+      offset : [-42.25,   0.00]
 
     S11: &S11_E2V                       # Sensor (1, 1)
       << : *S00_E2V
@@ -332,21 +332,21 @@ RAFT_E2V:
     S12: &S12_E2V                       # Sensor (1, 2)
       << : *S00_E2V
       id : 5
-      offset : [ 42.28,   -0.10]
+      offset : [ 42.25,    0.00]
 
     S20: &S20_E2V                       # Sensor (2, 0)
       << : *S00_E2V
       id : 6
-      offset : [-42.19,  42.36]
+      offset : [-42.25,  42.25]
 
     S21: &S21_E2V                       # Sensor (2, 1)
       << : *S00_E2V
       id : 7
-      offset : [  0.10,  42.28]
+      offset : [  0.00,  42.25]
     S22: &S22_E2V                       # Sensor (2, 2)
       << : *S00_E2V
       id : 8
-      offset : [ 42.36,  42.20]
+      offset : [ 42.25,  42.25]
 
 
 #

diff --git a/policy/rafts.yaml b/policy/rafts.yaml
@@ -3,11 +3,11 @@
 #
 rafts :
   R00 :
-    offset : [-254., -254.0]
+    offset : [-254.0, -254.0]
     id0 : 189
     yaw : 180.
   R00W :
-    offset : [-254., -254.0]
+    offset : [-254.0, -254.0]
     id0 : 191
     yaw : 180.
   R04 :
@@ -33,65 +33,65 @@ rafts :
     offset : [254.0, 254.0]
     id0 : 203
   R01 :
-    offset : [-127.6, -253.8]           # offset of centre of raft, mm
+    offset : [-127.0, -254.0]           # offset of centre of raft, mm
     id0 : 0                             # id for S00, incrementing uniformly
   R02 :
-    offset : [  -0.5, -254.1]
+    offset : [   0.0, -254.0]
     id0 : 9
   R03 :
-    offset : [ 126.6, -254.4]
+    offset : [ 127.0, -254.0]
     id0 : 18
   R10 :
-    offset : [-254.4, -126.6]
+    offset : [-254.0, -127.0]
     id0 : 27
   R11 :
-    offset : [-127.3, -126.8]
+    offset : [-127.0, -127.0]
     id0 : 36
   R12 :
-    offset : [  -0.2, -127.0]
+    offset : [   0.0, -127.0]
     id0 : 45
   R13 :
-    offset : [ 126.8, -127.4]
+    offset : [ 127.0, -127.0]
     id0 : 54
   R14 :
-    offset : [ 253.9, -127.6]
+    offset : [ 254.0, -127.0]
     id0 : 63
   R20 :
-    offset : [-254.1,    0.6]
+    offset : [-254.0,    0.0]
     id0 : 72
   R21 :
-    offset : [-127.1,    0.2]
+    offset : [-127.0,    0.0]
     id0 : 81
   R22 :
     offset : [   0.0,    0.0]
     id0 : 90
   R23 :
-    offset : [ 127.1,   -0.3]
+    offset : [ 127.0,    0.0]
     id0 : 99
   R24 :
-    offset : [ 254.2,   -0.5]
+    offset : [254.0,    0.0]
     id0 : 108
   R30 :
-    offset : [-253.9,  127.6]
+    offset : [-254.0,  127.0]
     id0 : 117
   R31 :
-    offset : [-126.8,  127.4]
+    offset : [-127.0,  127.0]
     id0 : 126
   R32 :
-    offset : [   0.3,  127.1]
+    offset : [   0.0,  127.0]
     id0 : 135
   R33 :
-    offset : [ 127.4,  126.8]
+    offset : [ 127.0,  127.0]
     id0 : 144
   R34 :
-    offset : [ 254.4,  126.5]
+    offset : [ 254.0,  127.0]
     id0 : 153
   R41 :
-    offset : [-126.5,  254.5]
+    offset : [-127.0,  254.0]
     id0 : 162
   R42 :
-    offset : [   0.6,  254.1]
+    offset : [   0.0,  254.0]
     id0 : 171
   R43 :
-    offset : [ 127.6,  253.9]
+    offset : [ 127.0,  254.0]
     id0 : 180