Changeset f32ea92 in git

Timestamp:

Nov 20, 2015, 2:06:28 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fc4143c

Parents:

8e2bc10 (diff), 715ab7c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

Location:

modules

Files:

• Isolation.cc (modified) (5 diffs)
• TrackPileUpSubtractor.cc (modified) (4 diffs)
• TrackPileUpSubtractor.h (modified) (1 diff)

modules/Isolation.cc

@@ -153 +153 @@
   Candidate *candidate, *isolation, *object;
   TObjArray *isolationArray;
-  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr;
+  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU;
+  Double_t sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
   Int_t counter;
   Double_t eta = 0.0;
@@ -188 +189 @@
 
     // loop over all input tracks
-    
+
     sumNeutral = 0.0;
     sumCharged = 0.0;
     sumChargedPU = 0.0;
     sumAllParticles = 0.0;
-   
+
     counter = 0;
     itIsolationArray.Reset();
-    
+
     while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
     {
@@ -205 +206 @@
       {
         sumAllParticles += isolationMomentum.Pt();
-        if(isolation->Charge !=0) 
-        { 
-          sumCharged += isolationMomentum.Pt();
-          if(isolation->IsRecoPU != 0) sumChargedPU += isolationMomentum.Pt();
-        } 
+        if(isolation->Charge != 0)
+        {
+          if(isolation->IsRecoPU)
+          {
+            sumChargedPU += isolationMomentum.Pt();
+          }
+          else
+          {
+            sumCharged += isolationMomentum.Pt();
+          }
+        }
         else
-        {
-          sumNeutral += isolationMomentum.Pt();
+        {
+          sumNeutral += isolationMomentum.Pt();
         }
         ++counter;
@@ -232 +239 @@
     }
 
-     // correct sum for pile-up contamination
-    sumDBeta = sumCharged + TMath::Max(sumNeutral-0.5*sumChargedPU,0.0);
-    sumRhoCorr = sumCharged + TMath::Max(sumNeutral-TMath::Max(rho,0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(),0.0);
+    // correct sum for pile-up contamination
+    sumDBeta = sumCharged + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);
+    sumRhoCorr = sumCharged + 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;
     candidate->IsolationVarRhoCorr = ratioRhoCorr;
@@ -245 +252 @@
     candidate->SumPt = sumAllParticles;
 
-    if((fUsePTSum && sumRhoCorr > fPTSumMax) || (!fUsePTSum && ratioRhoCorr > fPTRatioMax)) continue;
+    sum = fRhoInputArray ? sumRhoCorr : sumDBeta;
+    if(fUsePTSum && sum > fPTSumMax) continue;
+
+    ratio = fRhoInputArray ? ratioRhoCorr : ratioDBeta;
+    if(!fUsePTSum && ratio > fPTRatioMax) continue;
+
     fOutputArray->Add(candidate);
   }

modules/TrackPileUpSubtractor.cc

@@ -67 +67 @@
 void TrackPileUpSubtractor::Init()
 {
-// import input array
+  // import input array
 
   fVertexInputArray = ImportArray(GetString("VertexInputArray", "PileUpMerger/vertices"));
   fItVertexInputArray = fVertexInputArray->MakeIterator();
-  
+
   fZVertexResolution  = GetDouble("ZVertexResolution", 0.005)*1.0E3;
 
   fPTMin = GetDouble("PTMin", 0.);
+
   // import arrays with output from other modules
-   
+
   ExRootConfParam param = GetParam("InputArray");
   Long_t i, size;
@@ -119 +120 @@
   Double_t z, zvtx=0;
 
-  
+
   // find z position of primary vertex
-  
+
   fItVertexInputArray->Reset();
   while((candidate = static_cast<Candidate*>(fItVertexInputArray->Next())))
@@ -127 +128 @@
     if(!candidate->IsPU)
     {
-    zvtx = candidate->Position.Z();
-    // break;
+      zvtx = candidate->Position.Z();
+      // break;
     }
   }
@@ -144 +145 @@
       particle = static_cast<Candidate*>(candidate->GetCandidates()->At(0));
       z = particle->Position.Z();
-      
+
       // apply pile-up subtraction
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
-      
-      if(candidate->IsPU && TMath::Abs(z-zvtx) > fZVertexResolution) candidate->IsRecoPU = 1;
-      else 
+
+      if(candidate->IsPU && TMath::Abs(z-zvtx) > fZVertexResolution)
       {
-         candidate->IsRecoPU = 0;
-         if( candidate->Momentum.Pt() > fPTMin) array->Add(candidate);
+        candidate->IsRecoPU = 1;
+      }
+      else
+      {
+        candidate->IsRecoPU = 0;
+        if(candidate->Momentum.Pt() > fPTMin) array->Add(candidate);
       }
     }

modules/TrackPileUpSubtractor.h

@@ -50 +50 @@
   Double_t fZVertexResolution;
 
-  Double_t fPTMin; 
+  Double_t fPTMin;
 
   std::map< TIterator *, TObjArray * > fInputMap; //!