Changeset 70bb4cb in git for modules

Timestamp:

Jan 22, 2019, 5:04:07 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, llp, master

Children:

8a11cdc

Parents:

3b3d0ad

Message:

add possibility to calculate MET with smeared jets

Location:

modules

Files:

• FastJetFinder.cc (modified) (2 diffs)
• FastJetFinder.h (modified) (1 diff)
• UniqueObjectFinder.cc (modified) (2 diffs)
• UniqueObjectFinder.h (modified) (1 diff)

modules/FastJetFinder.cc

@@ -290 +290 @@
   fOutputArray = ExportArray(GetString("OutputArray", "jets"));
   fRhoOutputArray = ExportArray(GetString("RhoOutputArray", "rho"));
+  fConstituentsOutputArray = ExportArray(GetString("ConstituentsOutputArray", "constituents"));
 }
 
@@ -446 +447 @@
       charge += constituent->Charge;
 
+      fConstituentsOutputArray->Add(constituent);
       candidate->AddCandidate(constituent);
     }

modules/FastJetFinder.h

@@ -152 +152 @@
   TObjArray *fOutputArray; //!
   TObjArray *fRhoOutputArray; //!
+  TObjArray *fConstituentsOutputArray; //!
 
   ClassDef(FastJetFinder, 1)

modules/UniqueObjectFinder.cc

@@ -67 +67 @@
 void UniqueObjectFinder::Init()
 {
+  // use GetUniqueID algorithm to find unique objects (faster than the default Overlaps method)
+  fUseUniqueID = GetBool("UseUniqueID", false);
+
   // import arrays with output from other modules
 
@@ -146 +149 @@
     while((previousCandidate = static_cast<Candidate*>(iterator.Next())))
     {
-      if(candidate->Overlaps(previousCandidate))
+      if(fUseUniqueID)
       {
-        return kFALSE;
+        if(candidate->GetUniqueID() == previousCandidate->GetUniqueID())
+        {
+          return kFALSE;
+        }
+      }
+      else
+      {
+        if(candidate->Overlaps(previousCandidate))
+        {
+          return kFALSE;
+        }
       }
     }

modules/UniqueObjectFinder.h

@@ -50 +50 @@
 private:
 
+  Bool_t fUseUniqueID;
+
   Bool_t Unique(Candidate *candidate, std::vector< std::pair< TIterator *, TObjArray * > >::iterator itInputMap);