Configuration for new SASE bams

bam/hostlist

@@ -15,5 +15,10 @@ xfelcpusd392b2.desy.de      D              xfel            BAM/392.B2
 xfelcpusd417b2.desy.de      D              xfel            BAM/414.B2
 xfelcpusd1932tl.desy.de     D              xfel            BAM/1932M.TL BAM/1932S.TL/SURROGATE
 
+# xfel SASE
+xfelcpusd2461s1.desy.de     D              xfel            BAM/2461.S1
+xfelcpusd2423s2.desy.de     D              xfel            BAM/2423.S2
+xfelcpusd2955s3.desy.de     D              xfel            BAM/2955.S3
+
 # labs
 mskcpusdxlab1.desy.de       D              lab             BAM/XLAB1

bam/settings/00-XFEL.py

@@ -3,8 +3,18 @@ if ACCELERATOR == 'XFEL':
     MOTOR_DEVNO='unis8'
     TOROID_SAMPLES=3611
 
-XFEL_STATIONS = ['47.I1', '181.B1', '203.B1', '392.B2', '414.B2', '1932M.TL', '1932S.TL']
-
+XFEL_STATIONS = [
+        '47.I1',
+        '181.B1',
+        '203.B1',
+        '392.B2',
+        '414.B2',
+        '1932M.TL',
+        '1932S.TL',
+        '2461.S1',
+        '2423.S2',
+        '2955.S3',
+]
 MOTOR_AVAILABLE.update({
     '47.I1'    : [(0,0), None, None, None],
     '181.B1'   : [(0,0), None, None, None],
@@ -12,7 +22,10 @@ MOTOR_AVAILABLE.update({
     '392.B2'   : [(0,0), None, None, None],
     '414.B2'   : [(0,0), (0,1), None, None],
     '1932M.TL' : [(0,0), None, None, None],
-    '1932S.TL' : [(0,0), None, None, None]
+    '1932S.TL' : [(0,0), None, None, None],
+    '2461.S1'  : [(0,0), None, None, None],
+    '2423.S2'  : [(0,0), None, None, None],
+    '2955.S3'  : [(0,0), None, None, None],
 })
 
 TOROID_LOCATION.update({
@@ -22,7 +35,10 @@ TOROID_LOCATION.update({
     '392.B2'   : 'TORA.387.B2',
     '414.B2'   : 'TORA.415.B2',
     '1932M.TL' : 'TORA.1865.TL',
-    '1932S.TL' : 'TORA.1865.TL'
+    '1932S.TL' : 'TORA.1865.TL',
+    '2461.S1' : 'TORA.2462.T4',
+    '2423.S2' : 'TORA.2423.T3',
+    '2955.S3' : 'TORA.2967.T4D',
 })
 
 MLO_DEVICE.update(
@@ -45,7 +61,10 @@ MLO_LOCATION.update({
     '392.B2'   : 'XTIN.MLO1',
     '414.B2'   : 'XTIN.MLO1',
     '1932M.TL' : 'XTIN.MLO1',
-    '1932S.TL' : 'XHEXP1.SLO1'
+    '1932S.TL' : 'XHEXP1.SLO1',
+    '2461.S1' : 'XHEXP1.SLO1',
+    '2423.S2' : 'XHEXP1.SLO1',
+    '2955.S3' : 'XHEXP1.SLO1',
 })
 
 LINK_LOCATION.update({
@@ -55,7 +74,10 @@ LINK_LOCATION.update({
     '392.B2'   : 'XTIN.AMC6.CONTROLLER',
     '414.B2'   : 'XTIN.AMC6.CONTROLLER',
     '1932M.TL' : 'XTIN.AMC9.CONTROLLER',
-    '1932S.TL' : 'XHEXP1.AMC6.CONTROLLER'
+    '1932S.TL' : 'XHEXP1.AMC6.CONTROLLER',
+    '2461.S1' : 'XHEXP1.AMC7.CONTROLLER',
+    '2423.S2' : 'XHEXP1.AMC7.CONTROLLER',
+    '2955.S3' : 'XHEXP1.AMC6.CONTROLLER',
 })
 
 LINK_LOCK_NUMBER.update({
@@ -65,7 +87,10 @@ LINK_LOCK_NUMBER.update({
     '392.B2'   : 2,
     '414.B2'   : 3,
     '1932M.TL' : 2,
-    '1932S.TL' : 1
+    '1932S.TL' : 1,
+    '2461.S1' : 3,
+    '2423.S2' : 2,
+    '2955.S3' : 0,
 })
 
 TIMER_LOCATION.update({
@@ -75,9 +100,10 @@ TIMER_LOCATION.update({
     '392.B2'   : 'SD392B2',
     '414.B2'   : 'SD417B2',
     '1932M.TL' : 'SD1932TL',
-    '1932S.TL' : 'SD1932TL'
-})
-
+    '1932S.TL' : 'SD1932TL',
+    '2461.S1'  : 'SD2461S1',
+    '2423.S2'  : 'SD2423S2',
+    '2955.S3'  : 'SD2955S3',
 MOTOR_CONVERSION_FACTOR.update({
     '47.I1'    : [1.04230668925927, 1.04230668925927, 4.957000e-01, 4.957000e-01],
     '181.B1'   : [1.04230668925927, 1.04230668925927, 4.995900e-01, 4.995900e-01],
@@ -85,7 +111,10 @@ MOTOR_CONVERSION_FACTOR.update({
     '392.B2'   : [1.04230668925927, 1.04230668925927, 5.001000e-01, 5.001000e-01],
     '414.B2'   : [1.04230668925927, 1.04230668925927, 5.020000e-01, 5.020000e-01],
     '1932M.TL' : [1.04230668925927, 1.04230668925927, 1.042680e+00, 1.042680e+00],
-    '1932S.TL' : [1.04230668925927, 1.04230668925927, 1.042680e+00, 1.042680e+00]
+    '1932S.TL' : [1.04230668925927, 1.04230668925927, 1.042680e+00, 1.042680e+00],
+    '2461.S1'  : [1.04230668925927, 1.04230668925927, 1.042680e+00, 1.042680e+00],
+    '2423.S2'  : [1.04230668925927, 1.04230668925927, 1.042680e+00, 1.042680e+00],
+    '2955.S3'  : [1.04230668925927, 1.04230668925927, 1.042680e+00, 1.042680e+00],
 })
 
 BCM_LOCATION.update({
@@ -95,7 +124,10 @@ BCM_LOCATION.update({
     '392.B2'   : "MONITOR8",
     '414.B2'   : "MONITOR13",
     '1932M.TL' : "MONITOR13",
-    '1932S.TL' : "MONITOR13"
+    '1932S.TL' : "MONITOR13",
+    '2461.S1'  : 'MONITOR13',
+    '2423.S2'  : 'MONITOR13',
+    '2955.S3'  : 'MONITOR13',
 })
 
 LONGITUDINAL_FEEDBACK_MONITORS.update({
@@ -105,7 +137,10 @@ LONGITUDINAL_FEEDBACK_MONITORS.update({
     '392.B2'   : "MONITOR10",
     '414.B2'   : "MONITOR14",
     '1932M.TL' : "MONITOR16",
-    '1932S.TL' : "MONITOR16"
+    '1932S.TL' : "MONITOR16",
+    '2461.S1'  : None,
+    '2423.S2'  : None,
+    '2955.S3'  : None,
 })
 
 BBF_LOCATION.update({
@@ -115,5 +150,8 @@ BBF_LOCATION.update({
     '392.B2'   : None,
     '414.B2'   : "A5.L2",
     '1932M.TL' : None,
-    '1932S.TL' : None
+    '1932S.TL' : None,
+    '2461.S1'  : None,
+    '2423.S2'  : None,
+    '2955.S3'  : None,
 })