Improvements oof tracker.

working on tracker, e.g. added double-track feature new routine for tracking, new track level working on tracker, fiber detectors, Hans included the trigger times of the tamex cards for ToFD Improvements tracking, fibers ... bug fix for tamex trigger times of TofD Some more corrections for implementation of tamex trigger times clang-format Hans has added the trigger times also for the clock TDC boards Hans has added the trigger times also for the clock TDC boards adding a few missing files
jose-luis-rs · Apr 8, 2020 · 1f24085 · 1f24085
1 parent dafdb51
commit 1f24085
Show file tree

Hide file tree

Showing 101 changed files with 211,971 additions and 92,101 deletions.
diff --git a/fi0/R3BFi0Cal2Hit.cxx b/fi0/R3BFi0Cal2Hit.cxx
@@ -13,8 +13,17 @@
 
 #include "R3BFi0Cal2Hit.h"
 
-R3BFi0Cal2Hit::R3BFi0Cal2Hit(Bool_t a_is_calibrator, Int_t a_verbose)
-    : R3BBunchedFiberCal2Hit("Fi0", a_verbose, R3BTCalEngine::CTDC_8_12_FWD_250, VERTICAL, 1, 256, 0, a_is_calibrator)
+R3BFi0Cal2Hit::R3BFi0Cal2Hit(Bool_t a_is_calibrator, Bool_t a_is_gain, Bool_t a_is_tsync, Int_t a_verbose)
+    : R3BBunchedFiberCal2Hit("Fi0",
+                             a_verbose,
+                             R3BTCalEngine::CTDC_8_12_FWD_250,
+                             VERTICAL,
+                             1,
+                             256,
+                             0,
+                             a_is_calibrator,
+                             a_is_gain,
+                             a_is_tsync)
 {
 }
 

diff --git a/fi0/R3BFi0Cal2Hit.h b/fi0/R3BFi0Cal2Hit.h
@@ -19,7 +19,7 @@
 class R3BFi0Cal2Hit : public R3BBunchedFiberCal2Hit
 {
   public:
-    R3BFi0Cal2Hit(Bool_t, Int_t = 1);
+    R3BFi0Cal2Hit(Bool_t, Bool_t, Bool_t, Int_t = 1);
     virtual ~R3BFi0Cal2Hit();
     UInt_t FixMistake(UInt_t);
 

diff --git a/fi10/R3BFi10Cal2Hit.cxx b/fi10/R3BFi10Cal2Hit.cxx
@@ -12,10 +12,17 @@
  ******************************************************************************/
 
 #include "R3BFi10Cal2Hit.h"
+#include "mapping_fib10_trig.hh"
 
-R3BFi10Cal2Hit::R3BFi10Cal2Hit(enum R3BTCalEngine::CTDCVariant a_variant, Bool_t a_is_calibrator, Int_t a_verbose)
-    : R3BBunchedFiberCal2Hit("Fi10", a_verbose, a_variant, VERTICAL, 2, 256, 2, a_is_calibrator)
+R3BFi10Cal2Hit::R3BFi10Cal2Hit(enum R3BTCalEngine::CTDCVariant a_variant,
+                               Bool_t a_is_calibrator,
+                               Bool_t a_is_gain,
+                               Bool_t a_is_tsync,
+                               Int_t a_verbose)
+    : R3BBunchedFiberCal2Hit("Fi10", a_verbose, a_variant, VERTICAL, 2, 256, 2, a_is_calibrator, a_is_gain, a_is_tsync)
 {
+    fib10_trig_map_setup();
+    BUNCHED_FIBER_TRIGGER_MAP_SET(g_fib10m_trig_map);
 }
 
 R3BFi10Cal2Hit::~R3BFi10Cal2Hit() {}

diff --git a/fi10/R3BFi10Cal2Hit.h b/fi10/R3BFi10Cal2Hit.h
@@ -19,7 +19,7 @@
 class R3BFi10Cal2Hit : public R3BBunchedFiberCal2Hit
 {
   public:
-    R3BFi10Cal2Hit(enum R3BTCalEngine::CTDCVariant, Bool_t, Int_t = 1);
+    R3BFi10Cal2Hit(enum R3BTCalEngine::CTDCVariant, Bool_t, Bool_t, Bool_t, Int_t = 1);
     virtual ~R3BFi10Cal2Hit();
     UInt_t FixMistake(UInt_t);
 

diff --git a/fi10/R3BFi10Digitizer.cxx b/fi10/R3BFi10Digitizer.cxx
@@ -155,7 +155,7 @@ void R3BFi10Digitizer::Exec(Option_t* opt)
 
         for (TempHit& Hit : TempHits)
         {
-            if (Hit.Energy < 0.0001)
+            if (Hit.Energy < 0.0000001)
             {
                 continue;
             }
@@ -185,7 +185,7 @@ void R3BFi10Digitizer::Exec(Option_t* opt)
         {
             for (Double_t& energyl : energy[i])
             {
-                if (energyl > 0.0001)
+                if (energyl > 0.0000001)
                 {
                     Float_t xpos =
                         -detector_width / 2. + fiber_thickness / 2. + (i + (i * air_layer)) * fiber_thickness;