Fork me on GitHub

Changeset 9f38d6a in git for modules/Isolation.cc


Ignore:
Timestamp:
Nov 20, 2015, 2:36:11 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fdfe022
Parents:
554a3b3 (diff), 7312b4d (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 https://github.com/delphes/delphes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/Isolation.cc

    r554a3b3 r9f38d6a  
    108108
    109109  fUsePTSum = GetBool("UsePTSum", false);
     110
     111  fUseRhoCorrection = GetBool("UseRhoCorrection", true);
    110112
    111113  fClassifier->fPTMin = GetDouble("PTMin", 0.5);
     
    153155  Candidate *candidate, *isolation, *object;
    154156  TObjArray *isolationArray;
    155   Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr;
     157  Double_t sumChargedNoPU, sumChargedPU, sumNeutral, sumAllParticles;
     158  Double_t sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
    156159  Int_t counter;
    157160  Double_t eta = 0.0;
     
    188191
    189192    // loop over all input tracks
    190    
     193
    191194    sumNeutral = 0.0;
    192     sumCharged = 0.0;
     195    sumChargedNoPU = 0.0;
    193196    sumChargedPU = 0.0;
    194197    sumAllParticles = 0.0;
    195    
     198
    196199    counter = 0;
    197200    itIsolationArray.Reset();
    198    
     201
    199202    while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
    200203    {
     
    205208      {
    206209        sumAllParticles += isolationMomentum.Pt();
    207         if(isolation->Charge !=0)
    208         {
    209           sumCharged += isolationMomentum.Pt();
    210           if(isolation->IsRecoPU != 0) sumChargedPU += isolationMomentum.Pt();
    211         }
     210        if(isolation->Charge != 0)
     211        {
     212          if(isolation->IsRecoPU)
     213          {
     214            sumChargedPU += isolationMomentum.Pt();
     215          }
     216          else
     217          {
     218            sumChargedNoPU += isolationMomentum.Pt();
     219          }
     220        }
    212221        else
    213         {
    214           sumNeutral += isolationMomentum.Pt();
     222        {
     223          sumNeutral += isolationMomentum.Pt();
    215224        }
    216225        ++counter;
     
    232241    }
    233242
    234      // correct sum for pile-up contamination
    235     sumDBeta = sumCharged + TMath::Max(sumNeutral-0.5*sumChargedPU,0.0);
    236     sumRhoCorr = sumCharged + TMath::Max(sumNeutral-TMath::Max(rho,0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(),0.0);
     243    // correct sum for pile-up contamination
     244    sumDBeta = sumChargedNoPU + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);
     245    sumRhoCorr = sumChargedNoPU + TMath::Max(sumNeutral - TMath::Max(rho, 0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(), 0.0);
    237246    ratioDBeta = sumDBeta/candidateMomentum.Pt();
    238247    ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
    239    
     248
    240249    candidate->IsolationVar = ratioDBeta;
    241250    candidate->IsolationVarRhoCorr = ratioRhoCorr;
    242     candidate->SumPtCharged = sumCharged;
     251    candidate->SumPtCharged = sumChargedNoPU;
    243252    candidate->SumPtNeutral = sumNeutral;
    244253    candidate->SumPtChargedPU = sumChargedPU;
    245254    candidate->SumPt = sumAllParticles;
    246255
    247     if((fUsePTSum && sumRhoCorr > fPTSumMax) || (!fUsePTSum && ratioRhoCorr > fPTRatioMax)) continue;
     256    sum = fUseRhoCorrection ? sumRhoCorr : sumDBeta;
     257    if(fUsePTSum && sum > fPTSumMax) continue;
     258
     259    ratio = fUseRhoCorrection ? ratioRhoCorr : ratioDBeta;
     260    if(!fUsePTSum && ratio > fPTRatioMax) continue;
     261
    248262    fOutputArray->Add(candidate);
    249263  }
Note: See TracChangeset for help on using the changeset viewer.