new gen of histograming

diff --git a/users/cosy_test/config/cts.sh b/users/cosy_test/config/cts.sh
index 9d7d137f8ee30d979ae969614ea0a33f4ead7a1d..2fc464d2be5cd12ecbe6d55bd3eba93a7840fec6 100755 (executable)
--- a/users/cosy_test/config/cts.sh
+++ b/users/cosy_test/config/cts.sh
@@ -9,7 +9,7 @@ trbcmd w 0x8000 0xa141 0x05f5e100  #periodic pulser 1 at 1 Hz for 0xE trigger ty
 trbcmd loadbit 0x8000 0xa148 0x0f00 0x0e00 # setting trigger type E for second pulser
 #trbcmd setbit  0x8000 0xa101 0x6 # turn on periodic pulser 1 and 0
 trbcmd setbit  0x8000 0xa101 0x2 # turn on periodic pulser 0
-#trbcmd setbit  0x8000 0xa101 0x4 # turn on periodic pulser 1
+trbcmd setbit  0x8000 0xa101 0x4 # turn on periodic pulser 1
 
 #trbcmd loadbit 0x8000 0xa13d 0x7f 0xa # setting multiplexer input
 trbcmd loadbit 0x8000 0xa13d 0x7f 0xc # nim 1

diff --git a/users/cosy_test/config/trbstart.sh b/users/cosy_test/config/trbstart.sh
index e1fc641d36aef8c3feb3c3e26cc461ab07b2ab5c..b187ca9de13ae5a3249c26974ce9f77c43593c5d 100755 (executable)
--- a/users/cosy_test/config/trbstart.sh
+++ b/users/cosy_test/config/trbstart.sh
@@ -18,6 +18,8 @@ TRBNUM=129
 #../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 007E0100; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100'
 
 # low res for TOF                                                                | here is the change
-../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 007E0000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100'
+#../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 007E0000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100'
 
+#                                                                             || - reference token delay, 25ns per bit
+../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 00000000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100'
 

diff --git a/users/cosy_test/evtbuilder_start.sh b/users/cosy_test/evtbuilder_start.sh
index 1849f8bc0cf40570685b795658240becebb9d0e5..ebb421ccd163f0a139abdd2d97f302501eade45a 100755 (executable)
--- a/users/cosy_test/evtbuilder_start.sh
+++ b/users/cosy_test/evtbuilder_start.sh
@@ -4,7 +4,7 @@ dest="/scratch/c/hldfiles"
 sdest="/scratch/c/shldfiles"
 tmpdir="/tmp/eventbuild"
 pref="te"
-sden=0
+sden=1
 
 usage() {
        echo "Usage: $0 [-d <hlddir>] [-s <shlddir>] [-p <te|be|ca>] [-t] [-h]"

diff --git a/users/cosy_test/nxscripts/mode_t.sh b/users/cosy_test/nxscripts/mode_t.sh
index 446576cd6c7af9e80b43dbb22d5f8472c2a99f5a..5dcc2dcdd98eca2b456dfc4f3cb6eb411a8fb9c7 100755 (executable)
--- a/users/cosy_test/nxscripts/mode_t.sh
+++ b/users/cosy_test/nxscripts/mode_t.sh
@@ -9,4 +9,4 @@ trbcmd setbit $addr $(( 0x8200 + 32 )) 0x08
 trbcmd w $addr 0x8160 1
 trbcmd w $addr 0x8140 100
 
-trbcmd w $addr 0x8218 0
+trbcmd w $addr 0x8218 0xff

diff --git a/users/cosy_test/trbnet_env_pexor.sh b/users/cosy_test/trbnet_env_pexor.sh
index f66d46324461d694dfe7e38afd101000364cad7e..b559d3b94375a7812d6f7a9dd2a17a6776999add 100755 (executable)
--- a/users/cosy_test/trbnet_env_pexor.sh
+++ b/users/cosy_test/trbnet_env_pexor.sh
@@ -6,7 +6,6 @@ EXTRALIB=${HOME}/usr/lib64:${HOME}/projects/install/lib
 HADESLIB=${HOME}/trbsoft/trbnettools/lib
 
 export LD_LIBRARY_PATH=${HADESLIB}:${EXTRALIB}:${LD_LIBRARY_PATH}
-export PATH=${HOME}/bin:${HOME}/usr/bin:${PATH}
 
 TRBSOFT=${HOME}/trbsoft
 

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

diff --git a/web/include/CtsCommands.pm b/web/include/CtsCommands.pm
index e51e4e819dc0af2df3be3c7a1f65cc3692d7f221..a099a6f38e3507146542094b3f67401d27dc0e28 100644 (file)
--- a/web/include/CtsCommands.pm
+++ b/web/include/CtsCommands.pm
@@ -478,7 +478,7 @@ EOF
 
       # generate plot
          if ($gnuplot_fh) {
-            shift @$plotData if $#{ $plotData } > 30;
+            shift @$plotData if $#{ $plotData } > 180;
             push @$plotData, [
                $time,
                $rates->{'cts_cnt_trg_asserted.value'}{'rate'},
@@ -546,4 +546,4 @@ EOF
    }
 }
 
-1;
\ No newline at end of file
+1;

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index d40517490ae9ff23de0acf3dccf79f7489cb09ce..cb80ec2dbb5eab74361e892b94865e9219f828ba 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -33,12 +33,12 @@
            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="Hz"/>
+        <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.25MHz</description>
-        <field name="FrameRate" start="0" bits="32" format="unsigned" unit="Hz"/>
+        <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>
 
@@ -75,7 +75,7 @@
 
     <register name="TriggerRate" address="0002" purpose="status" mode="r">
       <description>Accepted incoming Trigger Rate</description>
-      <field name="TriggerRate" start="0" bits="28" format="unsigned" unit="Hz"/>
+      <field name="TriggerRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
     </register>   
 
     <register name="InvalidTriggerCount" address="0003" purpose="status" mode="r">
@@ -96,7 +96,7 @@
 
     <register name="TestPulseRate" address="0001" purpose="status" mode="r">
       <description>Testpulse Rate</description>
-      <field name="TestPulseRate" start="0" bits="28" format="unsigned" unit="Hz"/>
+      <field name="TestPulseRate" start="0" bits="28" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;"/>
     </register>   
     
   </group> 
@@ -231,8 +231,8 @@
     </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"/>
+      <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>
   </group>
 
@@ -342,13 +342,13 @@
     </register>
     
     <register name="NXFrameRate" address="0010" purpose="status" mode="r">
-      <description>Nxyter Timestamp Frame Rate, must be 31.25 MHz</description>
-      <field name="NXFrameRate" start="0" bits="27" format="unsigned" unit="Hz" />
+      <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="NXFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
     </register>
 
     <register name="ADCFrameRate" address="0011" purpose="status" mode="r">
-      <description>ADC Data Frame Rate, must be 31.25 MHz</description>
-      <field name="ADCFrameRate" start="0" bits="27" format="unsigned" unit="Hz" />
+      <description>ADC Data 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="ADCFrameRate" start="0" bits="27" format="unsigned" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
     </register>
 
     <register name="ADCTestValue" address="0012" purpose="status" mode="r">
@@ -389,9 +389,9 @@
         <field name="NxTestTrigger" start="0" bits="1" format="boolean"/>
       </register>
       
-      <register name="NxTestChannel" address="0005" purpose="config" mode="rw" >
+      <register name="NxTestChGroup" address="0005" purpose="config" mode="rw" >
         <description>Nxyter Testpulse Channel Group (0=0,4,.. 1=1,5,.. 2=2,6,.. 3=3,7,..)</description>
-        <field name="NxTestChannel" start="0" bits="2" format="unsigned"/>
+        <field name="NxTestChGroup" start="0" bits="2" format="unsigned"/>
       </register>
       
       <register name="I2COnline" address="0006" purpose="status" mode="r" >
@@ -506,24 +506,49 @@
     </register>
 
   </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">    
-    
+           address="0000"  size="130"  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"/>
+        <field name="ChannelHitCtr" start="0" bits="32" format="unsigned" rate="1" unit="s&lt;sup&gt;-1&lt;/sup&gt;" />
       </register>
     
-      <register name="AverageNum" address="0080" purpose="config" mode="rw">
+      <register name="AverageNumH" 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"/>
+        <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="130"  purpose="config"  mode="rw" continuous="true">    
+      <register name="ChannelADCVal" address="0000" purpose="status" mode="r" repeat="128">
+        <description>Continuous Hit Counter 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"/>
+      </register>
+      
+      <register name="EnableAverageA" address="0081" purpose="config" mode="rw">
+        <description>Enable Average mode</description>
+        <field name="EnableAverageA" start="0" bits="1" format="boolean"/>
+      </register>
+
     </group>
+
   </group>  
 
 </TrbNetEntity>