]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
fix order of TOF/RPC input
authorhadaq <hadaq@hades33.gsi.de>
Sat, 30 Jan 2021 11:42:47 +0000 (12:42 +0100)
committerhadaq <hadaq@hades33.gsi.de>
Sat, 30 Jan 2021 11:42:47 +0000 (12:42 +0100)
xml-db/database/TriggerBox.xml

index d3b22ff8d39094670ce31c325bb81e079fa94b39..6cdc7de5495ef81b518cf3b162f9fee05cb01a40 100644 (file)
       <sliceName value="25">Secondary 1          </sliceName>
       <sliceName value="26">Secondary 2          </sliceName>
       <sliceName value="27">Secondary 3          </sliceName>      
-      <sliceName value="32">RPC S0               </sliceName>
-      <sliceName value="33">RPC S1               </sliceName>
-      <sliceName value="34">RPC S2               </sliceName>
-      <sliceName value="35">RPC S3               </sliceName>
-      <sliceName value="36">RPC S4               </sliceName>
-      <sliceName value="37">RPC S5               </sliceName>        
-      <sliceName value="40">TOF S0               </sliceName>
-      <sliceName value="41">TOF S1               </sliceName>
-      <sliceName value="42">TOF S2               </sliceName>
-      <sliceName value="43">TOF S3               </sliceName>
-      <sliceName value="45">TOF S4               </sliceName>
-      <sliceName value="46">TOF S5               </sliceName>        
+      <sliceName value="32">TOF S0               </sliceName>
+      <sliceName value="33">TOF S1               </sliceName>
+      <sliceName value="34">TOF S2               </sliceName>
+      <sliceName value="35">TOF S3               </sliceName>
+      <sliceName value="36">TOF S4               </sliceName>
+      <sliceName value="37">TOF S5               </sliceName>        
+      <sliceName value="40">RPC S0               </sliceName>
+      <sliceName value="41">RPC S1               </sliceName>
+      <sliceName value="42">RPC S2               </sliceName>
+      <sliceName value="43">RPC S3               </sliceName>
+      <sliceName value="45">RPC S4               </sliceName>
+      <sliceName value="46">RPC S5               </sliceName>        
       <sliceName value="48">Virtual Input 0      </sliceName>       
       <sliceName value="49">Virtual Input 1      </sliceName>       
       <sliceName value="50">Virtual Input 2      </sliceName>       
       <enumItem value="1d">J 1          </enumItem>
       <enumItem value="1e">J 2          </enumItem>
       <enumItem value="1f">J 3          </enumItem>      
-      <enumItem value="20">RPC S0               </enumItem>
-      <enumItem value="21">RPC S1               </enumItem>
-      <enumItem value="22">RPC S2               </enumItem>
-      <enumItem value="23">RPC S3               </enumItem>
-      <enumItem value="24">RPC S4               </enumItem>
-      <enumItem value="25">RPC S5               </enumItem>        
-      <enumItem value="28">TOF S0               </enumItem>
-      <enumItem value="29">TOF S1               </enumItem>
-      <enumItem value="2a">TOF S2               </enumItem>
-      <enumItem value="2b">TOF S3               </enumItem>
-      <enumItem value="2d">TOF S4               </enumItem>
-      <enumItem value="2e">TOF S5               </enumItem>        
+      <enumItem value="20">TOF S0               </enumItem>
+      <enumItem value="21">TOF S1               </enumItem>
+      <enumItem value="22">TOF S2               </enumItem>
+      <enumItem value="23">TOF S3               </enumItem>
+      <enumItem value="24">TOF S4               </enumItem>
+      <enumItem value="25">TOF S5               </enumItem>        
+      <enumItem value="28">RPC S0               </enumItem>
+      <enumItem value="29">RPC S1               </enumItem>
+      <enumItem value="2a">RPC S2               </enumItem>
+      <enumItem value="2b">RPC S3               </enumItem>
+      <enumItem value="2d">RPC S4               </enumItem>
+      <enumItem value="2e">RPC S5               </enumItem>        
       <enumItem value="30">fRPC1                </enumItem>
       <enumItem value="31">fRPC2                </enumItem>
       <enumItem value="32">RJ-A3                </enumItem>
         <enumItem value="19">Secondary 1          </enumItem>       
         <enumItem value="1a">Secondary 2          </enumItem>       
         <enumItem value="1b">Secondary 3          </enumItem>     
-        <enumItem value="20">RPC S0               </enumItem>
-        <enumItem value="21">RPC S1               </enumItem>
-        <enumItem value="22">RPC S2               </enumItem>
-        <enumItem value="23">RPC S3               </enumItem>
-        <enumItem value="24">RPC S4               </enumItem>
-        <enumItem value="25">RPC S5               </enumItem> 
-        <enumItem value="28">TOF S0               </enumItem>
-        <enumItem value="29">TOF S1               </enumItem>
-        <enumItem value="2a">TOF S2               </enumItem>
-        <enumItem value="2b">TOF S3               </enumItem>
-        <enumItem value="2d">TOF S4               </enumItem>
-        <enumItem value="2e">TOF S5               </enumItem>         
+        <enumItem value="20">TOF S0               </enumItem>
+        <enumItem value="21">TOF S1               </enumItem>
+        <enumItem value="22">TOF S2               </enumItem>
+        <enumItem value="23">TOF S3               </enumItem>
+        <enumItem value="24">TOF S4               </enumItem>
+        <enumItem value="25">TOF S5               </enumItem> 
+        <enumItem value="28">RPC S0               </enumItem>
+        <enumItem value="29">RPC S1               </enumItem>
+        <enumItem value="2a">RPC S2               </enumItem>
+        <enumItem value="2b">RPC S3               </enumItem>
+        <enumItem value="2d">RPC S4               </enumItem>
+        <enumItem value="2e">RPC S5               </enumItem>         
         <enumItem value="30" >Multiplexed Input 0  </enumItem>        
         <enumItem value="31" >Multiplexed Input 1  </enumItem>        
         <enumItem value="32" >Multiplexed Input 2  </enumItem>        
         <enumItem value="19">Secondary 1          </enumItem>       
         <enumItem value="1a">Secondary 2          </enumItem>       
         <enumItem value="1b">Secondary 3          </enumItem>     
-        <enumItem value="20">RPC S0               </enumItem>
-        <enumItem value="21">RPC S1               </enumItem>
-        <enumItem value="22">RPC S2               </enumItem>
-        <enumItem value="23">RPC S3               </enumItem>
-        <enumItem value="24">RPC S4               </enumItem>
-        <enumItem value="25">RPC S5               </enumItem> 
-        <enumItem value="28">TOF S0               </enumItem>
-        <enumItem value="29">TOF S1               </enumItem>
-        <enumItem value="2a">TOF S2               </enumItem>
-        <enumItem value="2b">TOF S3               </enumItem>
-        <enumItem value="2d">TOF S4               </enumItem>
-        <enumItem value="2e">TOF S5               </enumItem>         
+        <enumItem value="20">TOF S0               </enumItem>
+        <enumItem value="21">TOF S1               </enumItem>
+        <enumItem value="22">TOF S2               </enumItem>
+        <enumItem value="23">TOF S3               </enumItem>
+        <enumItem value="24">TOF S4               </enumItem>
+        <enumItem value="25">TOF S5               </enumItem> 
+        <enumItem value="28">RPC S0               </enumItem>
+        <enumItem value="29">RPC S1               </enumItem>
+        <enumItem value="2a">RPC S2               </enumItem>
+        <enumItem value="2b">RPC S3               </enumItem>
+        <enumItem value="2d">RPC S4               </enumItem>
+        <enumItem value="2e">RPC S5               </enumItem>         
         <enumItem value="30" >Multiplexed Input 0  </enumItem>        
         <enumItem value="31" >Multiplexed Input 1  </enumItem>        
         <enumItem value="32" >Multiplexed Input 2  </enumItem>        
         <enumItem value="19">Secondary 1          </enumItem>       
         <enumItem value="1a">Secondary 2          </enumItem>       
         <enumItem value="1b">Secondary 3          </enumItem>     
-        <enumItem value="20">RPC S0               </enumItem>
-        <enumItem value="21">RPC S1               </enumItem>
-        <enumItem value="22">RPC S2               </enumItem>
-        <enumItem value="23">RPC S3               </enumItem>
-        <enumItem value="24">RPC S4               </enumItem>
-        <enumItem value="25">RPC S5               </enumItem> 
-        <enumItem value="28">TOF S0               </enumItem>
-        <enumItem value="29">TOF S1               </enumItem>
-        <enumItem value="2a">TOF S2               </enumItem>
-        <enumItem value="2b">TOF S3               </enumItem>
-        <enumItem value="2d">TOF S4               </enumItem>
-        <enumItem value="2e">TOF S5               </enumItem>         
+        <enumItem value="20">TOF S0               </enumItem>
+        <enumItem value="21">TOF S1               </enumItem>
+        <enumItem value="22">TOF S2               </enumItem>
+        <enumItem value="23">TOF S3               </enumItem>
+        <enumItem value="24">TOF S4               </enumItem>
+        <enumItem value="25">TOF S5               </enumItem> 
+        <enumItem value="28">RPC S0               </enumItem>
+        <enumItem value="29">RPC S1               </enumItem>
+        <enumItem value="2a">RPC S2               </enumItem>
+        <enumItem value="2b">RPC S3               </enumItem>
+        <enumItem value="2d">RPC S4               </enumItem>
+        <enumItem value="2e">RPC S5               </enumItem>         
         <enumItem value="30" >Multiplexed Input 0  </enumItem>        
         <enumItem value="31" >Multiplexed Input 1  </enumItem>        
         <enumItem value="32" >Multiplexed Input 2  </enumItem>        
       <enumItem value="1d">raw J 1          </enumItem>
       <enumItem value="1e">raw J 2          </enumItem>
       <enumItem value="1f">raw J 3          </enumItem>      
-      <enumItem value="20">raw RPC S0               </enumItem>
-      <enumItem value="21">raw RPC S1               </enumItem>
-      <enumItem value="22">raw RPC S2               </enumItem>
-      <enumItem value="23">raw RPC S3               </enumItem>
-      <enumItem value="24">raw RPC S4               </enumItem>
-      <enumItem value="25">raw RPC S5               </enumItem>        
-      <enumItem value="28">raw TOF S0               </enumItem>
-      <enumItem value="29">raw TOF S1               </enumItem>
-      <enumItem value="2a">raw TOF S2               </enumItem>
-      <enumItem value="2b">raw TOF S3               </enumItem>
-      <enumItem value="2d">raw TOF S4               </enumItem>
-      <enumItem value="2e">raw TOF S5               </enumItem>        
+      <enumItem value="20">raw TOF S0               </enumItem>
+      <enumItem value="21">raw TOF S1               </enumItem>
+      <enumItem value="22">raw TOF S2               </enumItem>
+      <enumItem value="23">raw TOF S3               </enumItem>
+      <enumItem value="24">raw TOF S4               </enumItem>
+      <enumItem value="25">raw TOF S5               </enumItem>        
+      <enumItem value="28">raw RPC S0               </enumItem>
+      <enumItem value="29">raw RPC S1               </enumItem>
+      <enumItem value="2a">raw RPC S2               </enumItem>
+      <enumItem value="2b">raw RPC S3               </enumItem>
+      <enumItem value="2d">raw RPC S4               </enumItem>
+      <enumItem value="2e">raw RPC S5               </enumItem>        
       <enumItem value="30">raw fRPC1                </enumItem>
       <enumItem value="31">raw fRPC2                </enumItem>
       <enumItem value="32">raw RJ-A3                </enumItem>
       <enumItem value="7e">proc. J 2          </enumItem> 
       <enumItem value="7f">proc. J 3          </enumItem> 
       
-      <enumItem value="80">proc.RPC S0               </enumItem>
-      <enumItem value="81">proc.RPC S1               </enumItem>
-      <enumItem value="82">proc.RPC S2               </enumItem>
-      <enumItem value="83">proc.RPC S3               </enumItem>
-      <enumItem value="84">proc.RPC S4               </enumItem>
-      <enumItem value="85">proc.RPC S5               </enumItem> 
-      
-      <enumItem value="88">proc.TOF S0               </enumItem>
-      <enumItem value="89">proc.TOF S1               </enumItem>
-      <enumItem value="8a">proc.TOF S2               </enumItem>
-      <enumItem value="8b">proc.TOF S3               </enumItem>
-      <enumItem value="8d">proc.TOF S4               </enumItem>
-      <enumItem value="8e">proc.TOF S5               </enumItem>        
+      <enumItem value="80">proc.TOF S0               </enumItem>
+      <enumItem value="81">proc.TOF S1               </enumItem>
+      <enumItem value="82">proc.TOF S2               </enumItem>
+      <enumItem value="83">proc.TOF S3               </enumItem>
+      <enumItem value="84">proc.TOF S4               </enumItem>
+      <enumItem value="85">proc.TOF S5               </enumItem>       
+      <enumItem value="88">proc.RPC S0               </enumItem>
+      <enumItem value="89">proc.RPC S1               </enumItem>
+      <enumItem value="8a">proc.RPC S2               </enumItem>
+      <enumItem value="8b">proc.RPC S3               </enumItem>
+      <enumItem value="8d">proc.RPC S4               </enumItem>
+      <enumItem value="8e">proc.RPC S5               </enumItem>        
 
       <enumItem value="90">proc.Virtual Input 0      </enumItem>       
       <enumItem value="91">proc.Virtual Input 1      </enumItem>       
         <register name="Output_Proc_inA1" address="0001" >
         <description>Use Inputs 32 to 63 for output</description> 
         <field name="InputsA_32_63" start="0" bits="32" format="hex"  />
-        <field name="A_P32"  start="0" bits="1" format="bitmask"  > <description>RPC S0                                  </description></field>
-        <field name="A_P33"  start="1" bits="1" format="bitmask"  > <description>RPC S1                                  </description></field>
-        <field name="A_P34"  start="2" bits="1" format="bitmask"  > <description>RPC S2                                  </description></field>
-        <field name="A_P35"  start="3" bits="1" format="bitmask"  > <description>RPC S3                                  </description></field>
-        <field name="A_P36"  start="4" bits="1" format="bitmask"  > <description>RPC S4                                  </description></field>
-        <field name="A_P37"  start="5" bits="1" format="bitmask"  > <description>RPC S5                                  </description></field>
+        <field name="A_P32"  start="0" bits="1" format="bitmask"  > <description>TOF S0                                  </description></field>
+        <field name="A_P33"  start="1" bits="1" format="bitmask"  > <description>TOF S1                                  </description></field>
+        <field name="A_P34"  start="2" bits="1" format="bitmask"  > <description>TOF S2                                  </description></field>
+        <field name="A_P35"  start="3" bits="1" format="bitmask"  > <description>TOF S3                                  </description></field>
+        <field name="A_P36"  start="4" bits="1" format="bitmask"  > <description>TOF S4                                  </description></field>
+        <field name="A_P37"  start="5" bits="1" format="bitmask"  > <description>TOF S5                                  </description></field>
         <field name="A_P38"  start="6" bits="1" format="bitmask"  > <description>38                                      </description></field>
         <field name="A_P39"  start="7" bits="1" format="bitmask"  > <description>39                                      </description></field>
-        <field name="A_P40"  start="8" bits="1" format="bitmask"  > <description>TOF S0                                  </description></field>
-        <field name="A_P41"  start="9" bits="1" format="bitmask"  > <description>TOF S1                                  </description></field>
-        <field name="A_P42"  start="10" bits="1" format="bitmask"  ><description>TOF S2                                  </description></field>
-        <field name="A_P43"  start="11" bits="1" format="bitmask"  ><description>TOF S3                                  </description></field>
+        <field name="A_P40"  start="8" bits="1" format="bitmask"  > <description>RPC S0                                  </description></field>
+        <field name="A_P41"  start="9" bits="1" format="bitmask"  > <description>RPC S1                                  </description></field>
+        <field name="A_P42"  start="10" bits="1" format="bitmask"  ><description>RPC S2                                  </description></field>
+        <field name="A_P43"  start="11" bits="1" format="bitmask"  ><description>RPC S3                                  </description></field>
         <field name="A_P44"  start="12" bits="1" format="bitmask"  ><description>44                                      </description></field>
-        <field name="A_P45"  start="13" bits="1" format="bitmask"  ><description>TOF S4                                  </description></field>
-        <field name="A_P46"  start="14" bits="1" format="bitmask"  ><description>TOF S5                                  </description></field>
+        <field name="A_P45"  start="13" bits="1" format="bitmask"  ><description>RPC S4                                  </description></field>
+        <field name="A_P46"  start="14" bits="1" format="bitmask"  ><description>RPC S5                                  </description></field>
         <field name="A_P47"  start="15" bits="1" format="bitmask"  ><description>47                                      </description></field>
         <field name="A_P48"  start="16" bits="1" format="bitmask"  ><description>Virtual Input 0                         </description></field>
         <field name="A_P49"  start="17" bits="1" format="bitmask"  ><description>Virtual Input 1                         </description></field>
         <register name="Output_Proc_inB1" address="0001" >
         <description>Use Inputs 32 to 63 for output</description>
         <field name="InputsB_32_63" start="0" bits="32" format="hex"  />
-        <field name="B_P32"  start="0" bits="1" format="bitmask"  > <description>RPC S0                                  </description></field>
-        <field name="B_P33"  start="1" bits="1" format="bitmask"  > <description>RPC S1                                  </description></field>
-        <field name="B_P34"  start="2" bits="1" format="bitmask"  > <description>RPC S2                                  </description></field>
-        <field name="B_P35"  start="3" bits="1" format="bitmask"  > <description>RPC S3                                  </description></field>
-        <field name="B_P36"  start="4" bits="1" format="bitmask"  > <description>RPC S4                                  </description></field>
-        <field name="B_P37"  start="5" bits="1" format="bitmask"  > <description>RPC S5                                  </description></field>
+        <field name="B_P32"  start="0" bits="1" format="bitmask"  > <description>TOF S0                                  </description></field>
+        <field name="B_P33"  start="1" bits="1" format="bitmask"  > <description>TOF S1                                  </description></field>
+        <field name="B_P34"  start="2" bits="1" format="bitmask"  > <description>TOF S2                                  </description></field>
+        <field name="B_P35"  start="3" bits="1" format="bitmask"  > <description>TOF S3                                  </description></field>
+        <field name="B_P36"  start="4" bits="1" format="bitmask"  > <description>TOF S4                                  </description></field>
+        <field name="B_P37"  start="5" bits="1" format="bitmask"  > <description>TOF S5                                  </description></field>
         <field name="B_P38"  start="6" bits="1" format="bitmask"  > <description>38                                      </description></field>
         <field name="B_P39"  start="7" bits="1" format="bitmask"  > <description>39                                      </description></field>
-        <field name="B_P40"  start="8" bits="1" format="bitmask"  > <description>TOF S0                                  </description></field>
-        <field name="B_P41"  start="9" bits="1" format="bitmask"  > <description>TOF S1                                  </description></field>
-        <field name="B_P42"  start="10" bits="1" format="bitmask"  ><description>TOF S2                                  </description></field>
-        <field name="B_P43"  start="11" bits="1" format="bitmask"  ><description>TOF S3                                  </description></field>
+        <field name="B_P40"  start="8" bits="1" format="bitmask"  > <description>RPC S0                                  </description></field>
+        <field name="B_P41"  start="9" bits="1" format="bitmask"  > <description>RPC S1                                  </description></field>
+        <field name="B_P42"  start="10" bits="1" format="bitmask"  ><description>RPC S2                                  </description></field>
+        <field name="B_P43"  start="11" bits="1" format="bitmask"  ><description>RPC S3                                  </description></field>
         <field name="B_P44"  start="12" bits="1" format="bitmask"  ><description>44                                      </description></field>
-        <field name="B_P45"  start="13" bits="1" format="bitmask"  ><description>TOF S4                                  </description></field>
-        <field name="B_P46"  start="14" bits="1" format="bitmask"  ><description>TOF S5                                  </description></field>
+        <field name="B_P45"  start="13" bits="1" format="bitmask"  ><description>RPC S4                                  </description></field>
+        <field name="B_P46"  start="14" bits="1" format="bitmask"  ><description>RPC S5                                  </description></field>
         <field name="B_P47"  start="15" bits="1" format="bitmask"  ><description>47                                      </description></field>
         <field name="B_P48"  start="16" bits="1" format="bitmask"  ><description>Virtual Input 0                         </description></field>
         <field name="B_P49"  start="17" bits="1" format="bitmask"  ><description>Virtual Input 1                         </description></field>
       <sliceName value="29">raw J 1          </sliceName>
       <sliceName value="30">raw J 2          </sliceName>
       <sliceName value="31">raw J 3          </sliceName>      
-      <sliceName value="32">raw RPC S0               </sliceName>
-      <sliceName value="33">raw RPC S1               </sliceName>
-      <sliceName value="34">raw RPC S2               </sliceName>
-      <sliceName value="35">raw RPC S3               </sliceName>
-      <sliceName value="36">raw RPC S4               </sliceName>
-      <sliceName value="37">raw RPC S5               </sliceName>        
+      <sliceName value="32">raw TOF S0               </sliceName>
+      <sliceName value="33">raw TOF S1               </sliceName>
+      <sliceName value="34">raw TOF S2               </sliceName>
+      <sliceName value="35">raw TOF S3               </sliceName>
+      <sliceName value="36">raw TOF S4               </sliceName>
+      <sliceName value="37">raw TOF S5               </sliceName>        
       <sliceName value="38">---               </sliceName>
       <sliceName value="39">---               </sliceName>
-      <sliceName value="40">raw TOF S0               </sliceName>
-      <sliceName value="41">raw TOF S1               </sliceName>
-      <sliceName value="42">raw TOF S2               </sliceName>
-      <sliceName value="43">raw TOF S3               </sliceName>
+      <sliceName value="40">raw RPC S0               </sliceName>
+      <sliceName value="41">raw RPC S1               </sliceName>
+      <sliceName value="42">raw RPC S2               </sliceName>
+      <sliceName value="43">raw RPC S3               </sliceName>
       <sliceName value="44">---               </sliceName>
-      <sliceName value="45">raw TOF S4               </sliceName>
-      <sliceName value="46">raw TOF S5               </sliceName>        
+      <sliceName value="45">raw RPC S4               </sliceName>
+      <sliceName value="46">raw RPC S5               </sliceName>        
       <sliceName value="47">---               </sliceName>
       <sliceName value="48">raw fRPC1                </sliceName>
       <sliceName value="49">raw fRPC2                </sliceName>
       <sliceName value="125">proc. J 1          </sliceName> 
       <sliceName value="126">proc. J 2          </sliceName> 
       <sliceName value="127">proc. J 3          </sliceName> 
-      <sliceName value="128">proc.RPC S0               </sliceName>
-      <sliceName value="129">proc.RPC S1               </sliceName>
-      <sliceName value="130">proc.RPC S2               </sliceName>
-      <sliceName value="131">proc.RPC S3               </sliceName>
-      <sliceName value="132">proc.RPC S4               </sliceName>
-      <sliceName value="133">proc.RPC S5               </sliceName> 
+      <sliceName value="128">proc.TOF S0               </sliceName>
+      <sliceName value="129">proc.TOF S1               </sliceName>
+      <sliceName value="130">proc.TOF S2               </sliceName>
+      <sliceName value="131">proc.TOF S3               </sliceName>
+      <sliceName value="132">proc.TOF S4               </sliceName>
+      <sliceName value="133">proc.TOF S5               </sliceName> 
       <sliceName value="134">---               </sliceName>
       <sliceName value="135">---               </sliceName>
-      <sliceName value="136">proc.TOF S0               </sliceName>
-      <sliceName value="137">proc.TOF S1               </sliceName>
-      <sliceName value="138">proc.TOF S2               </sliceName>
-      <sliceName value="139">proc.TOF S3               </sliceName>
+      <sliceName value="136">proc.RPC S0               </sliceName>
+      <sliceName value="137">proc.RPC S1               </sliceName>
+      <sliceName value="138">proc.RPC S2               </sliceName>
+      <sliceName value="139">proc.RPC S3               </sliceName>
       <sliceName value="140">---               </sliceName>
-      <sliceName value="141">proc.TOF S4               </sliceName>
-      <sliceName value="142">proc.TOF S5               </sliceName>        
+      <sliceName value="141">proc.RPC S4               </sliceName>
+      <sliceName value="142">proc.RPC S5               </sliceName>        
       <sliceName value="143">---               </sliceName>
       <sliceName value="144">proc.Virtual Input 0      </sliceName>       
       <sliceName value="145">proc.Virtual Input 1      </sliceName>