nxyter register update

diff --git a/users/tum_e12/configure_eb.sh b/users/tum_e12/configure_eb.sh
index 4283ae8996628792c3421232fb0f0d82f89cfc96..bda91eb7ef2cec9390455022c7e795b2f7053bc7 100755 (executable)
--- a/users/tum_e12/configure_eb.sh
+++ b/users/tum_e12/configure_eb.sh
@@ -8,31 +8,31 @@
 #trbcmd w 0x8000 0x8101 0x6cf0       # Bit 15..0: Higher 16 bit of EB MAC,
 
 # MAC Bia Local Net
-#trbcmd w 0x8000 0x8100 0x0c2e8176    # Lower 32 bits of EB MAC
-#trbcmd w 0x8000 0x8101 0x000e        # Bit 15..0: Higher 16 bit of EB MAC,
+trbcmd w 0x8000 0x8100 0x0c2e8176    # Lower 32 bits of EB MAC
+trbcmd w 0x8000 0x8101 0x000e        # Bit 15..0: Higher 16 bit of EB MAC,
 
 # MAC Crius Local Net
-trbcmd w 0x8000 0x8100 0xb9f0b3e0    # Lower 32 bits of EB MAC
-trbcmd w 0x8000 0x8101 0x0019        # Bit 15..0: Higher 16 bit of EB MAC,
+#trbcmd w 0x8000 0x8100 0xb9f0b3e0    # Lower 32 bits of EB MAC
+#trbcmd w 0x8000 0x8101 0x0019        # Bit 15..0: Higher 16 bit of EB MAC,
 
 # IP Adress and Port of EB: (10.152.8.107:50000) Bia E12 Net
 #trbcmd w 0x8000 0x8102 0x0a98086b   # Destination IP
 #trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
 
 # IP Adress and Port of EB: (192.168.1.107:50000) Bia Local Net
-#trbcmd w 0x8000 0x8102 0xc0a8016b   # Destination IP
-#trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
+trbcmd w 0x8000 0x8102 0xc0a8016b   # Destination IP
+trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
 
 # IP Adress and Port of EB: (10.152.8.107:50000) Crius E12 Net
-trbcmd w 0x8000 0x8102 0x81bba22c   # Destination IP
-trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
+#trbcmd w 0x8000 0x8102 0x81bba22c   # Destination IP
+#trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
 
 # MAC Adress of Source (TRB3)
 trbcmd w 0x8000 0x8104 0xdead8001   # Lower 32 bits of Source MAC
 trbcmd w 0x8000 0x8105 0x0230       # Bit 15..0: Higher 16 bit of Source MAC
 
 # IP and Port of Source (10.152.8.17:50000)
-trbcmd w 0x8000 0x8106 0x0a980811   # (10.152.8.17) Source IP TRB3 E12 Net
-#trbcmd w 0x8000 0x8106 0xc0a80111   # (192.168.1.17) Source IP TRB3 Local Net
+#trbcmd w 0x8000 0x8106 0x0a980811   # (10.152.8.17) Source IP TRB3 E12 Net
+trbcmd w 0x8000 0x8106 0xc0a80111   # (192.168.1.17) Source IP TRB3 Local Net
 trbcmd w 0x8000 0x8107 0xc350       # Bit 15..0: Source UDP Port 
 trbcmd w 0x8000 0x8108 0x0578       # Bit 15..0: MTU size

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 470d65e2fa678dd1c8fe1f05ca9070e89c662fe2..9f5a0b448ede793f3aec01dc9bccf477a24c0be6 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -106,7 +106,7 @@
          address="0400"  size="32"  purpose="config"  mode="rw"  continuous="true">
     <register name="ReadoutMode" address="0000" purpose="config">
       <description>Readout mode selection</description>
-      
+
       <field name="SelfTrigger" start="3" bits="1" format="boolean">
         <description>Self Trigger Mode</description>
       </field>
@@ -117,10 +117,10 @@
 
       <field name="StatusSelect" start="0" bits="2" format="enum">
         <description>Timestamp Selection Mode</description>
-        <enumItem value="0">Ovfl, Parity Bits valid</enumItem>
-        <enumItem value="1">Ovfl, Parity, Pileup Bits valid</enumItem>
-        <enumItem value="2">ignore Status Bits</enumItem>
-        <enumItem value="3">ignore Status Bits</enumItem>
+        <enumItem value="0">Default: 11Bit TS, PileUp + Parity Bits</enumItem>
+        <enumItem value="1">Extended TS: 13Bit TS</enumItem>
+        <enumItem value="2">FullTS: 14Bit TS, no ADC, PileUp + Parity Bits</enumItem>
+        <enumItem value="3">RESERVED</enumItem>
       </field>
     </register>