nxyter register

diff --git a/tools/hadplot b/tools/hadplot
index b445128b41ea7022a38b74b3517ef3053c5f5b77..c7f9f5964c66756a7d634c9e53229bed6f5bb967 100755 (executable)
--- a/tools/hadplot
+++ b/tools/hadplot
@@ -562,6 +562,7 @@ Options:
   -windowname     Name of window (shown in titlebar after "Hadplot - "
   -timeref        In a differential plot, the endpoint with this addressis used for timestamping
   -(x|y)scale     Scaling factor, the x/y values are divided by
+  -(x|y)min       Minimal value for x/y axis
   -(x|y)max       Maximal value for x/y axis
   -(x|y)title     Label for axes
   -xistime        Marks x axis as containing time stamps (used for formatting)

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 0580348c1b8ed9fc9aac43e314906b047ec2d88c..57fcfbce38771305c22cbc686ec1e7f6bf7b49a4 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -42,6 +42,11 @@ $setup[4]->{cmd}     = "Nxyter-0xfe49-NxyterI2C&Nxyter-0xfe49-NxyterDAC";
 $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
+$setup[5]->{name}    = "NXHistograms";
+$setup[5]->{cmd}     = "Nxyter-0xfe49-NXHistos&Nxyter-0xfe49-NXHistos";
+$setup[5]->{period}  = -1;
+$setup[5]->{address} = 1;
+
 xmlpage::initPage(\@setup,$page);
 
 1;

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 54e714d652797be94e2d6a85b5ac547cfeee250a..d40517490ae9ff23de0acf3dccf79f7489cb09ce 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -103,7 +103,7 @@
 
 
   <group name="TriggerValidate"
-         address="0400"  size="27"  purpose="config"  mode="rw"  continuous="true">
+         address="0400"  size="32"  purpose="config"  mode="rw"  continuous="true">
     <register name="ReadoutMode" address="0000" purpose="config">
       <description>Readout mode selection</description>
       
@@ -201,14 +201,39 @@
 
     <register name="WaitForData" address="0019" purpose="status" mode="r">
       <description>Readout wait for data time</description>
-      <field name="WaitForData" start="0" bits="20" format="unsigned" unit="ns"/>
+      <field name="Disable" start="31" bits="1" format="boolean" purpose="config" mode="rw"/>
+      <field name="WaitTime" start="0" bits="20" format="unsigned" unit="ns"/>
     </register>
 
     <register name="NxyterCVT" address="001a" purpose="config" mode="rw">
       <description>Nxyter CVT</description>
       <field name="NxyterCVT" start="0" bits="12" format="unsigned" unit="ns"/>
     </register>
+    
+    <register name="MinValTime" address="001b" purpose="status" mode="r">
+      <description>Minimum Validation Time</description>
+      <field name="MinValTime" start="0" bits="20" format="unsigned" unit="ns"/>
+    </register>
 
+    <register name="WinLowCtr" address="001c" purpose="status" mode="r">
+      <description>Out of Window Low Counter</description>
+      <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="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="001f" purpose="status" mode="r">
+      <description>Data Rate being written to Event Buffer in Hz</description>
+      <field name="DataRate" start="0" bits="28" format="unsigned" unit="Hz"/>
+    </register>
   </group>
 
 
@@ -482,4 +507,23 @@
 
   </group>
 
+  <group name="NXHistos"
+         address="0800" purpose="status"  mode="r" continuous="false">
+    
+    <group name="RateHist"
+           address="0000"  size="129"  purpose="config"  mode="rw" continuous="true">    
+    
+      <register name="ChannelHitCtr" address="0000" purpose="status" mode="r" repeat="128">
+        <description>Continuous Hit Counter per Channel</description>
+        <field name="ChannelHitCtr" start="0" bits="32" format="unsigned"/>
+      </register>
+    
+      <register name="AverageNum" address="0080" purpose="config" mode="rw">
+        <description>Number of Averages, power of two (2^n)</description>
+        <field name="AverageNum" start="0" bits="32" format="unsigned"/>
+      </register>
+    
+    </group>
+  </group>  
+
 </TrbNetEntity>