From: Hades DAQ <hadaq@hades39.gsi.de>
Date: Mon, 10 Apr 2017 22:21:55 +0000 (+0200)
Subject: fixed dirich serial numbers, mt
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=17022da3a8e7abb259400858ca6a15ac3b182563;p=daqtools.git

fixed dirich serial numbers, mt
---

diff --git a/base/serials_dirich.db b/base/serials_dirich.db
index d01cc3c..50c12a2 100644
--- a/base/serials_dirich.db
+++ b/base/serials_dirich.db
@@ -3,12 +3,12 @@
 #  Serial    #  Unique ID
 ########################################
 
-0001	0xca00000711f93828
-0002	0x6f00000711e42a28
-0003	0x97000007122e0928
-0004	0x01000007125dbf28
-0005	0xdc000007122daa28
-0006	0x2d00000711e46b28
-0007	0x5800000711e42b28
-0008	0x85000007122da928
-0009    0xfa000007122db628
+0011	0xca00000711f93828
+0021	0x6f00000711e42a28
+0031	0x97000007122e0928
+0041	0x01000007125dbf28
+0051	0xdc000007122daa28
+0061	0x2d00000711e46b28
+0071	0x5800000711e42b28
+0081	0x85000007122da928
+0091    0xfa000007122db628
diff --git a/base/serials_dirich_concentrator.db b/base/serials_dirich_concentrator.db
index 87dcc1b..ad639d5 100644
--- a/base/serials_dirich_concentrator.db
+++ b/base/serials_dirich_concentrator.db
@@ -1,5 +1,5 @@
 # concentrator/combiner
-   0001      0xca00000712ac3228
-   0002      0x3c00000711e47628
+   0010      0xca00000712ac3228
+   0020      0x3c00000711e47628
 
 
diff --git a/users/gsi_ee_trb84/db/addresses_dirich.db b/users/gsi_ee_trb84/db/addresses_dirich.db
index 48ba6d0..c9da922 100644
--- a/users/gsi_ee_trb84/db/addresses_dirich.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich.db
@@ -3,13 +3,13 @@
 
 # Address #  S/N  #  FPGA
 
-0x1201 	    0001     1
-0x1202 	    0002     1
-0x1203 	    0003     1
-0x1204 	    0004     1
-0x1205 	    0005     1
-0x1206 	    0006     1
-0x1207 	    0007     1
-0x1208 	    0008     1
-0x1209 	    0009     1
+0x1201 	    0011     1
+0x1202 	    0021     1
+0x1203 	    0031     1
+0x1204 	    0041     1
+0x1205 	    0051     1
+0x1206 	    0061     1
+0x1207 	    0071     1
+0x1208 	    0081     1
+0x1209 	    0091     1
 
diff --git a/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db b/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
index f95bf2b..250845b 100644
--- a/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
+++ b/users/gsi_ee_trb84/db/addresses_dirich_concentrator.db
@@ -1,4 +1,4 @@
 
 # concentrator/combiner
-0x8300	   0001   0
-0x8300	   0002   0
+0x8300	   0010   0
+0x8300	   0020   0
diff --git a/users/gsi_ee_trb84/first.C b/users/gsi_ee_trb84/first.C
index dc9ff9e..4633435 100644
--- a/users/gsi_ee_trb84/first.C
+++ b/users/gsi_ee_trb84/first.C
@@ -53,8 +53,8 @@ void first()
    //   (1 << 0xD) - special 0XD trigger with internal pulser, used also for TOT calibration
    //    0x3FFF - all kinds of trigger types will be used for calibration (excluding 0xE and 0xF)
    //   0x80000000 in mask enables usage of temperature correction
-   hld->ConfigureCalibration(calname, cnt, (1 << trig) | use_temp);
-   //hld->ConfigureCalibration(calname, 100000, 1);
+   //hld->ConfigureCalibration(calname, cnt, (1 << trig) | use_temp);
+   hld->ConfigureCalibration(calname, 100000, 1);
 
    // only accept trigger type 0x1 when storing file
    // new hadaq::HldFilter(0x1);
@@ -99,10 +99,18 @@ extern "C" void after_create(hadaq::HldProcessor* hld)
       tdc->SetUseLastHit(false);
 
       //tdc->SetStoreEnabled();
-      for (unsigned nch=1; nch<tdc->NumChannels(); nch++) {
-        tdc->SetRefChannel(nch, nch-1, 0xffff, 10000,  -90., 90.);
-      }
-
+      //for (unsigned nch=1; nch<tdc->NumChannels(); nch++) {
+      //  tdc->SetRefChannel(nch, nch-1, 0xffff, 10000,  -90., 90.);
+      //}
+
+      tdc->SetRefChannel(2, 1, 0xffff, 10000,  -20., 20.);
+      tdc->SetRefChannel(3, 1, 0xffff, 10000,  -20., 20.);
+      tdc->SetRefChannel(4, 1, 0xffff, 10000,  -20., 20.);
+      tdc->SetRefChannel(5, 1, 0xffff, 10000,  -20., 20.);
+      tdc->SetRefChannel(6, 1, 0xffff, 10000,  -20., 20.);
+      tdc->SetRefChannel(7, 1, 0xffff, 10000,  -20., 20.);
+      tdc->SetRefChannel(8, 1, 0xffff, 10000,  -20., 20.);
+      //tdc->SetRefChannel(4, 2, 0xffff, 10000,  -20., 20.);
       //tdc->SetRefChannel(1, tdc->NumChannels() -1 , 0xffff, 20000,  -10., 10.);
 
       //      tdc->SetRefChannel(6, 2 , 0xffff, 20000,  -10., 10.);
diff --git a/users/gsi_ee_trb84/trbreset_loop.pl b/users/gsi_ee_trb84/trbreset_loop.pl
index 8edff9e..7ae7359 100755
--- a/users/gsi_ee_trb84/trbreset_loop.pl
+++ b/users/gsi_ee_trb84/trbreset_loop.pl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 ### Change THIS!
-my $required_endpoints = 23;
+my $required_endpoints = 20;