Agnostic helix finder and correction of the charged pion lifetime

CalPatRec/fcl/prolog.fcl

@@ -362,8 +362,8 @@ CalPatRec : { @table::CalPatRec
                 pickupProtonHits        : 1                     # the third step of proton finding
 
                 timeBin                 : 40                    # ns, prev: 50 (use 40 with makePH.maxDS=5)
-                minHitTime              : 350.                  # ns
-                minimumTime             : 400.                  # ns
+                minHitTime              : 350.                  # ns, not used
+                minimumTime             : 400.                  # ns, not used
                 maximumTime             : 1750.                 # ns
                 maxDeltaEDep            : 0.004                 # max allowed delta eDep
                 maxSeedEDep             : 0.005                 # max allowed seed eDep
@@ -431,6 +431,43 @@ CalPatRec : { @table::CalPatRec
                 }
             }
         }
+#------------------------------------------------------------------------------
+        PhiZSeedFinder : { module_type:PhiZSeedFinder
+            chCollTag                   : "makePH"              ## input CH coll
+            sschCollTag                 : "makeSH"              ## input single-straw CH coll
+            sdmcCollTag                 : "compressDigiMCs"     ## used for debug only
+
+            testHitMask                 : false                 ## off by default
+            goodHitMask                 : [ "TimeDivision" ]    ## is there a point in using combohits made
+                                                                ## out of straw hits with an apriory wrong wdist ?
+            bkgHitMask                  : [  ]                  ##
+            writeFilteredComboHits      : 0                     ## by default, clone all hits with updated flags
+            writeStrawHits              : 1                     ## used by the track fit
+            testOrder                   : 0
+
+            debugLevel                  : 0
+            diagLevel                   : 0
+            printErrors                 : 0
+                                                                # finder algorithm parameters
+            finderParameters            : {
+                testOrder               : 0
+                debugLevel              : 0
+                diagLevel               : 0
+                printErrors             : 0
+            }
+#
+            diagPlugin                  : { tool_type : "PhiZSeedFinderDiag"
+                diagLevel               : 0
+                mcDiag                  : false
+                mcTruth                 : 0
+                printComboHits          : 0
+                printGoodComboHits      : 0
+                mcUtils                 : { tool_type : "TrkRecoMcUtils"
+                    strawDigiMCCollTag : "compressDigiMCs"
+                    comboHitCollTag    : "makePH"
+                }
+            }
+        }
     }
 #------------------------------------------------------------------------------
 # no separate hit flag collections any longer, hit flags are stored
@@ -564,7 +601,6 @@ CalPatRec : { @table::CalPatRec
             debugLevel                 : 0
             printFrequency             : 1000
             runDisplay                 : 0
-            saveProtCand               : 0
             useCCs                     : 1
             recoverCCs                 : 1
             chCollLabel                : "FlagBkgHits"
@@ -585,16 +621,16 @@ CalPatRec : { @table::CalPatRec
             minCaloEnergy              : 50.0
             caloDtMax                  : 30.0
             caloTimeOffset             : @local::TrackCaloMatching.DtOffset
-            doComptonClean             : 0
-            maxIntersectSig            : 5.0
-            maxApproachSigma           : 5.0
-            maxAppSigmaTrans           : 5.0
-            comptonThresh              : 8
-            doIsoClean                 : 0
-            isoRad                     : 100.0
-            doPhiClean                 : 0
-            phiCleanPhi                : 45.0
-            phiCleanThresh             : 5
+            doRefine                   : 0
+            minSHsInCluster            : 15
+            minCHsInCluster            : 10
+            nPairs                     : 1
+            minCHsInCubes              : 2
+            maxDeltaRInStn             : 100
+            maxDeltaRBtwStns           : 120
+            maxDeltaPhiInStn           : 0.4
+            maxDeltaPhiBtwStns         : 0.6
+            thirdStation               : true
 
             diagPlugin : { tool_type  : "TZClusterFinderDiag"
                  mcTruth       : 1
@@ -603,6 +639,57 @@ CalPatRec : { @table::CalPatRec
             }
         }
 
+        HelixFinder : {
+            module_type : HelixFinder
+            diagLevel               : 0
+            debug                   : 0
+            runDisplay              : 0
+            chCollLabel             : "FlagBkgHits"
+            tcCollLabel             : "TimeClusterFinderDe"
+            ccCollLabel             : "CaloClusterMaker"
+            findMultipleHelices     : true # whether or not to allow more than 1 helix per tc
+            useStoppingTarget       : true
+            intenseEventThresh      : 30
+            intenseClusterThresh    : 60
+            doLineFlag              : false
+            doIsolationFlag         : true
+            isoRad                  : 150.0
+            isoMinHitsNear          : 2
+            doAverageFlag           : true
+            minDistCut              : 20.0
+            minTripletSeedZ         : 0.0
+            minTripletDz            : 50.0
+            maxTripletDz            : 500.0
+            minTripletDist          : 50.0
+            minTripletArea          : 1.0e4
+            maxSeedCircleResidual   : 2.0
+            minSeedCircleHits       : 7
+            maxDeltaPhi             : 2.0
+            maxZWindow              : 500.0
+            minLineSegmentHits      : 3
+            segMultiplier           : 3.0
+            max2PiAmbigResidual     : 2.0
+            maxPhiZResidual         : 2.0
+            minFinalSeedHits        : 7
+            maxCircleRecoverSigma   : 3.0
+            maxLineRecoverSigma     : 3.0
+            caloClusterSigma        : 30.0
+            minNHelixComboHits      : 8
+            minNHelixStrawHits      : 12
+            minHelixPerpMomentum    : 40.0
+            maxHelixPerpMomentum    : 140.0
+            minHelixMomentum        : 60.0
+            maxHelixMomentum        : 400.0
+            chi2LineSaveThresh      : 5.0
+            debugPdgID              : 11
+            debugMomentum           : 100.0
+            debugDirection          : "down"
+            debugStrawHitThresh     : 12
+            debugScatterThresh      : 3.0
+            mcUtils                 : { @table::TrkReco.McUtils }
+            diagPlugin              : { tool_type : "HelixFinderDiag" }
+        }
+
         PhiClusterFinder : { module_type : PhiClusterFinder
              ComboHitCollection     : "makePH"
              #TimeClusterCollection  : "TimeClusterFinderDmu"

CalPatRec/inc/DeltaFinder_enums.hh → CalPatRec/inc/CalPatRec_enums.hh

@@ -1,5 +1,5 @@
-#ifndef DeltaFinder_enums_hh
-#define DeltaFinder_enums_hh
+#ifndef CalPatRec_inc__enums_hh
+#define CalPatRec_inc__enums_hh
 
 #include "Offline/DataProducts/inc/StrawId.hh"
 

CalPatRec/inc/ChannelID.hh

@@ -0,0 +1,19 @@
+#ifndef __CalPatRec_inc_ChannelID_hh__
+#define __CalPatRec_inc_ChannelID_hh__
+
+namespace CalPatRec {
+  struct ChannelID {
+    int Station;
+    int Plane;
+    int Face;
+    int Panel;
+
+    static void orderID  (ChannelID* X, ChannelID* Ordered);
+    static void deOrderID(ChannelID* X, ChannelID* Ordered);
+
+    static void testOrderID  ();
+    static void testdeOrderID();
+  };
+}
+
+#endif

CalPatRec/inc/DeltaFinder_structures.hh

@@ -4,7 +4,8 @@
 #ifndef CalPatRec_DeltaFinder_structures_hh
 #define CalPatRec_DeltaFinder_structures_hh
 
-#include "Offline/CalPatRec/inc/DeltaFinder_enums.hh"
+#include "Offline/CalPatRec/inc/CalPatRec_enums.hh"
+#include "Offline/CalPatRec/inc/ChannelID.hh"
 #include "Offline/CalPatRec/inc/HitData_t.hh"
 
 namespace mu2e {
@@ -23,13 +24,6 @@ namespace mu2e {
       float fErr;                       // uncertainty, defines the window
       int   fPanelID;                   // if can predict the panel, -1 otherwise
     };
-
-    struct ChannelID {
-      int Station;
-      int Plane;
-      int Face;
-      int Panel;
-    };
 //-----------------------------------------------------------------------------
 // intersection of the two hit wires
 //-----------------------------------------------------------------------------

CalPatRec/inc/DeltaFinder_types.hh

@@ -25,74 +25,24 @@ namespace fhicl {
 
 #include "Offline/Mu2eUtilities/inc/McUtilsToolBase.hh"
 
+#include "Offline/CalPatRec/inc/ManagedList.hh"
+#include "Offline/CalPatRec/inc/Pzz_t.hh"
+#include "Offline/CalPatRec/inc/ChannelID.hh"
+#include "Offline/CalPatRec/inc/HitData_t.hh"
 #include "Offline/CalPatRec/inc/DeltaFinder_structures.hh"
 #include "Offline/CalPatRec/inc/DeltaSeed.hh"
 #include "Offline/CalPatRec/inc/DeltaCandidate.hh"
 #include "Offline/CalPatRec/inc/ProtonCandidate.hh"
 
+using CalPatRec::ChannelID;
+using CalPatRec::HitData_t;
+using CalPatRec::Pzz_t;
+
 namespace mu2e {
   class Panel;
   class SimParticle;
   class DeltaFinderAlg;
 //-----------------------------------------------------------------------------
-// assume that class T has, say, Init method, which reinitialize an object
-// allocated before
-// in particular, that assumes that T owns all its pointers (if any) and Init
-// handles them correctly
-// T is supposed to have a constructor T(int N) , wher N is the element index in the list
-// light-weight and crippled version of TClonesArray
-//-----------------------------------------------------------------------------
-    template <class T> struct ManagedList {
-      int              fN;
-      int              fNAllocated;
-      std::vector<T*>  fList;
-
-      ManagedList() {
-        fN          = 0;
-        fNAllocated = 0;
-      }
-
-      ~ManagedList() {
-        for (int i=0; i<fNAllocated; i++) delete fList[i];
-      }
-
-      T* at(int I) { return fList[I]; }
-
-      void clear () { fN = 0; }
-
-      void reserve (int N) { fList.reserve(N); }
-
-      void reinitialize() {
-        for (int i=0; i<fNAllocated; i++) delete fList[i];
-        fList.clear();
-        fN          = 0;
-        fNAllocated = 0;
-      }
-
-      int N() { return fN; }
-
-      T* New() {
-        T* ds;
-        if (fN < (int) fList.size()) {
-//-----------------------------------------------------------------------------
-// reuse already allocated slot
-//-----------------------------------------------------------------------------
-          ds = fList[fN];
-        }
-        else {
-//-----------------------------------------------------------------------------
-// allocate new slot
-//-----------------------------------------------------------------------------
-          ds = new T(fN);
-          fList.push_back(ds);
-          fNAllocated++;
-        }
-        fN++;
-        return ds;
-      }
-
-    };
-//-----------------------------------------------------------------------------
 // delta-electron seed: structure within the station
 // doesn't own anything, no need to delete any pinters
 //-----------------------------------------------------------------------------
@@ -127,15 +77,6 @@ namespace mu2e {
 //-----------------------------------------------------------------------------
 // data structures passed to the diagnostics plugin
 //-----------------------------------------------------------------------------
-    struct Pzz_t {
-      int                              fID;         // 3*face+panel, for pre-calculating overlaps
-      double                           wx;          // direction cosines of the wire, all wires are assumed parallel
-      double                           wy;
-      double                           nx;          // direction cosines of the normal to the wires, pointing outwards
-      double                           ny;
-      float                            z;           // Z-coordinate of the face
-    };
-
     struct FaceZ_t {
       int                     fID;         // 3*face+panel, for pre-calculating overlaps
 
@@ -240,15 +181,9 @@ namespace mu2e {
 
       ProtonCandidate* newProtonCandidate() { return fListOfProtonCandidates.New(); }
 
-      static void orderID           (ChannelID* X, ChannelID* Ordered);
-      static void deOrderID         (ChannelID* X, ChannelID* Ordered);
-
       void        printHitData       (HitData_t*      HitData, const char* Option = "");
       void        printDeltaSeed     (DeltaSeed*      Seed   , const char* Option = "");
       void        printDeltaCandidate(DeltaCandidate* Delta  , const char* Option = "");
-
-      void        testOrderID  ();
-      void        testdeOrderID();
    };
 
 //-----------------------------------------------------------------------------

CalPatRec/inc/DeltaSeed.hh

@@ -8,17 +8,16 @@
 
 using ROOT::Math::XYZVectorF;
 
-#include "Offline/CalPatRec/inc/DeltaFinder_enums.hh"
+// #include "Offline/CalPatRec/inc/CalPatRec_enums.hh"
 #include "Offline/CalPatRec/inc/DeltaFinder_structures.hh"
 
 namespace mu2e {
 
   namespace DeltaFinderTypes {
-    struct HitData_t;
     struct McPart_t;
   }
 
-  using  DeltaFinderTypes::HitData_t;
+  using  CalPatRec::HitData_t;
   using  DeltaFinderTypes::McPart_t;
 
   class  Panel;

CalPatRec/inc/HelixFinder_types.hh

@@ -0,0 +1,31 @@
+#ifndef CalPatRec_HelixFinder_types_hh
+#define CalPatRec_HelixFinder_types_hh
+
+#include "fhiclcpp/types/Atom.h"
+
+namespace mu2e {
+
+namespace HelixFinderTypes {
+
+struct Config {
+  fhicl::Atom<std::string> tool_type{fhicl::Name("tool_type"),
+                                     fhicl::Comment("tool type: HelixFinderDiag")};
+};
+
+struct tcInfo {
+  int nHelices;
+  int nComboHits;
+  int nStrawHits;
+  float time;
+};
+
+struct diagInfo {
+  float moduleTime;
+  int nHelices;
+  int nTimeClusters;
+  std::vector<tcInfo> timeClusterData;
+};
+
+} // namespace HelixFinderTypes
+} // namespace mu2e
+#endif