From: hadaq@CountingHouse <hadaq@CountingHouse>
Date: Mon, 28 Apr 2014 08:49:56 +0000 (+0200)
Subject: update
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=756f35a3511b43b0ca9d127beae5baebfba51374;p=daqtools.git

update
---

diff --git a/tools/dac_program.pl b/tools/dac_program.pl
index bcc33f5..b35319d 100755
--- a/tools/dac_program.pl
+++ b/tools/dac_program.pl
@@ -48,7 +48,7 @@ while (my $a = <$fh>) {
     $chain = hex(substr($chain,2)) if (substr($chain,0,2) eq "0x");
     $cmd   = hex($cmd);
     $board = hex($board);
-    
+    printf("0x%04x %i %i/%i %04x %i\n",$board,$chain,$dac,$chainlen,$val,$cmd);    
     if ($val+$offset >= $reference || $val+$offset < 0) {
       printf(STDERR "Error, value %i with offset %i is higher or lower than reference %i\n",$val,$offset,$reference);
       next;
@@ -65,7 +65,8 @@ while (my $a = <$fh>) {
     $values[16] = $chain;
     $values[17] = $chainlen;
     $values[$chainlen-1-$dac] = $o;
-#     print Dumper @values;
+#    print Dumper @values;
+#    print "\n";
     trb_register_write_mem($board,0xd400,0,\@values,18) or die "trb_register_write_mem: ", trb_strerror(); 
     usleep(5*$chainlen);
     }
diff --git a/users/cosy_test/nxscripts/mode_p.sh b/users/cosy_test/nxscripts/mode_p.sh
index 9b2dab1..43ed870 100755
--- a/users/cosy_test/nxscripts/mode_p.sh
+++ b/users/cosy_test/nxscripts/mode_p.sh
@@ -9,4 +9,4 @@ trbcmd clearbit $addr $(( 0x8200 + 32 )) 0x08
 trbcmd w $addr 0x8218 0xff
 
 trbcmd w $addr 0x8160 1
-trbcmd w $addr 0x8140 100
+trbcmd w $addr 0x8162 100
diff --git a/users/cosy_test/nxscripts/mode_t.sh b/users/cosy_test/nxscripts/mode_t.sh
index 5dcc2dc..cfa6b60 100755
--- a/users/cosy_test/nxscripts/mode_t.sh
+++ b/users/cosy_test/nxscripts/mode_t.sh
@@ -7,6 +7,6 @@ trbcmd clearbit $addr $(( 0x8200 + 32 )) 0x01
 trbcmd setbit $addr $(( 0x8200 + 32 )) 0x08
 
 trbcmd w $addr 0x8160 1
-trbcmd w $addr 0x8140 100
+trbcmd w $addr 0x8162 100
 
 trbcmd w $addr 0x8218 0xff
diff --git a/users/cosy_test/nxscripts/mode_tp.sh b/users/cosy_test/nxscripts/mode_tp.sh
index adf77ef..8b8d8b5 100755
--- a/users/cosy_test/nxscripts/mode_tp.sh
+++ b/users/cosy_test/nxscripts/mode_tp.sh
@@ -13,4 +13,4 @@ trbcmd setbit $addr $(( 0x8200 + 32 )) 0x08
 trbcmd w $addr 0x8218 0xff
 
 trbcmd w $addr 0x8160 1
-trbcmd w $addr 0x8140 100
+trbcmd w $addr 0x8162 100
diff --git a/users/cosy_test/nxscripts/trig_pulser.sh b/users/cosy_test/nxscripts/trig_pulser.sh
index f3db702..0d13a0a 100755
--- a/users/cosy_test/nxscripts/trig_pulser.sh
+++ b/users/cosy_test/nxscripts/trig_pulser.sh
@@ -7,7 +7,7 @@
 #trbcmd w $addr 0x8182 250
 #trbcmd w $addr 0x8183 100
 
-#trbcmd w $addr 0x8140 1
+#trbcmd w $addr 0x8162 1
 #trbcmd w $addr 0x8144 1
 
 trbcmd w $addr 0x8160 1
diff --git a/web/htdocs/nxyter/index_a.pl b/web/htdocs/nxyter/index_a.pl
index 97a133b..5d501d3 100755
--- a/web/htdocs/nxyter/index_a.pl
+++ b/web/htdocs/nxyter/index_a.pl
@@ -24,102 +24,102 @@ $page->{link}  = "../";
 
 my @setup;
 
-$setup[0]->{name}    = "Rate_0";
+$setup[0]->{name}    = "R_0";
 $setup[0]->{cmd}     = "Nxyter-0x3800-RateHist-rate";
 $setup[0]->{period}  = -1;
 $setup[0]->{address} = 1;
 
-$setup[1]->{name}    = "Rate_1";
+$setup[1]->{name}    = "R_1";
 $setup[1]->{cmd}     = "Nxyter-0x3801-RateHist-rate";
 $setup[1]->{period}  = -1;
 $setup[1]->{address} = 1;
 
-$setup[2]->{name}    = "Rate_2";
+$setup[2]->{name}    = "R_2";
 $setup[2]->{cmd}     = "Nxyter-0x3810-RateHist-rate";
 $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
-$setup[3]->{name}    = "Rate_3";
+$setup[3]->{name}    = "R_3";
 $setup[3]->{cmd}     = "Nxyter-0x3811-RateHist-rate";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 
-$setup[4]->{name}    = "Pileup_0";
+$setup[4]->{name}    = "P_0";
 $setup[4]->{cmd}     = "Nxyter-0x3800-PileupHist-rate";
 $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
-$setup[5]->{name}    = "Pileup_1";
+$setup[5]->{name}    = "P_1";
 $setup[5]->{cmd}     = "Nxyter-0x3801-PileupHist-rate";
 $setup[5]->{period}  = -1;
 $setup[5]->{address} = 1;
 
-$setup[6]->{name}    = "Pileup_2";
+$setup[6]->{name}    = "P_2";
 $setup[6]->{cmd}     = "Nxyter-0x3810-PileupHist-rate";
 $setup[6]->{period}  = -1;
 $setup[6]->{address} = 1;
 
-$setup[7]->{name}    = "Pileup_3";
+$setup[7]->{name}    = "P_3";
 $setup[7]->{cmd}     = "Nxyter-0x3811-PileupHist-rate";
 $setup[7]->{period}  = -1;
 $setup[7]->{address} = 1;
 
-$setup[8]->{name}    = "Ovfl_0";
+$setup[8]->{name}    = "O_0";
 $setup[8]->{cmd}     = "Nxyter-0x3800-OverFlowHist-rate";
 $setup[8]->{period}  = -1;
 $setup[8]->{address} = 1;
 
-$setup[9]->{name}    = "Ovfl_1";
+$setup[9]->{name}    = "O_1";
 $setup[9]->{cmd}     = "Nxyter-0x3801-OverFlowHist-rate";
 $setup[9]->{period}  = -1;
 $setup[9]->{address} = 1;
 
-$setup[10]->{name}    = "Ovfl_2";
+$setup[10]->{name}    = "O_2";
 $setup[10]->{cmd}     = "Nxyter-0x3810-OverFlowHist-rate";
 $setup[10]->{period}  = -1;
 $setup[10]->{address} = 1;
 
-$setup[11]->{name}    = "Ovfl_3";
+$setup[11]->{name}    = "O_3";
 $setup[11]->{cmd}     = "Nxyter-0x3811-OverFlowHist-rate";
 $setup[11]->{period}  = -1;
 $setup[11]->{address} = 1;
 
-$setup[12]->{name}    = "ADC_0";
+$setup[12]->{name}    = "A_0";
 $setup[12]->{cmd}     = "Nxyter-0x3800-ADCHist";
 $setup[12]->{period}  = -1;
 $setup[12]->{address} = 1;
 
-$setup[13]->{name}    = "ADC_1";
+$setup[13]->{name}    = "A_1";
 $setup[13]->{cmd}     = "Nxyter-0x3801-ADCHist";
 $setup[13]->{period}  = -1;
 $setup[13]->{address} = 1;
 
-$setup[14]->{name}    = "ADC_2";
+$setup[14]->{name}    = "A_2";
 $setup[14]->{cmd}     = "Nxyter-0x3810-ADCHist";
 $setup[14]->{period}  = -1;
 $setup[14]->{address} = 1;
 
-$setup[15]->{name}    = "ADC_3";
+$setup[15]->{name}    = "A_3";
 $setup[15]->{cmd}     = "Nxyter-0x3811-ADCHist";
 $setup[15]->{period}  = -1;
 $setup[15]->{address} = 1;
 
-$setup[16]->{name}    = "IToken_0";
+$setup[16]->{name}    = "IT_0";
 $setup[16]->{cmd}     = "Nxyter-0x3800-I2CTokens";
 $setup[16]->{period}  = -1;
 $setup[16]->{address} = 1;
 
-$setup[17]->{name}    = "IToken_1";
+$setup[17]->{name}    = "IT_1";
 $setup[17]->{cmd}     = "Nxyter-0x3801-I2CTokens";
 $setup[17]->{period}  = -1;
 $setup[17]->{address} = 1;
 
-$setup[18]->{name}    = "IToken_2";
+$setup[18]->{name}    = "IT_2";
 $setup[18]->{cmd}     = "Nxyter-0x3810-I2CTokens";
 $setup[18]->{period}  = -1;
 $setup[18]->{address} = 1;
 
-$setup[19]->{name}    = "IToken_3";
+$setup[19]->{name}    = "IT_3";
 $setup[19]->{cmd}     = "Nxyter-0x3811-I2CTokens";
 $setup[19]->{period}  = -1;
 $setup[19]->{address} = 1;