Remove TOROID timer from configuration

This isn't used by the BAM server anymore

bam/baseconfig.py

@@ -56,8 +56,6 @@ MOTOR_AVAILABLE = dict()
 
 TOROID_LOCATION = dict()
 
-TOROID_TIMER_LOCATION = dict()
-
 MLO_DEVICE = dict()
 
 MLO_LOCATION = dict()

bam/settings/00-FLASH.py

@@ -52,16 +52,6 @@ TOROID_LOCATION.update({
     'FLF.MAFF'    : '7FLFMAFF'
 })
 
-TOROID_TIMER_LOCATION.update({
-    'FL0.UBC1'    : 'DIAG1',
-    'FL0.DBC1'    : 'DIAG1',
-    'FL0.UBC2'    : 'DIAG4',
-    'FL0.DBC2'    : 'DIAG4',
-    'FL1.SFELC'   : 'DIAG4',
-    'FL2.SEED5'   : 'F2DIAG4',
-    'FLF.MAFF'    : 'F2DIAG4'
-})
-
 MLO_DEVICE.update(
     dict.fromkeys(FLASH_STATIONS, 'LASER.LOCK.XLO.STATUS')
 )

bam/settings/00-XFEL.py

@@ -38,16 +38,6 @@ TOROID_LOCATION.update({
     '1932S.TL' : 'TORA.1865.TL'
 })
 
-TOROID_TIMER_LOCATION.update({
-    '47.I1'    : 'DI30I1',
-    '181.B1'   : 'DI176B1',
-    '203.B1'   : 'DI204B1',
-    '392.B2'   : 'DI388B2',
-    '414.B2'   : 'DI416B2',
-    '1932M.TL' : 'DI1862TL',
-    '1932S.TL' : 'DI1862TL'
-})
-
 MLO_DEVICE.update(
     dict.fromkeys(XFEL_STATIONS,
                   'LASER.LOCK.XLO.STATUS')

bam/settings/01-XFEL.LAB.py

@@ -12,10 +12,6 @@ TOROID_LOCATION.update({
     'XLAB1'    : 'TORA.46.I1',
 })
 
-TOROID_TIMER_LOCATION.update({
-    'XLAB1'    : 'DI30I1',
-})
-
 MLO_DEVICE.update({
     'XLAB1'    : 'LASER.LOCK.XLO',
 })

bam/templates/BAM.dmap

@@ -19,7 +19,6 @@ BAM_DEVICE    (pci:pcieunis${BAM_DEVNO}?map=sdiag_bam_fmc25_${bam_fw}.mapp)
 MOTOR_DEVICE  (pci:pcie${MOTOR_DEVNO}?map=controller_pzt4_md22_md22_fmc20_6s45_r${MOTOR_REVISION}.mapp)
 %endif
 TOROID_RAW    (doocs?facility=${getFacilityPrefix()}.DIAG&device=TOROID&location=${TOROID_LOCATION[STATION]}&cacheFile=toroid.cache&updateCache=0)
-TOROID_TIMER  (doocs?facility=${getFacilityPrefix()}.DIAG&device=TIMER&location=${TOROID_TIMER_LOCATION[STATION]}&cacheFile=timer2.cache&updateCache=0)
 TOROID        (logicalNameMap?map=toroid.xlmap)
 MLO_RAW       (doocs?facility=${getFacilityPrefix()}.SYNC&device=${MLO_DEVICE[STATION]}&location=${MLO_LOCATION[STATION]}&cacheFile=mlo.cache&updateChache=0)
 MLO           (logicalNameMap?map=mlo.xlmap)

bam/templates/toroid.xlmap

@@ -8,35 +8,6 @@
           <targetRegister>9MHZ_DIV</targetRegister>
           <plugin name="forceReadOnly" />
       </redirectedRegister>
-      <module name="Index">
-%for i in range(3):
-%if TOROID_FT[ACCELERATOR][i] is not None:
-         <redirectedRegister name="${i+1}">
-          <targetDevice>TOROID_TIMER</targetDevice>
-          <targetRegister>BUNCH_FIRST_INDEX.${i+1}</targetRegister>
-          <plugin name="forceReadOnly" />
-          <!-- generate the 4.5MHz pattern that the Toroid expects -->
-          <plugin name="math">
-              <parameter name="formula">var out[4] := x; out[0] := x[0] / divider; out[1] := floor(x[1] / divider); out[2] := floor(x[2] / divider); return [out] </parameter>
-              <parameter name="divider">/Toroid/Bunch/divider</parameter>
-          </plugin>
-          <plugin name="typeHintModifier">
-              <parameter name="type">integer</parameter>
-          </plugin>
-        </redirectedRegister>
-%else:
-       <constant name="${i+1}">
-         <type>integer</type>
-         <numberOfElements>4</numberOfElements>
-            <value index="0">0</value>
-            <value index="1">0</value>
-            <value index="2">0</value>
-            <value index="3">0</value>
-            <plugin name="forceReadOnly" />
-        </constant>
- %endif
-%endfor
-      </module>
     </module>
     <redirectedRegister name="bunchCharge">
       <targetDevice>TOROID_RAW</targetDevice>