Fork me on GitHub

Changeset 9b756ad in git


Ignore:
Timestamp:
Nov 20, 2015, 2:09:18 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
f436ed7
Parents:
4283572 (diff), cef50c9 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/Isolation.cc

    r4283572 r9b756ad  
    153153  Candidate *candidate, *isolation, *object;
    154154  TObjArray *isolationArray;
    155   Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU;
     155  Double_t sumChargedNoPU, sumChargedPU, sumNeutral, sumAllParticles;
    156156  Double_t sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
    157157  Int_t counter;
     
    191191
    192192    sumNeutral = 0.0;
    193     sumCharged = 0.0;
     193    sumChargedNoPU = 0.0;
    194194    sumChargedPU = 0.0;
    195195    sumAllParticles = 0.0;
     
    214214          else
    215215          {
    216             sumCharged += isolationMomentum.Pt();
     216            sumChargedNoPU += isolationMomentum.Pt();
    217217          }
    218218        }
     
    240240
    241241    // correct sum for pile-up contamination
    242     sumDBeta = sumCharged + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);
    243     sumRhoCorr = sumCharged + TMath::Max(sumNeutral - TMath::Max(rho, 0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(), 0.0);
     242    sumDBeta = sumChargedNoPU + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);
     243    sumRhoCorr = sumChargedNoPU + TMath::Max(sumNeutral - TMath::Max(rho, 0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(), 0.0);
    244244    ratioDBeta = sumDBeta/candidateMomentum.Pt();
    245245    ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
     
    247247    candidate->IsolationVar = ratioDBeta;
    248248    candidate->IsolationVarRhoCorr = ratioRhoCorr;
    249     candidate->SumPtCharged = sumCharged;
     249    candidate->SumPtCharged = sumChargedNoPU;
    250250    candidate->SumPtNeutral = sumNeutral;
    251251    candidate->SumPtChargedPU = sumChargedPU;
Note: See TracChangeset for help on using the changeset viewer.