nxyter update registers

diff --git a/users/tum_e12/configure_cts.sh b/users/tum_e12/configure_cts.sh
index 8d29ec4cb4830e72229ae59351a01488c553e41d..4a27736d89211b5390fef2f5b7569b348e35454a 100755 (executable)
--- a/users/tum_e12/configure_cts.sh
+++ b/users/tum_e12/configure_cts.sh
@@ -13,9 +13,7 @@ trbcmd w 0x8000 0x830b 0x7
 trbcmd w 0x8000 0x830d 0x0
 
 # Pulser #0 Settings
-trbcmd w 0x8000 0xa140  0x0001869f
-#trbcmd clearbit 0x8000 0xa101 0x2
+trbcmd w 0x8000 0xa150  0x0001869f  # 1 kHz   Pulser #0
+trbcmd w 0x8000 0xa151  0x000003e7  # 100 kHz Pulser #1
+trbcmd w 0x8000 0xa153  0x000053e3  # 1 kHz Random
 
-# Pulser #0 Settings
-#trbcmd w 0x8000 0xa137 0x0001869f #0x3e7
-#trbcmd clearbit 0x8000 0xa101 0x2

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index e1657bd8385002a6aba4cefafde34efa458573a7..8c05cd8a76844dea6f1944d1388762307c4294d1 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -40,7 +40,7 @@ $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
 $setup[3]->{name}    = "TriggerHandler";
-$setup[3]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse";
+$setup[3]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse&Nxyter-0xfe49-EventBuffer";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 

diff --git a/web/include/CtsCommands.pm b/web/include/CtsCommands.pm
index 2787f4c73a41a9ea9fe9f2d28f8a2e1879621fd0..83ee32977f7ff19e121feb5240fd5dbc6df1ac60 100644 (file)
--- a/web/include/CtsCommands.pm
+++ b/web/include/CtsCommands.pm
@@ -502,14 +502,14 @@ EOF
 set xrange [*:0]
 set output "$config->{'dump_dir'}/_tmp_plot.png"
 plot \\
-"$config->{'dump_dir'}/plot.data" using 1:3:(\$3 / 1000) with yerrorlines title "Edges", \\
-"$config->{'dump_dir'}/plot.data" using 1:4:(\$4 / 1000) with yerrorlines title "Accepted"
+"$config->{'dump_dir'}/plot.data" using 1:3 with lp title "Edges", \\
+"$config->{'dump_dir'}/plot.data" using 1:4 with lp title "Accepted"
 
 set xrange [-5:0]
 set output "$config->{'dump_dir'}/_tmp_plotshort.png"
 plot \\
-"$config->{'dump_dir'}/plot.data" using 1:3:(\$3 / 1000) with yerrorlines title "Edges", \\
-"$config->{'dump_dir'}/plot.data" using 1:4:(\$4 / 1000) with yerrorlines title "Accepted"
+"$config->{'dump_dir'}/plot.data" using 1:3 with lp title "Edges", \\
+"$config->{'dump_dir'}/plot.data" using 1:4 with lp title "Accepted"
 
 EOF
 ;

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 9f1de1ac1ff8e3d3d408b8d531a308236ca8cf10..6c4354e6854c5888c7462aca67bc5ea776e422ba 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -6,69 +6,7 @@
               >
   <description>Registers for the Nxyter Readout</description>
 
-  <group name="DataValidate"
-         address="0120"  size="11"  purpose="status"  mode="r"  continuous="true">
-
-    <register name="InvalidFrames" address="0000" purpose="status">
-      <description>Number of invalid frames</description>
-      <field name="InvalidFrames" start="0" bits="16" format="unsigned" />
-    </register>
-
-    <register name="OverflowCount" address="0001" purpose="status">
-      <description>Number of hit overflows</description>
-      <field name="OverflowCount" start="0" bits="16" format="unsigned" />
-    </register>
-
-    <register name="PileupCount" address="0002" purpose="status">
-      <description>Pileup Counter</description>
-      <field name="PileupCount" start="0" bits="16" format="unsigned" />
-    </register>
- 
-    <register name="PileupRate" address="0009" purpose="status" mode="r">
-      <description>Pileup Rate</description>
-      <field name="PileupRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
-    </register>
-    
-    <register name="OverflowRate" address="000a" purpose="status" mode="r">
-      <description>Overflow Rate</description>
-      <field name="OverflowRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
-    </register>
-
-    <register name="ParityErrorCount" address="0003" purpose="status">
-      <description>Parity Error Counter</description>
-      <field name="ParityErrorCount" start="0" bits="16" format="unsigned" />
-    </register>
-
-    <group name="NxyterRates"
-           address="0004"  size="2"  purpose="status"  mode="r"  continuous="true">
-      <register name="HitRate" address="0000" purpose="status">
-        <description>Total hit rate summed over all channels</description>
-        <field name="HitRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
-      </register>
-
-      <register name="FrameRate" address="0001" purpose="status">
-        <description>Rate of Incoming Nxyter + ADC Frames, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
-        <field name="FrameRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
-      </register>
-    </group>
-    
-   
-    <register name="ADCValue" address="0006" purpose="status" mode="r">
-      <description>Last valid ADC value</description>
-      <field name="ADCValue" start="0" bits="12" format="unsigned"/>
-    </register>
-
-    <register name="ADCAverage" address="0007" purpose="status" mode="r">
-      <description>Average of last valid ADC Values</description>
-      <field name="ADCAverage" start="0" bits="12" format="unsigned"/>
-    </register>
-        
-    <register name="ADCAverageNum" address="0008" purpose="config" mode="rw">
-      <description>Number of Averages, power of two (2^n)</description>
-      <field name="ADCAverageNum" start="0" bits="4" format="unsigned" />
-    </register>
-  </group>
-
+  
   <!-- ##################################################################### -->
 
   <group name="TriggerHandler"
@@ -252,7 +190,7 @@
   <!-- ##################################################################### -->
 
   <group name="DataReceiver"
-         address="0500"  size="21"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="22"  purpose="status"  mode="rw"  continuous="true">
     <register name="RFrameRate" address="0013" purpose="status" mode="r">
       <description>Merge of Nxyter and ADC Frame Rates, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
       <field name="RFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
@@ -261,14 +199,19 @@
     <register name="ErrorBits" address="0014" purpose="status" mode="r">
       <description>Status of Error Bits</description>
       <field name="NX_Offline"     start="0" bits="1" format="bitmask" purpose="status" mode="r"/>    
-      <field name="Frame_Rate"     start="8" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="NX_Rate"        start="1" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="NX_Sync"        start="2" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="NX_Parity"      start="3" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_Err"        start="4" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_PLL"        start="5" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_CLK"        start="6" bits="1" format="bitmask" purpose="status" mode="r"/>
-      <field name="ADC_Rate"       start="7" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="Frame_Rate"     start="1" bits="1" format="bitmask" purpose="status" mode="r"/>            
+      <field name="NX_Rate"        start="2" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_Rate"       start="3" bits="1" format="bitmask" purpose="status" mode="r"/>      
+      <field name="Parity"         start="4" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="NX_Sync"        start="5" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_Err"        start="6" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_PLL"        start="7" bits="1" format="bitmask" purpose="status" mode="r"/>
+      <field name="ADC_CLK"        start="8" bits="1" format="bitmask" purpose="status" mode="r"/>
+    </register>
+    
+    <register name="ResetBusy" address="000b" purpose="status" mode="rw">
+      <description>Reset Busy Status, Click to force reset</description>
+      <field name="ResetBusy" start="0" bits="1" format="bitmask" />
     </register>
 
     <register name="ResetCounter" address="000c" purpose="status" mode="r">
@@ -305,6 +248,11 @@
       <description>Number of Resyncs</description>
       <field name="ResyncCounter" start="0" bits="32" format="unsigned" />
     </register>
+    
+    <register name="ParityErrRate" address="0015" purpose="status" mode="r">
+      <description>Nxyter Timestamp Frame Rate, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
+      <field name="ParityErrRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
 
     <register name="ParityErrorCounter" address="0003" purpose="status" mode="r">
       <description>Number of Parity Errors</description>
@@ -346,11 +294,6 @@
       <field name="Reserved1" start="0" bits="4" format="unsigned" />
     </register>
     
-    <register name="ADCClockOK" address="000b" purpose="status" mode="r">
-      <description>ADC Clock OK, Johnson counter is synced</description>
-      <field name="ADCClockOK" start="0" bits="1" format="boolean" />
-    </register>
-
     <register name="TSDelay" address="000d" purpose="config" mode="rw">
       <description>Delay of Timestamp Fifo</description>
       <field name="TSDelay" start="0" bits="4" format="unsigned" />
@@ -391,6 +334,71 @@
   
   <!-- ##################################################################### -->
 
+  <group name="DataValidate"
+         address="0120"  size="11"  purpose="status"  mode="r"  continuous="true">
+    
+    <register name="InvalidFrames" address="0000" purpose="status">
+      <description>Number of invalid frames</description>
+      <field name="InvalidFrames" start="0" bits="16" format="unsigned" />
+    </register>
+    
+    <register name="OverflowCount" address="0001" purpose="status">
+      <description>Number of hit overflows</description>
+      <field name="OverflowCount" start="0" bits="16" format="unsigned" />
+    </register>
+
+    <register name="PileupCount" address="0002" purpose="status">
+      <description>Pileup Counter</description>
+      <field name="PileupCount" start="0" bits="16" format="unsigned" />
+    </register>
+ 
+    <register name="PileupRate" address="0009" purpose="status" mode="r">
+      <description>Pileup Rate</description>
+      <field name="PileupRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
+    
+    <register name="OverflowRate" address="000a" purpose="status" mode="r">
+      <description>Overflow Rate</description>
+      <field name="OverflowRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
+    </register>
+
+    <register name="ParityErrorCount" address="0003" purpose="status">
+      <description>Parity Error Counter</description>
+      <field name="ParityErrorCount" start="0" bits="16" format="unsigned" />
+    </register>
+
+    <group name="NxyterRates"
+           address="0004"  size="2"  purpose="status"  mode="r"  continuous="true">
+      <register name="HitRate" address="0000" purpose="status">
+        <description>Total hit rate summed over all channels</description>
+        <field name="HitRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+      </register>
+
+      <register name="FrameRate" address="0001" purpose="status">
+        <description>Rate of Incoming Nxyter + ADC Frames, must be 31.25&amp;middot;10&lt;sup&gt;6&lt;/sup&gt;s&lt;sup&gt;-1&lt;/sup&gt;</description>
+        <field name="FrameRate" start="0" bits="32" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+      </register>
+    </group>
+    
+   
+    <register name="ADCValue" address="0006" purpose="status" mode="r">
+      <description>Last valid ADC value</description>
+      <field name="ADCValue" start="0" bits="12" format="unsigned"/>
+    </register>
+
+    <register name="ADCAverage" address="0007" purpose="status" mode="r">
+      <description>Average of last valid ADC Values</description>
+      <field name="ADCAverage" start="0" bits="12" format="unsigned"/>
+    </register>
+        
+    <register name="ADCAverageNum" address="0008" purpose="config" mode="rw">
+      <description>Number of Averages, power of two (2^n)</description>
+      <field name="ADCAverageNum" start="0" bits="4" format="unsigned" />
+    </register>
+  </group>
+
+  <!-- ##################################################################### -->
+
   <group name="NxyterI2C"
          address="0200" purpose="config"  mode="rw"  continuous="false">
 
@@ -702,7 +710,8 @@
 
     <register name="ErrorStatus" address="0009" purpose="status" mode="r" >
       <description>Error Status of all Entities</description>
-      <field name="ErrorStatus" start="0" bits="7" format="bitmask"/>
+      <field name="DataRec" start="0" bits="1" format="bitmask" purpose="status"/>
+      <field name="EventBuf"  start="1" bits="1" format="bitmask" purpose="status"/>
     </register>
 
     <register name="SetOffline" address="0000" purpose="config" mode="rw" >
@@ -785,6 +794,33 @@
   
   <!-- ##################################################################### -->
 
+  <group name="EventBuffer"
+         address="0601"  size="4"  purpose="status"  mode="r"  continuous="true">
+
+    <register name="EvtBufDepth" address="0000" purpose="config" mode="rw">
+      <description>Evenbuffer Depth (10 ... 4000)</description>
+      <field name="EvtBufDepth" start="0" bits="11" format="unsigned" unit="Bytes" scale="4"/>
+    </register>
+
+    <register name="EvtBufFlushCtr" address="0001" purpose="status" mode="r">
+      <description>Last Eventbuffer Flush Counter</description>
+      <field name="EvtBufFlushCtr" start="0" bits="11" format="unsigned" unit="Words"/>
+    </register>
+
+    <register name="BufFullRate" address="0002" purpose="status" mode="r">
+      <description>Event Buffer Full Flag Rate</description>
+      <field name="BufFullRate" start="0" bits="19" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
+    </register>
+
+    <register name="Error" address="0003" purpose="status" mode="r">
+      <description>Event Buffer Error Status (i.e. Full Rate > 0)</description>
+      <field name="Error" start="0" bits="1" format="boolean"/>
+    </register>
+
+  </group>
+
+  <!-- ##################################################################### -->
+
   <group name="RateHist"
          address="0800"  size="128"  purpose="config"  mode="r" continuous="true">    
     <register name="ChannelHitCtr" address="0000" purpose="status" mode="r" repeat="128">