From: hadaq@CountingHouse <hadaq@CountingHouse>
Date: Thu, 1 May 2014 09:18:29 +0000 (+0200)
Subject: nxyter update
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=c7a98fdb9a9b75ec05c753276b2fdcc2e33b011b;p=daqtools.git

nxyter update
---

diff --git a/web/htdocs/thresh/threshold.htm b/web/htdocs/thresh/threshold.htm
index 46cb439..5b92038 100644
--- a/web/htdocs/thresh/threshold.htm
+++ b/web/htdocs/thresh/threshold.htm
@@ -76,7 +76,7 @@ function update(bar,scale) {
   value[bar-1] = Math.round(document.getElementById("bar"+bar).scrollLeft/scale);
   document.getElementById("bar"+bar+"value").innerHTML = value[bar-1];
   total = Math.min(value[0]+value[1],65535);
-  document.getElementById("total").innerHTML = total+" - "+Math.round(total/655.36*reference)/100+" mV";
+  document.getElementById("total").innerHTML = total+" - 0x"+total.toString(16)+" - "+Math.round(total/655.36*reference)/100+" mV";
   command = (type << 20) + (chan << 16) + (total);
   command = command.toString(16);
   if(wasRead == 0) {
diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index d6d1b56..781af2f 100644
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -105,8 +105,8 @@
         <enumItem value="3">TS 14Bit, ADC 11Bit</enumItem>
       </field>
     
-      <field name="HistTriggerAll" start="31" bits="1" format="boolean">
-        <description>Write all incoming Data to Histograms</description>
+      <field name="HistTSCutOff" start="31" bits="1" format="boolean">
+        <description>Turn off Timestamp Selection Cut of online Histos</description>
       </field>
       
     </register>    
@@ -227,8 +227,8 @@
     <register name="HistLimits" address="001f" purpose="status" mode="rw">
       <description>HistLimits Setup</description>
       <field name="HistLimitsOn" start="31" bits="1" format="bitmask" />
-      <field name="HistUpperThr" start="16" bits="14" format="unsigned" unit="ns"/>
-      <field name="HistLowerThr" start="0" bits="14" format="unsigned" unit="ns"/>
+      <field name="HistLowerThr" start="16" bits="14" format="unsigned" unit="ns"/>
+      <field name="HistUpperThr" start="0" bits="14" format="unsigned" unit="ns"/>
     </register>
 
   </group>