nxyter new web design, added nxyter advanced link

diff --git a/web/htdocs/index.pl b/web/htdocs/index.pl
index 7680a8caa268ec4bddf8ce452690f4822bb418b3..8af86d5a77e8bd2f7e0d6364ed3746faaa1f5f74 100755 (executable)
--- a/web/htdocs/index.pl
+++ b/web/htdocs/index.pl
@@ -85,6 +85,7 @@ The main documentation of the network can be found in these documents and locati
 <ul>
 <li><a href="tdc/tdcstatctrl.pl">TDC (xml-based)</a>
 <li><a href="nxyter/index.pl">Nxyter Read-out</a>
+<li><a href="nxyter/index_a.pl">Nxyter Read-out (advanced)</a>
 <li><a href="mvd/jtag.pl">MVD Jtag Controller</a>
 <li><a href="mvd/roc.pl">MVD read-out Controller</a>
 <li><a href="mvd/cb_controller.pl">MVD Converter Board Controller</a>

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 777520905df0a36968f765b797e1d6a75783169b..e1657bd8385002a6aba4cefafde34efa458573a7 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -24,7 +24,7 @@ $page->{link}  = "../";
 
 my @setup;
 
-$setup[0]->{name}    = "NXControl";
+$setup[0]->{name}    = "Control";
 $setup[0]->{cmd}     = "Nxyter-0xfe49-NXControl&Nxyter-0xfe49-ADCMonitor";
 $setup[0]->{period}  = -1;
 $setup[0]->{generic} = 1;
@@ -45,15 +45,20 @@ $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 
 $setup[4]->{name}    = "I2CRegister";
-$setup[4]->{cmd}     = "Nxyter-0xfe49-NxyterI2C&Nxyter-0xfe49-NxyterDAC&Nxyter-0xfe49-I2CTokens";
+$setup[4]->{cmd}     = "Nxyter-0xfe49-NxyterI2C";
 $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
-$setup[5]->{name}    = "NXHistograms";
-$setup[5]->{cmd}     = "Nxyter-0xfe49-NXHistos";
+$setup[5]->{name}    = "DAC_0";
+$setup[5]->{cmd}     = "Nxyter-0x3800-NxyterDAC";
 $setup[5]->{period}  = -1;
 $setup[5]->{address} = 1;
 
+$setup[6]->{name}    = "DAC_1";
+$setup[6]->{cmd}     = "Nxyter-0x3801-NxyterDAC";
+$setup[6]->{period}  = -1;
+$setup[6]->{address} = 1;
+
 xmlpage::initPage(\@setup,$page);
 
 1;

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index c801b9215a7e2ddb87a43ddef1e3f3fe075525c9..9f1de1ac1ff8e3d3d408b8d531a308236ca8cf10 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -433,6 +433,7 @@
       </register>
     </group>
     
+
     <group name="I2CRegs"
            address="0000"  size="46"  purpose="status"  mode="rw" continuous="true">
       
@@ -784,47 +785,41 @@
   
   <!-- ##################################################################### -->
 
-  <group name="NXHistos"
-         address="0800" purpose="status"  mode="r" continuous="false">
-    
-    <group name="RateHist"
-           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>
-    </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">
+      <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>
+  </group>
     
-    <group name="PileUpHist"
-           address="0100"  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>
-    </group>
+  <group name="PileupHist"
+         address="0900"  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>
+  </group>
 
-    <group name="OverFlowHist"
-           address="0200"  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>
+  <group name="OverFlowHist"
+         address="0a00"  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 name="ADCHist"
-           address="0300"  size="128"  purpose="config"  mode="r" continuous="true">    
-      <register name="ChannelADCVal" address="0000" purpose="status" mode="r" repeat="128">
-        <description>ADC Value Average per Channel</description>
-        <field name="ChannelADCVal" start="0" bits="32" format="unsigned"/>
-      </register>
-    </group>
+    </register>
+  </group>
 
-    <register name="ADCNumAverages" address="0380" purpose="status" mode="rw">
+  <group name="ADCHist"
+         address="0b00"  size="129"  purpose="config"  mode="r" continuous="true">    
+    <register name="ChannelADCVal" address="0000" purpose="status" mode="r" repeat="128">
+      <description>ADC Value Average per Channel</description>
+      <field name="ChannelADCVal" start="0" bits="32" format="unsigned"/>
+    </register>
+  
+    <register name="ADCNumAverages" address="0080" 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>  
-
+  </group>
+  
 </TrbNetEntity>