ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitHzz4l/LeptonSelection/src/IsolationSelection.cc
(Generate patch)

Comparing UserCode/MitHzz4l/LeptonSelection/src/IsolationSelection.cc (file contents):
Revision 1.30 by khahn, Tue Jun 5 19:35:47 2012 UTC vs.
Revision 1.33 by anlevin, Wed Oct 17 01:31:22 2012 UTC

# Line 1021 | Line 1021 | double  muonPFIso04(ControlFlags &ctrl,
1021      //
1022      else if (abs(pf->PFType()) == PFCandidate::eGamma) {
1023        // KH, add to sync
1024 <      if( pf->Pt() > 0.5 )
1024 >      if( pf->Pt() > 0.5 && dr > 0.01)
1025        fGammaIso += pf->Pt();
1026      }
1027      
# Line 1029 | Line 1029 | double  muonPFIso04(ControlFlags &ctrl,
1029      // Other Neutrals
1030      //
1031      else {
1032 <      if( pf->Pt() > 0.5 )
1032 >    
1033 >      if( pf->Pt() > 0.5  && dr > 0.01)
1034          fNeutralHadronIso += pf->Pt();
1035      }
1036    }
# Line 1065 | Line 1066 | double  muonPFIso04(ControlFlags &ctrl,
1066  
1067    double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
1068                                          -rho*muT.MuonEffectiveArea(muT.kMuGammaAndNeutralHadronIso04,
1069 <                                                                   tmpvec.Eta(),EffectiveAreaVersion)));
1070 <                                                                   //mu->Eta(),EffectiveAreaVersion)));
1069 >                                                                   //tmpvec.Eta(),EffectiveAreaVersion)));
1070 >                                                                   mu->Eta(),EffectiveAreaVersion)));
1071    gChargedIso = fChargedIso;
1072    gGammaIso   = fGammaIso;
1073    gNeutralIso = fNeutralHadronIso;
# Line 1285 | Line 1286 | SelectionStatus muonReferenceIsoSelectio
1286  
1287    bool pass = false;
1288    if( (pfIso/mu->Pt()) < MUON_REFERENCE_PFISO_CUT ) pass = true;
1289 <  
1289 >
1290    if( pass ) {
1291      status.orStatus(SelectionStatus::LOOSEISO);
1292      status.orStatus(SelectionStatus::TIGHTISO);
# Line 2297 | Line 2298 | float electronPFIso04(ControlFlags &ctrl
2298        if (fabs(ele->SCluster()->Eta()) > 1.479) {
2299          if (mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta()) < 0.08) continue;
2300        }
2301 +
2302 +      assert(ele->HasSuperCluster());
2303 +      if(ele->GsfTrk()->NExpectedHitsInner()>0 && pf->MvaGamma() > 0.99 && pf->HasSCluster() && ele->SCluster() == pf->SCluster())      continue;
2304 +
2305 +
2306        if( ctrl.debug) cout << "gamma:: " << pf->Pt() << " "
2307                             << dr << endl;
2308        // KH, add to sync
# Line 2891 | Line 2897 | double  nonCorrectedIsoDr03(ControlFlags
2897           << "\tfNeutralHadronIso: " << fNeutralHadronIso
2898           << "\tfpfPU: " << fpfPU
2899           << endl;
2900 <  }
2900 >  }  
2901 >
2902    double pfIso = fChargedIso + fGammaIso + fNeutralHadronIso + fpfPU;
2903    return pfIso/photon->Pt();
2904   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines