Skip to content

Commit

Permalink
Merge pull request #48 from anehrkor/CMSSW_9_1_X_tau-pog_tauID-GJangle
Browse files Browse the repository at this point in the history 
Implementing further requests made by Slava
  • Loading branch information
@roger-wolf
roger-wolf authored Apr 28, 2017
2 parents 1a3f320 + 6bfb858 commit 5be50cb
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 44 deletions.
48 changes: 26 additions & 22 deletions RecoTauTag/RecoTau/plugins/PATTauDiscriminationByMVAIsolationRun2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,12 @@ double PATTauDiscriminationByMVAIsolationRun2::discriminate(const TauRef& tau) c

int tauDecayMode = tau->decayMode();

if ( ((mvaOpt_ == kOldDMwoLT || mvaOpt_ == kOldDMwLT || mvaOpt_ == kDBoldDMwLT || mvaOpt_ == kPWoldDMwLT || mvaOpt_ == kDBoldDMwLTwGJ) && (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 10)) ||
((mvaOpt_ == kNewDMwoLT || mvaOpt_ == kNewDMwLT || mvaOpt_ == kDBnewDMwLT || mvaOpt_ == kPWnewDMwLT || mvaOpt_ == kDBnewDMwLTwGJ) && (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 5 || tauDecayMode == 6 || tauDecayMode == 10 || tauDecayMode == 11)) ) {
if ( ((mvaOpt_ == kOldDMwoLT || mvaOpt_ == kOldDMwLT || mvaOpt_ == kDBoldDMwLT || mvaOpt_ == kPWoldDMwLT || mvaOpt_ == kDBoldDMwLTwGJ)
&& (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 10))
||
((mvaOpt_ == kNewDMwoLT || mvaOpt_ == kNewDMwLT || mvaOpt_ == kDBnewDMwLT || mvaOpt_ == kPWnewDMwLT || mvaOpt_ == kDBnewDMwLTwGJ)
&& (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 5 || tauDecayMode == 6 || tauDecayMode == 10 || tauDecayMode == 11))
) {

float chargedIsoPtSum = tau->tauID(chargedIsoPtSums_);
float neutralIsoPtSum = tau->tauID(neutralIsoPtSums_);
Expand Down Expand Up @@ -220,7 +224,7 @@ double PATTauDiscriminationByMVAIsolationRun2::discriminate(const TauRef& tau) c
double pAOneMag = tau->p();
double argumentThetaGJmax = (std::pow(mTau,2) - std::pow(mAOne,2) ) / ( 2 * mTau * pAOneMag );
double argumentThetaGJmeasured = ( tau->p4().px() * decayDistX + tau->p4().py() * decayDistY + tau->p4().pz() * decayDistZ ) / ( pAOneMag * decayDistMag );
if ( std::fabs(argumentThetaGJmax) <= 1. && std::fabs(argumentThetaGJmeasured) <= 1. ) {
if ( std::abs(argumentThetaGJmax) <= 1. && std::abs(argumentThetaGJmeasured) <= 1. ) {
double thetaGJmax = std::asin( argumentThetaGJmax );
double thetaGJmeasured = std::acos( argumentThetaGJmeasured );
gjAngleDiff = thetaGJmeasured - thetaGJmax;
Expand All @@ -229,27 +233,27 @@ double PATTauDiscriminationByMVAIsolationRun2::discriminate(const TauRef& tau) c

if ( mvaOpt_ == kOldDMwoLT || mvaOpt_ == kNewDMwoLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum - 0.125f*puCorrPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
mvaInput_[5] = tauDecayMode;
} else if ( mvaOpt_ == kOldDMwLT || mvaOpt_ == kNewDMwLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum - 0.125f*puCorrPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
mvaInput_[5] = tauDecayMode;
mvaInput_[6] = std::copysign(+1.f, tau->dxy());
mvaInput_[7] = std::sqrt(std::min(1.f, std::fabs(tau->dxy())));
mvaInput_[8] = std::min(10.f, std::fabs(tau->dxy_Sig()));
mvaInput_[7] = std::sqrt(std::min(1.f, std::abs(tau->dxy())));
mvaInput_[8] = std::min(10.f, std::abs(tau->dxy_Sig()));
mvaInput_[9] = ( tau->hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[10] = std::sqrt(decayDistMag);
mvaInput_[11] = std::min(10.f, tau->flightLengthSig());
} else if ( mvaOpt_ == kDBoldDMwLT || mvaOpt_ == kDBnewDMwLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
Expand All @@ -263,17 +267,17 @@ double PATTauDiscriminationByMVAIsolationRun2::discriminate(const TauRef& tau) c
mvaInput_[12] = std::min(100.f, leadingTrackChi2);
mvaInput_[13] = std::min(1.f, eRatio);
mvaInput_[14] = std::copysign(+1.f, tau->dxy());
mvaInput_[15] = std::sqrt(std::min(1.f, std::fabs(tau->dxy())));
mvaInput_[16] = std::min(10.f, std::fabs(tau->dxy_Sig()));
mvaInput_[15] = std::sqrt(std::min(1.f, std::abs(tau->dxy())));
mvaInput_[16] = std::min(10.f, std::abs(tau->dxy_Sig()));
mvaInput_[17] = std::copysign(+1.f, tau->ip3d());
mvaInput_[18] = std::sqrt(std::min(1.f, std::fabs(tau->ip3d())));
mvaInput_[19] = std::min(10.f, std::fabs(tau->ip3d_Sig()));
mvaInput_[18] = std::sqrt(std::min(1.f, std::abs(tau->ip3d())));
mvaInput_[19] = std::min(10.f, std::abs(tau->ip3d_Sig()));
mvaInput_[20] = ( tau->hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[21] = std::sqrt(decayDistMag);
mvaInput_[22] = std::min(10.f, tau->flightLengthSig());
} else if ( mvaOpt_ == kPWoldDMwLT || mvaOpt_ == kPWnewDMwLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, footprintCorrection));
Expand All @@ -287,17 +291,17 @@ double PATTauDiscriminationByMVAIsolationRun2::discriminate(const TauRef& tau) c
mvaInput_[12] = std::min(100.f, leadingTrackChi2);
mvaInput_[13] = std::min(1.f, eRatio);
mvaInput_[14] = std::copysign(+1.f, tau->dxy());
mvaInput_[15] = std::sqrt(std::min(1.f, std::fabs(tau->dxy())));
mvaInput_[16] = std::min(10.f, std::fabs(tau->dxy_Sig()));
mvaInput_[15] = std::sqrt(std::min(1.f, std::abs(tau->dxy())));
mvaInput_[16] = std::min(10.f, std::abs(tau->dxy_Sig()));
mvaInput_[17] = std::copysign(+1.f, tau->ip3d());
mvaInput_[18] = std::sqrt(std::min(1.f, std::fabs(tau->ip3d())));
mvaInput_[19] = std::min(10.f, std::fabs(tau->ip3d_Sig()));
mvaInput_[18] = std::sqrt(std::min(1.f, std::abs(tau->ip3d())));
mvaInput_[19] = std::min(10.f, std::abs(tau->ip3d_Sig()));
mvaInput_[20] = ( tau->hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[21] = std::sqrt(decayDistMag);
mvaInput_[22] = std::min(10.f, tau->flightLengthSig());
} else if ( mvaOpt_ == kDBoldDMwLTwGJ || mvaOpt_ == kDBnewDMwLTwGJ ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
Expand All @@ -310,11 +314,11 @@ double PATTauDiscriminationByMVAIsolationRun2::discriminate(const TauRef& tau) c
mvaInput_[11] = std::min(0.5f, ptWeightedDrIsolation);
mvaInput_[12] = std::min(1.f, eRatio);
mvaInput_[13] = std::copysign(+1.f, tau->dxy());
mvaInput_[14] = std::sqrt(std::min(1.f, std::fabs(tau->dxy())));
mvaInput_[15] = std::min(10.f, std::fabs(tau->dxy_Sig()));
mvaInput_[14] = std::sqrt(std::min(1.f, std::abs(tau->dxy())));
mvaInput_[15] = std::min(10.f, std::abs(tau->dxy_Sig()));
mvaInput_[16] = std::copysign(+1.f, tau->ip3d());
mvaInput_[17] = std::sqrt(std::min(1.f, std::fabs(tau->ip3d())));
mvaInput_[18] = std::min(10.f, std::fabs(tau->ip3d_Sig()));
mvaInput_[17] = std::sqrt(std::min(1.f, std::abs(tau->ip3d())));
mvaInput_[18] = std::min(10.f, std::abs(tau->ip3d_Sig()));
mvaInput_[19] = ( tau->hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[20] = std::sqrt(decayDistMag);
mvaInput_[21] = std::min(10.f, tau->flightLengthSig());
Expand Down
48 changes: 26 additions & 22 deletions RecoTauTag/RecoTau/plugins/PFRecoTauDiscriminationByMVAIsolationRun2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,12 @@ double PFRecoTauDiscriminationByMVAIsolationRun2::discriminate(const PFTauRef& t

int tauDecayMode = tau->decayMode();

if ( ((mvaOpt_ == kOldDMwoLT || mvaOpt_ == kOldDMwLT || mvaOpt_ == kDBoldDMwLT || mvaOpt_ == kPWoldDMwLT || mvaOpt_ == kDBoldDMwLTwGJ) && (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 10)) ||
((mvaOpt_ == kNewDMwoLT || mvaOpt_ == kNewDMwLT || mvaOpt_ == kDBnewDMwLT || mvaOpt_ == kPWnewDMwLT || mvaOpt_ == kDBnewDMwLTwGJ) && (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 5 || tauDecayMode == 6 || tauDecayMode == 10 || tauDecayMode == 11)) ) {
if ( ((mvaOpt_ == kOldDMwoLT || mvaOpt_ == kOldDMwLT || mvaOpt_ == kDBoldDMwLT || mvaOpt_ == kPWoldDMwLT || mvaOpt_ == kDBoldDMwLTwGJ)
&& (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 10))
||
((mvaOpt_ == kNewDMwoLT || mvaOpt_ == kNewDMwLT || mvaOpt_ == kDBnewDMwLT || mvaOpt_ == kPWnewDMwLT || mvaOpt_ == kDBnewDMwLTwGJ)
&& (tauDecayMode == 0 || tauDecayMode == 1 || tauDecayMode == 2 || tauDecayMode == 5 || tauDecayMode == 6 || tauDecayMode == 10 || tauDecayMode == 11))
) {

float chargedIsoPtSum = (*chargedIsoPtSums_)[tau];
float neutralIsoPtSum = (*neutralIsoPtSums_)[tau];
Expand Down Expand Up @@ -231,7 +235,7 @@ double PFRecoTauDiscriminationByMVAIsolationRun2::discriminate(const PFTauRef& t
double pAOneMag = tau->p();
double argumentThetaGJmax = (std::pow(mTau,2) - std::pow(mAOne,2) ) / ( 2 * mTau * pAOneMag );
double argumentThetaGJmeasured = ( tau->p4().px() * decayDistX + tau->p4().py() * decayDistY + tau->p4().pz() * decayDistZ ) / ( pAOneMag * decayDistMag );
if ( std::fabs(argumentThetaGJmax) <= 1. && std::fabs(argumentThetaGJmeasured) <= 1. ) {
if ( std::abs(argumentThetaGJmax) <= 1. && std::abs(argumentThetaGJmeasured) <= 1. ) {
double thetaGJmax = std::asin( argumentThetaGJmax );
double thetaGJmeasured = std::acos( argumentThetaGJmeasured );
gjAngleDiff = thetaGJmeasured - thetaGJmax;
Expand All @@ -240,27 +244,27 @@ double PFRecoTauDiscriminationByMVAIsolationRun2::discriminate(const PFTauRef& t

if ( mvaOpt_ == kOldDMwoLT || mvaOpt_ == kNewDMwoLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum - 0.125f*puCorrPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
mvaInput_[5] = tauDecayMode;
} else if ( mvaOpt_ == kOldDMwLT || mvaOpt_ == kNewDMwLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum - 0.125f*puCorrPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
mvaInput_[5] = tauDecayMode;
mvaInput_[6] = std::copysign(+1.f, (float)tauLifetimeInfo.dxy());
mvaInput_[7] = std::sqrt(std::fabs(std::min(1.f, (float)tauLifetimeInfo.dxy())));
mvaInput_[8] = std::min(10.f, std::fabs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[7] = std::sqrt(std::abs(std::min(1.f, (float)tauLifetimeInfo.dxy())));
mvaInput_[8] = std::min(10.f, std::abs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[9] = ( tauLifetimeInfo.hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[10] = std::sqrt(decayDistMag);
mvaInput_[11] = std::min(10.f, (float)tauLifetimeInfo.flightLengthSig());
} else if ( mvaOpt_ == kDBoldDMwLT || mvaOpt_ == kDBnewDMwLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
Expand All @@ -274,17 +278,17 @@ double PFRecoTauDiscriminationByMVAIsolationRun2::discriminate(const PFTauRef& t
mvaInput_[12] = std::min(100.f, leadingTrackChi2);
mvaInput_[13] = std::min(1.f, eRatio);
mvaInput_[14] = std::copysign(+1.f, (float)tauLifetimeInfo.dxy());
mvaInput_[15] = std::sqrt(std::fabs(std::min(1.f, std::fabs((float)tauLifetimeInfo.dxy()))));
mvaInput_[16] = std::min(10.f, std::fabs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[15] = std::sqrt(std::min(1.f, std::abs((float)tauLifetimeInfo.dxy())));
mvaInput_[16] = std::min(10.f, std::abs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[17] = std::copysign(+1.f, (float)tauLifetimeInfo.ip3d());
mvaInput_[18] = std::sqrt(std::fabs(std::min(1.f, std::fabs((float)tauLifetimeInfo.ip3d()))));
mvaInput_[19] = std::min(10.f, std::fabs((float)tauLifetimeInfo.ip3d_Sig()));
mvaInput_[18] = std::sqrt(std::min(1.f, std::abs((float)tauLifetimeInfo.ip3d())));
mvaInput_[19] = std::min(10.f, std::abs((float)tauLifetimeInfo.ip3d_Sig()));
mvaInput_[20] = ( tauLifetimeInfo.hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[21] = std::sqrt(decayDistMag);
mvaInput_[22] = std::min(10.f, (float)tauLifetimeInfo.flightLengthSig());
} else if ( mvaOpt_ == kPWoldDMwLT || mvaOpt_ == kPWnewDMwLT ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, footprintCorrection));
Expand All @@ -298,17 +302,17 @@ double PFRecoTauDiscriminationByMVAIsolationRun2::discriminate(const PFTauRef& t
mvaInput_[12] = std::min(100.f, leadingTrackChi2);
mvaInput_[13] = std::min(1.f, eRatio);
mvaInput_[14] = std::copysign(+1.f, (float)tauLifetimeInfo.dxy());
mvaInput_[15] = std::sqrt(std::fabs(std::min(1.f, std::fabs((float)tauLifetimeInfo.dxy()))));
mvaInput_[16] = std::min(10.f, std::fabs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[15] = std::sqrt(std::min(1.f, std::abs((float)tauLifetimeInfo.dxy())));
mvaInput_[16] = std::min(10.f, std::abs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[17] = std::copysign(+1.f, (float)tauLifetimeInfo.ip3d());
mvaInput_[18] = std::sqrt(std::fabs(std::min(1.f, std::fabs((float)tauLifetimeInfo.ip3d()))));
mvaInput_[19] = std::min(10.f, std::fabs((float)tauLifetimeInfo.ip3d_Sig()));
mvaInput_[18] = std::sqrt(std::min(1.f, std::abs((float)tauLifetimeInfo.ip3d())));
mvaInput_[19] = std::min(10.f, std::abs((float)tauLifetimeInfo.ip3d_Sig()));
mvaInput_[20] = ( tauLifetimeInfo.hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[21] = std::sqrt(decayDistMag);
mvaInput_[22] = std::min(10.f, (float)tauLifetimeInfo.flightLengthSig());
} else if ( mvaOpt_ == kDBoldDMwLTwGJ || mvaOpt_ == kDBnewDMwLTwGJ ) {
mvaInput_[0] = std::log(std::max(1.f, (float)tau->pt()));
mvaInput_[1] = std::fabs((float)tau->eta());
mvaInput_[1] = std::abs((float)tau->eta());
mvaInput_[2] = std::log(std::max(1.e-2f, chargedIsoPtSum));
mvaInput_[3] = std::log(std::max(1.e-2f, neutralIsoPtSum));
mvaInput_[4] = std::log(std::max(1.e-2f, puCorrPtSum));
Expand All @@ -321,11 +325,11 @@ double PFRecoTauDiscriminationByMVAIsolationRun2::discriminate(const PFTauRef& t
mvaInput_[11] = std::min(0.5f, ptWeightedDrIsolation);
mvaInput_[12] = std::min(1.f, eRatio);
mvaInput_[13] = std::copysign(+1.f, (float)tauLifetimeInfo.dxy());
mvaInput_[14] = std::sqrt(std::fabs(std::min(1.f, std::fabs((float)tauLifetimeInfo.dxy()))));
mvaInput_[15] = std::min(10.f, std::fabs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[14] = std::sqrt(std::min(1.f, std::abs((float)tauLifetimeInfo.dxy())));
mvaInput_[15] = std::min(10.f, std::abs((float)tauLifetimeInfo.dxy_Sig()));
mvaInput_[16] = std::copysign(+1.f, (float)tauLifetimeInfo.ip3d());
mvaInput_[17] = std::sqrt(std::fabs(std::min(1.f, std::fabs((float)tauLifetimeInfo.ip3d()))));
mvaInput_[18] = std::min(10.f, std::fabs((float)tauLifetimeInfo.ip3d_Sig()));
mvaInput_[17] = std::sqrt(std::min(1.f, std::abs((float)tauLifetimeInfo.ip3d())));
mvaInput_[18] = std::min(10.f, std::abs((float)tauLifetimeInfo.ip3d_Sig()));
mvaInput_[19] = ( tauLifetimeInfo.hasSecondaryVertex() ) ? 1. : 0.;
mvaInput_[20] = std::sqrt(decayDistMag);
mvaInput_[21] = std::min(10.f, (float)tauLifetimeInfo.flightLengthSig());
Expand Down

0 comments on commit 5be50cb

Please sign in to comment.