Changes in modules/UniqueObjectFinder.cc [77e9ae1:93da593] in git

File:

• modules/UniqueObjectFinder.cc (modified) (9 diffs)

modules/UniqueObjectFinder.cc

@@ -17 +17 @@
  */
 
+
 /** \class UniqueObjectFinder
  *
@@ -31 +32 @@
 #include "classes/DelphesFormula.h"
 
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootResult.h"
 
+#include "TMath.h"
+#include "TString.h"
+#include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
 #include "TDatabasePDG.h"
-#include "TFormula.h"
 #include "TLorentzVector.h"
-#include "TMath.h"
-#include "TObjArray.h"
-#include "TRandom3.h"
-#include "TString.h"
 
-#include <algorithm>
+#include <algorithm> 
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -66 +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
 
@@ -79 +77 @@
 
   size = param.GetSize();
-  for(i = 0; i < size / 2; ++i)
+  for(i = 0; i < size/2; ++i)
   {
-    array = ImportArray(param[i * 2].GetString());
+    array = ImportArray(param[i*2].GetString());
     iterator = array->MakeIterator();
 
-    fInputMap.push_back(make_pair(iterator, ExportArray(param[i * 2 + 1].GetString())));
+    fInputMap.push_back(make_pair(iterator, ExportArray(param[i*2 + 1].GetString())));
   }
 }
@@ -92 +90 @@
 void UniqueObjectFinder::Finish()
 {
-  vector<pair<TIterator *, TObjArray *> >::iterator itInputMap;
+  vector< pair< TIterator *, TObjArray * > >::iterator itInputMap;
   TIterator *iterator;
 
@@ -108 +106 @@
 {
   Candidate *candidate;
-  vector<pair<TIterator *, TObjArray *> >::iterator itInputMap;
+  vector< pair< TIterator *, TObjArray * > >::iterator itInputMap;
   TIterator *iterator;
   TObjArray *array;
@@ -120 +118 @@
     // loop over all candidates
     iterator->Reset();
-    while((candidate = static_cast<Candidate *>(iterator->Next())))
+    while((candidate = static_cast<Candidate*>(iterator->Next())))
     {
       if(Unique(candidate, itInputMap))
@@ -132 +130 @@
 //------------------------------------------------------------------------------
 
-Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector<pair<TIterator *, TObjArray *> >::iterator itInputMap)
+Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector< pair< TIterator *, TObjArray * > >::iterator itInputMap)
 {
   Candidate *previousCandidate;
-  vector<pair<TIterator *, TObjArray *> >::iterator previousItInputMap;
+  vector< pair< TIterator *, TObjArray * > >::iterator previousItInputMap;
   TObjArray *array;
 
@@ -146 +144 @@
     // loop over all candidates
     iterator.Reset();
-    while((previousCandidate = static_cast<Candidate *>(iterator.Next())))
+    while((previousCandidate = static_cast<Candidate*>(iterator.Next())))
     {
-      if(fUseUniqueID)
+      if(candidate->Overlaps(previousCandidate))
       {
-        if(candidate->GetUniqueID() == previousCandidate->GetUniqueID())
-        {
-          return kFALSE;
-        }
-      }
-      else
-      {
-        if(candidate->Overlaps(previousCandidate))
-        {
-          return kFALSE;
-        }
+        return kFALSE;
       }
     }