Update motor matrix

bam/baseconfig.py

@@ -32,6 +32,8 @@ MOTOR_AVAILABLE = [None, None, None, None]
 # Settings which are filled by the accelerator-specific files
 #
 
+MOTOR_AVAILABLE = dict()
+
 TOROID_LOCATION = dict()
 
 MLO_DEVICE = dict()

bam/settings/00-FLASH.py

@@ -5,7 +5,15 @@ if ACCELERATOR == 'FLASH':
         MOTOR_DEVNO='unis6'
     STORE_RATE = 360
     RING_BUFFER = 1000000
-    MOTOR_AVAILABLE = [(0,0), (0,1), None, None]
+
+MOTOR_AVAILABLE.update({
+    '1UBC2'    : [(0,0), (0,1), None, None],
+    '3DBC2'    : [(0,0), (0,1), None, None],
+    '4DBC3'    : [(0,0), (0,1), None, None],
+    '1SFELC'   : [(0,1), None, None, None],
+    '8FL2XTDS' : [(0,1), (0,1), None, None],
+    '7FLFMAFF' : [(0,1), None, (0,1), None]
+})
 
 TOROID_LOCATION.update({
     '1UBC2'    : '3GUN',

bam/settings/00-XFEL.py

 if ACCELERATOR == 'XFEL':
     MOTOR_DEVNO='unis8'
-    MOTOR_AVAILABLE = [(0,0), (0,1), None, (1,1)]
-    if STATION == '1932M.TL':
-        MOTOR_AVAILABLE = [(0,0), None, None, None]
+
+MOTOR_AVAILABLE.update({
+    '47.I1'    : [(0,0), (0,1), None, None],
+    '181.B1'   : [(0,0), None, None, None],
+    '203.B1'   : [(0,0), None, None, None],
+    '392.B2'   : [(0,0), None, None, None],
+    '414.B2'   : [(0,0), (0,1), None, None],
+    '1932M.TL' : [None, (0,0), None, None],
+    '1932S.TL' : [None, (0,0), None, None]
+})
 
 TOROID_LOCATION.update({
     '47.I1'    : 'TORA.46.I1',

bam/settings/20-FLASH.flash2.py

@@ -2,15 +2,12 @@ if ACCELERATOR == 'FLASH':
     if STATION == '1SFELC':
         # FLASH2 uses the second flattop, but it is mapped to the first sample in that toroid
         TOROID_FT['FLASH'] = ['SAMPLE.FLASH1', 'SAMPLE.FLASH1', 'this/allZero']
-        MOTOR_AVAILABLE = [(0,1), None, None, None]
 
     if STATION == '8FL2XTDS':
         # FLASH2 uses the second flattop, but it is mapped to the first sample in that toroid
         TOROID_FT['FLASH'] = ['this/allZero', 'SAMPLE.FLASH2', 'this/allZero']
-        MOTOR_AVAILABLE = [(0,1), (0,1), None, None]
 
     if STATION == '7FLFMAFF':
         # FLASH FORWARD is different again
         TOROID_FT['FLASH'] = ['this/allZero', 'SAMPLE.FLASH2', 'SAMPLE.FLASH3']
-        MOTOR_AVAILABLE = [(0,1), None, None, None]
 

bam/settings/99-XFEL.SURROGATE.py

 if ACCELERATOR == "XFEL" and STATION == "1932S.TL":
-  MOTOR_AVAILABLE = [(0,1), None, None, None]
   SVR_LOCATION = HOSTNAME.upper()+"_2._SVR"
   RPC_NUMBER = 610589844
   BAM_DEVNO = 6

bam/templates/bam_motor.conf

 ##mako
-%for entry in MOTOR_AVAILABLE:
+%for entry in MOTOR_AVAILABLE[STATION]:
 %if entry is not None:
 MOTOR_DEVICE MD22.${entry[0]} ${entry[1]} motorConfig_2xlimes60_optimal_bam.xml ""
 %else: