templates complete.

tripeventLogger/templates/llrf_controller.cache

@@ -2,6 +2,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalogue version="1.0">
 % if ACCELERATOR == "XFEL" :
+% if STATION == "VS":
+
+% for Station in map(str,range(2,27)) :
+
+  <register>
+    <name>"VS.A${Station}.${GET_SECTION_NAME(Station)}/AMPL.TD"</name>
+    <length>16384</length>
+    <access_mode>wait_for_new_data</access_mode>
+    <doocs_type_id>19</doocs_type_id>
+    <!--doocs id: SPECTRUM-->
+  </register>
+  
+  <register>
+  <name>"VS.A${Station}.${GET_SECTION_NAME(Station)}/NAME"</name>
+  <length>1</length>
+    <access_mode>wait_for_new_data</access_mode>
+    <doocs_type_id>3</doocs_type_id>
+    <!--doocs id: SPECTRUM-->
+  </register>
+  
+  <register>
+  <name>"LLA${Station}M/MACRO_PULSE_NUMBER"</name>
+  <length>1</length>
+    <access_mode>wait_for_new_data</access_mode>
+    <doocs_type_id>2</doocs_type_id>
+    <!--doocs id: SPECTRUM-->
+  </register>
+  
+  <register>
+  <name>"MAIN.${CONTROLLER}A${Station}.${GET_SECTION_NAME(Station)}/MACRO_PULSE_NUMBER"</name>
+  <length>1</length>
+    <access_mode>wait_for_new_data</access_mode>
+    <doocs_type_id>2</doocs_type_id>
+    <!--doocs id: SPECTRUM-->
+  </register>
+
+% endfor
+% else:
 % for CRYOMODULE in CRYOMODULES :
 % for CAVITY in range(NR_OF_CAVITIES):
   <register>
@@ -60,7 +98,7 @@
     <name>/C${CAVITY+1}.${MODULE_LOCATION_SUFFIX(CRYOMODULE)}/NAME</name>
     <length>1</length>
     <access_mode>wait_for_new_data</access_mode>
-    <doocs_type_id>19</doocs_type_id>
+    <doocs_type_id>3</doocs_type_id>
     <!--doocs id: SPECTRUM-->
   </register>
   
@@ -124,5 +162,6 @@
     <!--doocs id: FLOAT-->
   </register>
   
+% endif
 % endif
 </catalogue>

tripeventLogger/templates/tripeventLogger-DoocsVariableConfig.xml

@@ -3,21 +3,14 @@
 <device_server xmlns="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter">
 % if ACCELERATOR == "XFEL" :
 % if STATION == "VS" :
-% for Station in range(2,27) :
-% if Station == "2" :
-  Section="L1"
-% elif Station in range(3,6):
-  Section="L2"
-% elif Station in range(6,27):
-  Section="L3"
-% endif
-  <location name="VS.A${Station}.${Section}">
-    <property source="/VS.A${Station}.${Section}/TRIPEVENT.REPORT" name="TRIPEVENT.REPORT"></property>
-    <property source="/VS.A${Station}.${Section}/TRIPEVENT.WARNING" name="TRIPEVENT.WARNING"></property>
-    <property source="/VS.A${Station}.${Section}/TRIPEVENT.STATE" name="TRIPEVENT.STATE"></property>
+% for Station in map(str,range(2,27)) :
+  <location name="VS.A${Station}.${GET_SECTION_NAME(Station)}">
+    <property source="/VS.A${Station}.${GET_SECTION_NAME(Station)}/TRIPEVENT.REPORT" name="TRIPEVENT.REPORT"></property>
+    <property source="/VS.A${Station}.${GET_SECTION_NAME(Station)}/TRIPEVENT.WARNING" name="TRIPEVENT.WARNING"></property>
+    <property source="/VS.A${Station}.${GET_SECTION_NAME(Station)}/TRIPEVENT.STATE" name="TRIPEVENT.STATE"></property>
   </location>
 % endfor
-% endif
+% else:
 % for CRYOMODULE in CRYOMODULES :
 % for CAVITY in range(NR_OF_CAVITIES):
   <location name="C${CAVITY+1}.${MODULE_LOCATION_SUFFIX(CRYOMODULE)}">
@@ -28,5 +21,6 @@
 % endfor
 % endfor
 % endif
+% endif
 </device_server>
 

tripeventLogger/templates/tripeventLogger.conf

@@ -23,9 +23,9 @@ SVR.DESC:   ""
 SVR.PROGRAMMER:   "Jan Timm"
 SVR.STORE.RATE:   60
 SVR.STORE.AUTO:   10
-
+SVR.HOST_NAME:    "${HOSTNAME}"
 SVR.RPC_NUMBER:   ${RPC_NUMBER}
-
+SVR.WDADDR:   "${WATCHDOG_ADDRESS}/"
 SVR.FACILITY:   "${ACCELERATOR}.RF"
 SVR.DEVICE:   "LLRF.TRIPEVENT_LOGGER"
 SVR.BPN:    0
@@ -33,18 +33,12 @@ SVR.SPR:    0
 }
 % if ACCELERATOR == "XFEL" :
   % if STATION == "VS" :
-    % for Station in range(2,27) :
-      % if Station == 2 :
-        Section="L1"
-      % elif Station in range(3,6):
-        Section="L2"
-      % elif Station in range(6,27):
-        Section="L3"
-      % endif
-eq_fct_name:  "VS.A${Station}.${Section}"
+    % for Station in map(str,range(2,27)) :
+      
+eq_fct_name:  "VS.A${Station}.${GET_SECTION_NAME(Station)}"
 eq_fct_type:  10
 {
-NAME:   "VS.A${Station}.${Section}"
+NAME:   "VS.A${Station}.${GET_SECTION_NAME(Station)}"
 }
     % endfor
   % else:

tripeventLogger/templates/tripeventLogger.xlmap

@@ -3,29 +3,29 @@
 % if ACCELERATOR == "XFEL":
 % if STATION == "VS":
 
-% for Station in range (2,27) :
- <module name="VS.A${Station}.${SECTION_NAME}">
+% for Station in map(str,range(2,27)) :
+ <module name="VS.A${Station}.${GET_SECTION_NAME(Station)}">
  <redirectedRegister name="amplitude">
     <targetDevice>DOOCS</targetDevice>
-    <targetRegister>VS.A${Station}.${SECTION_NAME}/AMPL.TD</targetRegister>
+    <targetRegister>VS.A${Station}.${GET_SECTION_NAME(Station)}/AMPL.TD</targetRegister>
     <plugin name="forceReadOnly"/>
   </redirectedRegister>
 
   <redirectedRegister name="name">
     <targetDevice>DOOCS</targetDevice>
-    <targetRegister>VS.A${Station}.${SECTION_NAME}/NAME</targetRegister>
+    <targetRegister>VS.A${Station}.${GET_SECTION_NAME(Station)}/NAME</targetRegister>
     <plugin name="forceReadOnly"/>
   </redirectedRegister>
 
   <redirectedRegister name="trigger">
     <targetDevice>Timer</targetDevice>
-    <targetRegister>LL${FULL_STATION_NAME}/MACRO_PULSE_NUMBER</targetRegister>
+    <targetRegister>LLA${Station}M/MACRO_PULSE_NUMBER</targetRegister>
     <plugin name="forceReadOnly"/>
   </redirectedRegister>
 
   <redirectedRegister name="macroPulseNumber">
     <targetDevice>DOOCS</targetDevice>
-    <targetRegister>MAIN.${CONTROLLER}${STATION_LOCATION_SUFFIX}/MACRO_PULSE_NUMBER</targetRegister>
+    <targetRegister>MAIN.${CONTROLLER}A${Station}.${GET_SECTION_NAME(Station)}/MACRO_PULSE_NUMBER</targetRegister>
     <plugin name="forceReadOnly"/>
   </redirectedRegister>
 % endfor

tripeventLogger/templates/tripeventLogger.xml

@@ -18,15 +18,8 @@
   </module>
   <variable name="cavityLocations" type="string"><%COUNTER = 0%>
 % if STATION == 'VS' :
-% for Station in range (2,27) :
-% if Station == 2 :
-  Section="L1"
-% elif Station in range(3,6):
-  Section="L2"
-% elif Station in range(6,27):
-  Section="L3"
-% endif
-  <value i="0"  v="VS.A${Station}.${Section}"/>
+% for Station in map(str,range(2,27)) :
+  <value i="0"  v="VS.A${Station}.${GET_SECTION_NAME(Station)}"/>
 % endfor  
 % else:
 % for CRYOMODULE in CRYOMODULES :