Changes in modules/Isolation.cc [341014c:65dc4e7] in git

File:

• modules/Isolation.cc (modified) (10 diffs)

modules/Isolation.cc

@@ -17 +17 @@
  */
 
+
 /** \class Isolation
  *
@@ -34 +35 @@
 #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 <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -58 +59 @@
 {
 public:
+
   IsolationClassifier() {}
 
@@ -69 +71 @@
 Int_t IsolationClassifier::GetCategory(TObject *object)
 {
-  Candidate *track = static_cast<Candidate *>(object);
+  Candidate *track = static_cast<Candidate*>(object);
   const TLorentzVector &momentum = track->Momentum;
 
@@ -169 +171 @@
   // loop over all input jets
   fItCandidateInputArray->Reset();
-  while((candidate = static_cast<Candidate *>(fItCandidateInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItCandidateInputArray->Next())))
   {
     const TLorentzVector &candidateMomentum = candidate->Momentum;
@@ -179 +181 @@
     {
       fItRhoInputArray->Reset();
-      while((object = static_cast<Candidate *>(fItRhoInputArray->Next())))
+      while((object = static_cast<Candidate*>(fItRhoInputArray->Next())))
       {
         if(eta >= object->Edges[0] && eta < object->Edges[1])
@@ -196 +198 @@
 
     itIsolationArray.Reset();
-    while((isolation = static_cast<Candidate *>(itIsolationArray.Next())))
+    while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
     {
       const TLorentzVector &isolationMomentum = isolation->Momentum;
@@ -202 +204 @@
       if(fUseMiniCone)
       {
-        pass = candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax && candidateMomentum.DeltaR(isolationMomentum) > fDeltaRMin;
+         pass = candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
+         candidateMomentum.DeltaR(isolationMomentum) > fDeltaRMin;
       }
       else
       {
-        pass = candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax && candidate->GetUniqueID() != isolation->GetUniqueID();
+         pass = candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
+         candidate->GetUniqueID() != isolation->GetUniqueID();
       }
 
@@ -229 +233 @@
         }
       }
+
     }
 
-    // find rho
+   // find rho
     rho = 0.0;
     if(fRhoInputArray)
     {
       fItRhoInputArray->Reset();
-      while((object = static_cast<Candidate *>(fItRhoInputArray->Next())))
+      while((object = static_cast<Candidate*>(fItRhoInputArray->Next())))
       {
         if(eta >= object->Edges[0] && eta < object->Edges[1])
@@ -245 +250 @@
     }
 
+
+
     // correct sum for pile-up contamination
-    sumDBeta = sumChargedNoPU + TMath::Max(sumNeutral - 0.5 * sumChargedPU, 0.0);
-    sumRhoCorr = sumChargedNoPU + TMath::Max(sumNeutral - TMath::Max(rho, 0.0) * fDeltaRMax * fDeltaRMax * TMath::Pi(), 0.0);
-    ratioDBeta = sumDBeta / candidateMomentum.Pt();
-    ratioRhoCorr = sumRhoCorr / candidateMomentum.Pt();
+    sumDBeta = sumChargedNoPU + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);
+    sumRhoCorr = sumChargedNoPU + TMath::Max(sumNeutral - TMath::Max(rho, 0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(), 0.0);
+    ratioDBeta = sumDBeta/candidateMomentum.Pt();
+    ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
 
     candidate->IsolationVar = ratioDBeta;