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.26 by anlevin, Mon May 28 12:37:10 2012 UTC vs.
Revision 1.27 by khahn, Mon May 28 16:34:44 2012 UTC

# Line 468 | Line 468 | SelectionStatus muonIsoMVASelection(Cont
468    double rho = 0;
469    if (!(isnan(fPUEnergyDensity->At(0)->Rho()) || isinf(fPUEnergyDensity->At(0)->Rho())))
470      rho = fPUEnergyDensity->At(0)->Rho();
471 +
472   //   if (!(isnan(fPUEnergyDensity->At(0)->RhoLowEta()) || isinf(fPUEnergyDensity->At(0)->RhoLowEta())))
473   //     rho = fPUEnergyDensity->At(0)->RhoLowEta();
474    
# Line 1114 | Line 1115 | double  muonPFIso04(ControlFlags &ctrl,
1115    }
1116  
1117    double rho=0;
1118 <  if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral()) || isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral())))
1119 <    rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral();
1120 <
1118 >  if( (EffectiveAreaVersion == mithep::MuonTools::kMuEAFall11MC) ||
1119 >      (EffectiveAreaVersion == mithep::MuonTools::kMuEAData2011) ) {
1120 >    if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25()) ||
1121 >          isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25())))
1122 >      rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25();
1123 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
1124 >    EffectiveAreaVersion  = mithep::MuonTools::kMuEAData2011;
1125 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
1126 >  } else {
1127 >    if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral()) ||
1128 >          isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral())))
1129 >      rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral();
1130 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
1131 >    EffectiveAreaVersion  = mithep::MuonTools::kMuEAData2011;
1132 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
1133 >  }
1134 >  if(ctrl.debug) cout << "rho: " << rho << endl;
1135  
1136    double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
1137                                          -rho*muT.MuonEffectiveArea(muT.kMuGammaAndNeutralHadronIso04,
# Line 2392 | Line 2407 | float electronPFIso04(ControlFlags &ctrl
2407  
2408        // Veto any PFmuon, or PFEle
2409        if (abs(pf->PFType()) == PFCandidate::eElectron || abs(pf->PFType()) == PFCandidate::eMuon) {
2410 <          if( ctrl.debug) cout << "\t skipping, pf is and ele or mu .." <<endl;
2410 >        if( ctrl.debug ) cout << "\t skipping, pf is and ele or mu .." <<endl;
2411          continue;
2412        }
2413  
# Line 2438 | Line 2453 | float electronPFIso04(ControlFlags &ctrl
2453  
2454  
2455    double rho=0;
2456 <  if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJets()) || isinf(fPUEnergyDensity->At(0)->RhoKt6PFJets())))
2457 <    rho = fPUEnergyDensity->At(0)->RhoKt6PFJets();
2458 <
2456 >  if( (EffectiveAreaVersion == mithep::ElectronTools::kEleEAFall11MC) ||
2457 >      (EffectiveAreaVersion == mithep::ElectronTools::kEleEAData2011) ) {
2458 >    if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25()) ||
2459 >          isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25())))
2460 >      rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25();
2461 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2462 >    EffectiveAreaVersion  = mithep::ElectronTools::kEleEAData2011;
2463 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2464 >  } else {
2465 >    if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJets()) ||
2466 >          isinf(fPUEnergyDensity->At(0)->RhoKt6PFJets())))
2467 >      rho = fPUEnergyDensity->At(0)->RhoKt6PFJets();
2468 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2469 >    EffectiveAreaVersion  = mithep::ElectronTools::kEleEAData2011;
2470 >    // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2471 >  }
2472 >  if(ctrl.debug) cout << "rho: " << rho << endl;
2473  
2474    double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
2475                                          -rho*eleT.ElectronEffectiveArea(eleT.kEleGammaAndNeutralHadronIso04,
# Line 2607 | Line 2636 | float electronPFIso04(ControlFlags &ctrl
2636  
2637        // Veto any PFmuon, or PFEle
2638        if (abs(pf->PFType()) == PFCandidate::eElectron || abs(pf->PFType()) == PFCandidate::eMuon) {
2639 <         cout << "\t skipping, pf is and ele or mu .." <<endl;
2639 >        if( ctrl.debug ) cout << "\t skipping, pf is and ele or mu .." <<endl;
2640          continue;
2641        }
2642  

Diff Legend

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