From 99b93bbc042cd6f6001c7c0543372ba302f8da57 Mon Sep 17 00:00:00 2001
From: Ludwig Maier <lmaier@bia.e12.ph.tum.de>
Date: Sun, 25 May 2014 14:09:28 +0200
Subject: [PATCH] nxyter update registers

---
 web/htdocs/nxyter/index_a.pl | 19 ++-----------------
 xml-db/database/Nxyter.xml   | 36 +++++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/web/htdocs/nxyter/index_a.pl b/web/htdocs/nxyter/index_a.pl
index 5d501d3..e3fd253 100755
--- a/web/htdocs/nxyter/index_a.pl
+++ b/web/htdocs/nxyter/index_a.pl
@@ -104,26 +104,11 @@ $setup[15]->{cmd}     = "Nxyter-0x3811-ADCHist";
 $setup[15]->{period}  = -1;
 $setup[15]->{address} = 1;
 
-$setup[16]->{name}    = "IT_0";
-$setup[16]->{cmd}     = "Nxyter-0x3800-I2CTokens";
+$setup[16]->{name}    = "T_0";
+$setup[16]->{cmd}     = "Nxyter-0x3800-TSHist";
 $setup[16]->{period}  = -1;
 $setup[16]->{address} = 1;
 
-$setup[17]->{name}    = "IT_1";
-$setup[17]->{cmd}     = "Nxyter-0x3801-I2CTokens";
-$setup[17]->{period}  = -1;
-$setup[17]->{address} = 1;
-
-$setup[18]->{name}    = "IT_2";
-$setup[18]->{cmd}     = "Nxyter-0x3810-I2CTokens";
-$setup[18]->{period}  = -1;
-$setup[18]->{address} = 1;
-
-$setup[19]->{name}    = "IT_3";
-$setup[19]->{cmd}     = "Nxyter-0x3811-I2CTokens";
-$setup[19]->{period}  = -1;
-$setup[19]->{address} = 1;
-
 xmlpage::initPage(\@setup,$page);
 
 1;
diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index be97dcb..1508c05 100644
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -85,7 +85,7 @@
   <!-- ##################################################################### -->
 
   <group name="TriggerValidate"
-         address="0400"  size="32"  purpose="config"  mode="rw"  continuous="true">
+         address="0400"  size="34"  purpose="config"  mode="rw"  continuous="true">
     <register name="ReadoutMode" address="0000" purpose="config">
       <description>Readout mode selection</description>
 
@@ -202,24 +202,22 @@
       <field name="WinLowCtr" start="0" bits="15" format="unsigned"/>
     </register>
     
-    <!--
     <register name="WinHitCtr" address="001d" purpose="status" mode="r">
       <description>Window Hit Counter</description>
       <field name="WinHitCtr" start="0" bits="15" format="unsigned"/>
     </register>
-    -->    
-   
-    <register name="WinHighCtr" address="001d" purpose="status" mode="r">
+    
+    <register name="WinHighCtr" address="001e" purpose="status" mode="r">
       <description>Out of Window High Counter</description>
       <field name="WinHighCtr" start="0" bits="15" format="unsigned"/>
     </register>
 
-    <register name="DataRate" address="001e" purpose="status" mode="r">
+    <register name="DataRate" address="001f" purpose="status" mode="r">
       <description>Data Rate being written to Event Buffer in s&lt;sup&gt;-1&lt;/sup&gt;</description>
       <field name="DataRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
     </register>
 
-    <register name="HistLimits" address="001f" purpose="status" mode="rw">
+    <register name="HistLimits" address="0020" purpose="status" mode="rw">
       <description>HistLimits Setup</description>
       <field name="EnableFilter" start="31" bits="1" format="bitmask" />
       <field name="HistLimitsOn" start="30" bits="1" format="bitmask" />
@@ -227,7 +225,11 @@
       <field name="HistUpperThr" start="15" bits="14" format="unsigned" unit="ns"/>
       <field name="HistLowerThr" start="0"  bits="14" format="unsigned" unit="ns"/>
     </register>
-
+    
+    <register name="HistTSRange" address="0021" purpose="config" mode="rw">
+      <description>Timestamp Histogram Range (5=16&#956;s 4=8&#956;s 3=4&#956;s 2=2&#956;s 1=1&#956;s)</description>
+      <field name="HistTSRange" start="0" bits="3" format="unsigned"/>
+    </register>
   </group>
   
   <!-- ##################################################################### -->
@@ -796,9 +798,9 @@
 
     <register name="ErrorStatus" address="0009" purpose="status" mode="r" >
       <description>Error Status of all Entities</description>
-      <field name="DataRec"   start="0" bits="1" format="bitmask" purpose="status"/>
-      <field name="DataValid" start="1" bits="1" format="bitmask" purpose="status"/>
       <field name="EventBuf"  start="2" bits="1" format="bitmask" purpose="status"/>
+      <field name="DataValid" start="1" bits="1" format="bitmask" purpose="status"/>
+      <field name="DataRec"   start="0" bits="1" format="bitmask" purpose="status"/>
     </register>
 
     <register name="SetOffline" address="0000" purpose="config" mode="rw" >
@@ -911,7 +913,7 @@
   <group name="RateHist"
          address="0800"  size="128"  purpose="config"  mode="r" continuous="true">    
     <register name="ChannelHitCtr" address="0000" purpose="status" mode="r" repeat="128">
-      <description>Continuous Hit Counter per Channel</description>
+      <description>Hit Counter per Channel</description>
       <field name="ChannelHitCtr" start="0" bits="32" format="unsigned" rate="1" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
     </register>
   </group>
@@ -939,10 +941,18 @@
       <field name="ChannelADCVal" start="0" bits="32" format="unsigned"/>
     </register>
     
-    <register name="ADCNumAverages" address="0080" purpose="status" mode="rw">
+    <register name="ADCNumAverages" address="0b80" purpose="status" mode="rw">
       <description>Number of Averages per Channel, power of two (2^n)</description>
       <field name="ADCNumAverages" start="0" bits="3" format="unsigned"/>
     </register>
   </group>
-  
+
+  <group name="TSHist"
+         address="0c00"  size="512"  purpose="config"  mode="r" continuous="true">    
+    <register name="TSVal" address="0000" purpose="status" mode="r" repeat="512">
+      <description>Timestamp Hit Counter</description>
+      <field name="TSVal" start="0" bits="32" format="unsigned"/>
+    </register>
+  </group>
+
 </TrbNetEntity>
-- 
2.43.0