status, mt

diff --git a/base/serials_dirich.db b/base/serials_dirich.db
index 23a9462857dd91908b31588cc1b1d7a306e178b2..45a176da5483dd3bea26254537e4bd5a663ae0f5 100644 (file)
--- a/base/serials_dirich.db
+++ b/base/serials_dirich.db
@@ -4,3 +4,9 @@
 ########################################
 
 0001   0xca00000711f93828
+0002   0x6f00000711e42a28
+0003   0x97000007122e0928
+0004   0x01000007125dbf28
+0005   0xdc000007122daa28
+0006   0x2d00000711e46b28
+0007   0x5800000711e42b28

diff --git a/base/serials_trb3.db b/base/serials_trb3.db
index e0e9f5393fd2ce096fce8c5c278b95b4dff27b11..822dd88c012bee258e96ae3876fff95eecf26abb 100644 (file)
--- a/base/serials_trb3.db
+++ b/base/serials_trb3.db
@@ -1039,4 +1039,8 @@
    1733        0x45000006ea596c28
    1735        0xc2000006ea597828
 
+
+
+# concentrator/combiner
+   100000      0xca00000712ac3228
    

diff --git a/tools/determine_noiseband_dirich.pl b/tools/determine_noiseband_dirich.pl
index 952426882bb13c56f12081e3f3dccd75aa95e0a3..f469a90ff830f41c250b798fe476d94e7f844877 100755 (executable)
--- a/tools/determine_noiseband_dirich.pl
+++ b/tools/determine_noiseband_dirich.pl
@@ -5,7 +5,7 @@ use HADES::TrbNet;
 use Time::HiRes qw(usleep);
 use Data::Dumper;
 
-my $dirich = 0x1200;
+my $dirich = 0x1204;
 my $throffset = 0xa000;
 my $monitor = 0xdfc0;
 
@@ -106,10 +106,12 @@ for my $channel (0 .. $last_channel) {
 
 print "\nresult:\n";
 #print Dumper $boundaries;
+print "channel | noiseband [mV]\n";
+print "------------------------\n";
 foreach my $cur_channel (sort {$a <=> $b} keys %$boundaries) {
     my $diff = $boundaries->{$cur_channel}->{upper} - $boundaries->{$cur_channel}->{lower};
     my $width = $diff * 38E-6 * 1000;
-    printf "channel: %2d: noiseband [mV]: %02.0f\n", $cur_channel , $width;
+    printf "%2d      | %02.0f\n", $cur_channel , $width;
 }
 
 print "\nsummary:\n";

diff --git a/users/gsi_ee_trb84/Go4AutoSave.root b/users/gsi_ee_trb84/Go4AutoSave.root
index c5fcc4746d25069c61ec9d10c8c4da98f6cf599a..4fb59b1ab99fa90caa92938fbada29b8a146be1e 100644 (file)
Binary files a/users/gsi_ee_trb84/Go4AutoSave.root and b/users/gsi_ee_trb84/Go4AutoSave.root differ

diff --git a/users/gsi_ee_trb84/check_ping.pl b/users/gsi_ee_trb84/check_ping.pl
index 2356b34e64deefc05c7d603571f98a294fb12a28..ff146b6f75ba2057e25abb672d094ca01d9f7859 100755 (executable)
--- a/users/gsi_ee_trb84/check_ping.pl
+++ b/users/gsi_ee_trb84/check_ping.pl
@@ -62,6 +62,7 @@ while ( (($first_iteration == 1) || keys %$rh_unsuccessful) &&
     my $trbnum= $map->{$ct}->{trb};
     my $num = sprintf "%3.3d", $trbnum;
     my $host= "trb" . $num;
+    #my $host= "trb" . $num ."b";
     my $system = $map->{$ct}->{sys};
     #print "192.168.0.$ct   $host.gsi.de $host\n";
     #my $r = $p->ping($host,1);

diff --git a/users/gsi_ee_trb84/db/addresses_dirich.db b/users/gsi_ee_trb84/db/addresses_dirich.db
index cf7db71aa55c302ba6c24bfb562a84f72dda36d1..68c6df1009cdb398cd0bc9b8532dac3ba55ee753 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_dirich.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich.db
@@ -3,5 +3,11 @@
 
 # Address #  S/N  #  FPGA
 
-0x1200             0001     1
+0x1201             0001     1
+0x1202             0002     1
+0x1203             0003     1
+0x1204             0004     1
+0x1205             0005     1
+0x1206             0006     1
+0x1207             0007     1
 

diff --git a/users/gsi_ee_trb84/db/addresses_trb3.db b/users/gsi_ee_trb84/db/addresses_trb3.db
index c3bd6b3fa6b5a13635645f8e6c7b51212d18c4df..dd2a312c063b012f7cb58927a87a618e3a5cf914 100644 (file)
--- a/users/gsi_ee_trb84/db/addresses_trb3.db
+++ b/users/gsi_ee_trb84/db/addresses_trb3.db
@@ -6,7 +6,7 @@
 #CTS
 
 0x0840             84     0
-0x0841             84     1
+0x8841             84     1  # hub
 0x0842             84     2
 0x0843             84     3
 0xc001      84            5
@@ -16,19 +16,22 @@
 0x0611             61     1
 0x0612             61     2
 0x0613             61     3
-0x8000      61            5
+0x8610      61            5
 
 #slave
 0x1130            113     0
 0x1131            113     1
 0x1132            113     2
 0x1133            113     3
-0x8001     113            5
+0x8113     113            5
 
 #slave
 0x1580            158     0
 0x1581            158     1
 0x1582            158     2
 0x1583            158     3
-0x8002     158            5
+0x8158     158            5
 
+
+# concentrator/combiner
+0x8300    10000   0

diff --git a/users/gsi_ee_trb84/db/register_configgbe.db b/users/gsi_ee_trb84/db/register_configgbe.db
index 3ed1fb14211e54298e3c01321e44550e5ab0866f..ff874836065f88c5cf0eff937af477c53bf6f0f7 100644 (file)
--- a/users/gsi_ee_trb84/db/register_configgbe.db
+++ b/users/gsi_ee_trb84/db/register_configgbe.db
@@ -10,6 +10,6 @@
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #    C8     #    C9     #      C10    #
 #################################################################################################################################################################
   0xc001      0       0xc001     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1
-  0x8000      0       0x8000     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1
-  0x8001      0       0x8001     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1
-  0x8002      0       0x8002     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1
+  0x8610      0       0x8000     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1
+  0x8113      0       0x8001     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1
+  0x8158      0       0x8002     0x00020001   0x00030062     0xEA60       0x578          1            0            1        0xffffff      0x7            0x1

diff --git a/users/gsi_ee_trb84/db/register_configgbe_ip.db b/users/gsi_ee_trb84/db/register_configgbe_ip.db
index 823b63889c1671cf81c96ccef76de45a024cc5ef..93d22edbccc0d5ac1f3cf7ba08c45b080b5f2093 100644 (file)
--- a/users/gsi_ee_trb84/db/register_configgbe_ip.db
+++ b/users/gsi_ee_trb84/db/register_configgbe_ip.db
@@ -34,6 +34,6 @@
 
 #14:dd:a9:d3:f4:b8 # hadesp39
  0xc001                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc3a4     0xDEADc000     0x001B   0xc0a80154      0xc350     0x0578
- 0x8000                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc38d     0xDEADc001     0x001d   0xc0a80155      0xc350     0x0578
- 0x8001                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc3c1     0xDEADc002     0x001d   0xc0a80156      0xc350     0x0578
- 0x8002                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc3ee     0xDEADc003     0x001d   0xc0a80157      0xc350     0x0578
+ 0x8610                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc38d     0xDEADc001     0x001d   0xc0a80155      0xc350     0x0578
+ 0x8113                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc3c1     0xDEADc002     0x001d   0xc0a80156      0xc350     0x0578
+ 0x8158                0   0xa9d3f4b8    0x14dd      0xc0a800b1      0xc3ee     0xDEADc003     0x001d   0xc0a80157      0xc350     0x0578

diff --git a/users/gsi_ee_trb84/db/register_configtdc.db b/users/gsi_ee_trb84/db/register_configtdc.db
index 980f67c9aeac9d38631ab75781dbae0fbd61c7d9..a5655d7d5f4517d348b1f34b0b064fb357aeefd0 100644 (file)
--- a/users/gsi_ee_trb84/db/register_configtdc.db
+++ b/users/gsi_ee_trb84/db/register_configtdc.db
@@ -16,6 +16,7 @@
 #0xfe4e                0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # ADA addon
 #0xfe50                0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # cbmtof
 #0xfe62                0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # trb3sc
+0xfe51         0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # dirich
 
 #0xfe48                0   0x50003000   0x80640064   0x00000000   0x00000000   0x0000007c   0x00000000
 #0xfe4a                0   0x50003000   0x80640064   0x00000000   0x00000000   0x0000007c   0x00000000 # gpin addon
@@ -23,3 +24,4 @@
 #0xfe4e                0   0x50003000   0x80640064   0x00000000   0x00000000   0x0000007c   0x00000000 # ADA addon
 #0xfe50                0   0x50003000   0x80640064   0x00000000   0x00000000   0x0000007c   0x00000000 # cbmtof
 #0xfe62                0   0x50003000   0x80640064   0x00000000   0x00000000   0x0000007c   0x00000000 # trb3sc
+0xfe51         0   0x50003000   0x00640064   0x00000000   0x00000000   0x00000078   0x00000000 # dirich

diff --git a/users/gsi_ee_trb84/first.C b/users/gsi_ee_trb84/first.C
index 8d80a790c49d68c84ef0d252a5ef3dae585b33f9..081b5b6d082cc0b12b63fa8689c8caddda7e1212 100644 (file)
--- a/users/gsi_ee_trb84/first.C
+++ b/users/gsi_ee_trb84/first.C
@@ -21,7 +21,7 @@ void first()
    hadaq::TrbProcessor::SetTDCRange(0x1130, 0x1603);
 
    // [min..max] range for HUB ids
-   hadaq::TrbProcessor::SetHUBRange(0x8000, 0x82FF);
+   hadaq::TrbProcessor::SetHUBRange(0x8000, 0x8fff);
 
    // when first argument true - TRB/TDC will be created on-the-fly
    // second parameter is function name, called after elements are created

diff --git a/users/gsi_ee_trb84/second.C b/users/gsi_ee_trb84/second.C
index 6e82ea3a0f227075afea2a7607f87a637134b5c4..3a38078c4088a526f7d8d4827e06b4dfa0d612a8 100644 (file)
--- a/users/gsi_ee_trb84/second.C
+++ b/users/gsi_ee_trb84/second.C
@@ -34,8 +34,8 @@ class SecondProc : public base::EventProc {
          hUser = MakeH2("ToT_vs_LED","ToT versus LED difference", 500, -4, 0, 500, -2, -1, "ToT/ns;LED diff/ns");
         */
         
-         hDif1 = MakeH1("LE1","1 vs. 11", 30000, -90, 90, "ns");
-         hDif2 = MakeH1("LE2","2 vs. 12", 30000, -90, 90, "ns");
+         hDif1 = MakeH1("LE1","1 vs. 2", 30000, -90, 90, "ns");
+         hDif2 = MakeH1("TE2","1 vs. 2", 30000, -90, 90, "ns");
         
 
         /*
@@ -102,8 +102,8 @@ class SecondProc : public base::EventProc {
         */
 
         
-        FillH1(hDif1, (fHits[1][0] - fHits[16][0]));
-         //FillH1(hDif2, (fHits[2][0] - fHits[12][0]));
+        FillH1(hDif1, (fHits[1][0] - fHits[2][0]) );
+         FillH1(hDif2, (fHits[1][1] - fHits[2][1]) );
         
         
 
@@ -115,5 +115,6 @@ class SecondProc : public base::EventProc {
 void second()
 {
   //new SecondProc("A", "TDC_1133");
-  new SecondProc("A", "TDC_1580");
+  //new SecondProc("A", "TDC_1580");
+  new SecondProc("A", "TDC_1202");
 }

diff --git a/users/gsi_ee_trb84/startup.sh b/users/gsi_ee_trb84/startup.sh
index 37e47cc414784e65b944dbdbe6cd8f4344d5a18b..d7bc2869dbb1400675c88fa11ee8523d4fd5c3b2 100755 (executable)
--- a/users/gsi_ee_trb84/startup.sh
+++ b/users/gsi_ee_trb84/startup.sh
@@ -10,7 +10,8 @@ export PATH=$PATH:$USER_DIR
 
 export TRB3_SERVER=trb084:26000
 export TRBNETDPID=$(pgrep -f "trbnetd -i 84")
-export DAQOPSERVER=hadeb05:84
+#export DAQOPSERVER=hadeb05:84
+export DAQOPSERVER=hades39:84
 
 echo "- trbnetd pid: $TRBNETDPID"
 
@@ -30,6 +31,14 @@ sleep 1;
 ## Set addresses
 ##################################################
 merge_serial_address.pl $DAQ_TOOLS_PATH/base/serials_trb3.db $USER_DIR/db/addresses_trb3.db
+merge_serial_address.pl $DAQ_TOOLS_PATH/base/serials_dirich.db $USER_DIR/db/addresses_dirich.db
+
+
+#echo "disable port 6 on hub 0x8841"
+#trbcmd clearbit 0x8841 0xc0 0x40
+#trbcmd clearbit 0x8841 0xc1 0x40
+#trbcmd clearbit 0x8841 0xc3 0x40
+
 
 echo "GbE settings"
 loadregisterdb.pl db/register_configgbe.db
@@ -37,6 +46,7 @@ loadregisterdb.pl db/register_configgbe_ip.db
 
 echo "TDC settings"
 loadregisterdb.pl db/register_configtdc.db
+echo "TDC settings end"
 
 # setup central FPGA - enable peripherial signals
 #switchport.pl 0x8840 5 off
@@ -68,6 +78,9 @@ loadregisterdb.pl db/register_configtdc.db
 #trbcmd setbit 0xc001 0xa14d 0x2     #select F5_COMM input
 #trbcmd setbit 0xc840 0xa101 0x200   #enable input at CTS
 
+# set correct timeout: off for channel 0, 1, 2sec for 2
+#trbcmd w 0xfffe 0xc5 0x50ff
+
 echo "pulser"
 # pulser #0 to 10 kHz
 trbcmd w 0xc001 0xa150 0x0000270f   
@@ -86,8 +99,14 @@ trbcmd clearbit 0x1130 0xc801 0x80000000 # disable window
 trbcmd w 0x1580 0xc802 0xffffffff # enable upper 16 channels for padiwa
 
 
+cd ~/trbsoft/daqtools/xml-db
+./put.pl Readout 0xfe51 SetMaxEventSize 500
+cd -
+
+trbcmd w 0xfe51 0xdf80 0xffffffff # enable monitor counters
+
 trbcmd w 0x1133 0xc804 0x7c # max number of words
 trbcmd clearbit 0x1133 0xc801 0x80000000 # disable window
 trbcmd w 0x1133 0xc802 0x00000c03 # enable pulser
 
-trbcmd setbit 0xc001 0xa101 0x8 # enable external trigger in of CTS
+#trbcmd setbit 0xc001 0xa101 0x8 # enable external trigger in of CTS