nxyter register update

diff --git a/users/tum_e12/setenv.sh b/users/tum_e12/setenv.sh
index 4844152d41b3a965c0f5f8df7d7849b6659049c8..d38fcfa3b28c6d199633155bd53949d8a23f66db 100755 (executable)
--- a/users/tum_e12/setenv.sh
+++ b/users/tum_e12/setenv.sh
@@ -9,6 +9,7 @@ expath ${BASEDIR}/trbnettools/bin
 export PERL5LIB=${BASEDIR}/trbnettools/perllib/usr/local/lib64/perl5:${BASEDIR}/daqtools/web/CtsPlugins:${BASEDIR}/daqtools/web/include
 
 export TRB3_SERVER=trb3
-#export DAQOPSERVER=bia
-export DAQOPSERVER=crius
+
+export DAQOPSERVER=bia
+
 export TRBNETID=12

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index aecdc89bac84fea064f4061e1db68649b7349c2e..4093f87a6a804ea8f26d2c1179f1e394d566f953 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -50,7 +50,7 @@ $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
 $setup[5]->{name}    = "NXHistograms";
-$setup[5]->{cmd}     = "Nxyter-0xfe49-NXHistos-rate";
+$setup[5]->{cmd}     = "Nxyter-0xfe49-NXHistos";
 $setup[5]->{period}  = -1;
 $setup[5]->{address} = 1;
 

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 6d89f96dda5623dfc42124dfca99c18a92231645..470d65e2fa678dd1c8fe1f05ca9070e89c662fe2 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -512,41 +512,40 @@
          address="0800" purpose="status"  mode="r" continuous="false">
     
     <group name="RateHist"
-           address="0000"  size="128"  purpose="config"  mode="rw" continuous="true">    
+           address="0000"  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>
         <field name="ChannelHitCtr" start="0" bits="32" format="unsigned" rate="1" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
       </register>
-    <!--
-      <register name="AverageNumH" address="0080" purpose="config" mode="rw">
-        <description>Number of Averages, power of two (2^n)</description>
-        <field name="AverageNumH" start="0" bits="32" format="unsigned"/>
-      </register>
-      
-      <register name="EnableAverageH" address="0081" purpose="config" mode="rw">
-        <description>Enable Average mode</description>
-        <field name="EnableAverageH" start="0" bits="1" format="boolean"/>
-      </register>
--->
     </group>
     
     <group name="ADCHist"
-           address="0100"  size="128"  purpose="config"  mode="rw" continuous="true">    
+           address="0100"  size="128"  purpose="config"  mode="r" continuous="true">    
       <register name="ChannelADCVal" address="0000" purpose="status" mode="r" repeat="128">
-        <description>Continuous Hit Counter per Channel</description>
+        <description>ADC Value Average per Channel</description>
         <field name="ChannelADCVal" start="0" bits="32" format="unsigned"/>
       </register>
-  <!--  
-      <register name="AverageNumA" address="0080" purpose="config" mode="rw">
-        <description>Number of Averages, power of two (2^n)</description>
-        <field name="AverageNumA" start="0" bits="32" format="unsigned"/>
+    </group>
+
+    <register name="ADCNumAverages" address="0180" 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 name="PileUpHist"
+           address="0200"  size="128"  purpose="config"  mode="r" continuous="true">    
+      <register name="ChannelPileupVal" address="0000" purpose="status" mode="r" repeat="128">
+        <description>Continuous Pile Up Counter per Channel</description>
+        <field name="ChannelPileupVal" start="0" bits="32" format="unsigned" rate="1" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
       </register>
-      
-      <register name="EnableAverageA" address="0081" purpose="config" mode="rw">
-        <description>Enable Average mode</description>
-        <field name="EnableAverageA" start="0" bits="1" format="boolean"/>
+    </group>
+
+    <group name="OverFlowHist"
+           address="0300"  size="128"  purpose="config"  mode="r" continuous="true">    
+      <register name="ChannelOvflVal" address="0000" purpose="status" mode="r" repeat="128">
+        <description>Continuous Overflow Counter per Channel</description>
+        <field name="ChannelOvflVal" start="0" bits="32" format="unsigned" rate="1" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
       </register>
--->
     </group>
 
   </group>