diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx b/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx
index 952a1e210fb542499191f6bf365782d6876a2300..c40a918a1eda52c0d4701527155c81349268dcf0 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx
@@ -33,8 +33,8 @@ void GeneralTauPlots::fill(const xAOD::TauJet& tau) {
m_oParamPlots.fill(tau);
m_tauCharge->Fill(tau.charge(), 1.);
m_tauNCoreTracks->Fill(tau.nTracks(), 1.);
- m_tauNWideTracks->Fill(tau.nWideTracks(), 1.);
- if( tau.hasDiscriminant(xAOD::TauJetParameters::BDTJetScore) )m_id_BDTJetScore->Fill(tau.discriminant(xAOD::TauJetParameters::BDTJetScore));
+ // m_tauNWideTracks->Fill(tau.nWideTracks(), 1.);
+ m_tauNWideTracks->Fill(tau.nTracks(xAOD::TauJetParameters::classifiedIsolation), 1.); //
if( tau.hasDiscriminant(xAOD::TauJetParameters::BDTJetScore) )m_id_BDTJetScore->Fill(tau.discriminant(xAOD::TauJetParameters::BDTJetScore));
if(tau.isTau(xAOD::TauJetParameters::JetBDTSigLoose)) m_pt_jetBDTloose->Fill( tau.pt()/1000,1);
if(tau.isTau(xAOD::TauJetParameters::JetBDTSigMedium)) m_pt_jetBDTmed ->Fill( tau.pt()/1000,1);
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx b/PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx
index 2eedf8625ad427b5ec76dd68d434c0bd9701f80f..707d5d0862a1ed779ea4f7a9de51990a8f97719a 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx
+++ b/PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx
@@ -23,7 +23,7 @@ void NewCorePlots::initializePlots(){
m_massTrkSys = Book1D("massTrkSys",m_sTauJetContainerName + "Tau massTrkSys ;massTrkSys ;# of Taus", 20, 0, 2500 );
m_trkWidth2 = Book1D("trkWidth2",m_sTauJetContainerName + "Tau trkWidth2 ;trkWidth2 ;# of Taus", 20, 0, 1.0 );
m_trFlightPathSig = Book1D("trFlightPathSig",m_sTauJetContainerName + "Tau trFlightPathSig ;trFlightPathSig ;# of Taus", 100, -10, 20 );
- m_nPi0 = Book1D("NPio",m_sTauJetContainerName + "Tau NPio ;NPi0 ;# of Taus", 10, 0, 15 );
+ // m_nPi0 = Book1D("NPio",m_sTauJetContainerName + "Tau NPio ;NPi0 ;# of Taus", 10, 0, 15 );
m_EMRadius = Book1D("Seed_Calo_EMRadius",m_sTauJetContainerName + "Tau Seed Calo EMRadius ;EMRadius ;# of Taus", 10, -0.5,1 );
m_hadRadius = Book1D("Seed_Calo_hadRadius",m_sTauJetContainerName + "Tau Seed Calo hadRadius ;hadRadius ;# of Taus", 10, -0.5,2 );
m_isolFrac = Book1D("Seed_Calo_isolFrac",m_sTauJetContainerName + "Tau Seed Calo isolFrac ;isolFrac ;# of Taus", 40, -0.0,2 );
@@ -37,9 +37,9 @@ void NewCorePlots::initializePlots(){
m_caloIsoCorrected = Book1D("Seed_Calo_caloIsoCorrected",m_sTauJetContainerName + "Tau Seed Calo caloIsoCorrected ;caloIsoCorrected ;# of Taus", 15, 0, 200 );
m_tauDRMax = Book1D("DRMax",m_sTauJetContainerName + " Tau DR Max track-seed; DRMax; # Taus",10,0.,0.5);
m_tauSflight = Book1D("Sflight",m_sTauJetContainerName + " Tau flight sign. ; Sflight; # Taus",100,-10.,20.);
- m_mEflowTopo = Book1D("mEflowTopo",m_sTauJetContainerName + "Tau mEflowTopo; mEflowTopo; #Taus",30,0,300);
- m_ptRatioEflowTopo = Book1D("ptRatioEflowTopo",m_sTauJetContainerName + "Tau ptRatioEflowTopo; ptRatioEflowTopo; # of Taus", 10, 0, 10);
- m_nPi0Topo = Book1D("nPi0Topo",m_sTauJetContainerName + "Tau nPi0Topo; nPi0Topo; # of Taus", 100, -1, 1);
+ // m_mEflowTopo = Book1D("mEflowTopo",m_sTauJetContainerName + "Tau mEflowTopo; mEflowTopo; #Taus",30,0,300);
+ // m_ptRatioEflowTopo = Book1D("ptRatioEflowTopo",m_sTauJetContainerName + "Tau ptRatioEflowTopo; ptRatioEflowTopo; # of Taus", 10, 0, 10);
+ // m_nPi0Topo = Book1D("nPi0Topo",m_sTauJetContainerName + "Tau nPi0Topo; nPi0Topo; # of Taus", 100, -1, 1);
m_PSSFraction = Book1D("PSSFraction",m_sTauJetContainerName + "Tau PSSFraction; PSSFraction; # of Taus", 30, -15, 15);
m_ChPiEMEOverCaloEME = Book1D("ChPiEMEOverCaloEME",m_sTauJetContainerName + "Tau ChPiEMEOverCaloEME; ChPiEMEOverCaloEME; # of Taus", 30, -15, 15);
m_EMPOverTrkSysP = Book1D("EMPOverTrkSysP",m_sTauJetContainerName + "Tau EMPOverTrkSysP; EMPOverTrkSysP; # of Taus", 81, -1, 80);
@@ -84,8 +84,8 @@ void NewCorePlots::fill(const xAOD::TauJet& tau) {
// test=tau.detail(xAOD::TauJetParameters::mEflow, avariable);
// if(test) m_mEflow->Fill(avariable,1.);
- test=tau.detail(xAOD::TauJetParameters::nPi0, bvariable);
- if(test) m_nPi0->Fill(bvariable,1.);
+ // test=tau.detail(xAOD::TauJetParameters::nPi0, bvariable);
+ // if(test) m_nPi0->Fill(bvariable,1.);
test=tau.detail(xAOD::TauJetParameters::EMRadius, avariable);
if(test) m_EMRadius->Fill(avariable,1.);
@@ -120,14 +120,14 @@ void NewCorePlots::fill(const xAOD::TauJet& tau) {
test=tau.detail(xAOD::TauJetParameters::caloIsoCorrected, avariable);
if(test) m_caloIsoCorrected->Fill(avariable,1.);
- test=tau.detail(xAOD::TauJetParameters::mEflowTopo, avariable);
- if(test) m_mEflowTopo ->Fill(avariable/1000,1.);
+ // test=tau.detail(xAOD::TauJetParameters::mEflowTopo, avariable);
+ // if(test) m_mEflowTopo ->Fill(avariable/1000,1.);
- test=tau.detail(xAOD::TauJetParameters::ptRatioEflowTopo, avariable);
- if(test) m_ptRatioEflowTopo->Fill(avariable,1.);
+ // test=tau.detail(xAOD::TauJetParameters::ptRatioEflowTopo, avariable);
+ // if(test) m_ptRatioEflowTopo->Fill(avariable,1.);
- test=tau.detail(xAOD::TauJetParameters::nPi0Topo, bvariable);
- if(test) m_nPi0Topo->Fill(bvariable,1.);
+ // test=tau.detail(xAOD::TauJetParameters::nPi0Topo, bvariable);
+ // if(test) m_nPi0Topo->Fill(bvariable,1.);
test=tau.detail(xAOD::TauJetParameters::PSSFraction, avariable);
if(test) m_PSSFraction->Fill(avariable,1.);
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx b/PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx
index 7769881e560b63f8f84c928513ff830236688b96..dc94b49dbc178c81f8e3cb1e28adc742012ff013 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx
@@ -163,64 +163,64 @@ namespace Tau{
int panTauIntiger = 0;
float panTauFloat = 0;
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_isPanTauCandidate,panTauIntiger);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_isPanTauCandidate,panTauIntiger);
m_pantau_CellBasedInput_isPanTauCandidate->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_DecayMode,panTauIntiger);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_DecayMode,panTauIntiger);
m_pantau_CellBasedInput_DecayMode->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTValue_1p0n_vs_1p1n,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTValue_1p0n_vs_1p1n,panTauFloat);
m_pantau_CellBasedInput_BDTValue_1p0n_vs_1p1n->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTValue_1p1n_vs_1pXn,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTValue_1p1n_vs_1pXn,panTauFloat);
m_pantau_CellBasedInput_BDTValue_1p1n_vs_1pXn->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTValue_3p0n_vs_3pXn,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTValue_3p0n_vs_3pXn,panTauFloat);
m_pantau_CellBasedInput_BDTValue_3p0n_vs_3pXn->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Basic_NNeutralConsts,panTauIntiger);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Basic_NNeutralConsts,panTauIntiger);
m_pantau_CellBasedInput_BDTVar_Basic_NNeutralConsts->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Charged_JetMoment_EtDRxTotalEt,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Charged_JetMoment_EtDRxTotalEt,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Charged_JetMoment_EtDRxTotalEt->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Charged_StdDev_Et_WrtEtAllConsts,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Charged_StdDev_Et_WrtEtAllConsts,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Charged_StdDev_Et_WrtEtAllConsts->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Neutral_HLV_SumM,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Neutral_HLV_SumM,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Neutral_HLV_SumM->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Neutral_PID_BDTValues_BDTSort_1,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Neutral_PID_BDTValues_BDTSort_1,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Neutral_PID_BDTValues_BDTSort_1->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Neutral_PID_BDTValues_BDTSort_2,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Neutral_PID_BDTValues_BDTSort_2,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Neutral_PID_BDTValues_BDTSort_2->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Neutral_Ratio_1stBDTEtOverEtAllConsts,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Neutral_Ratio_1stBDTEtOverEtAllConsts,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Neutral_Ratio_1stBDTEtOverEtAllConsts->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Neutral_Ratio_EtOverEtAllConsts,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Neutral_Shots_NPhotonsInSeed,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Neutral_Shots_NPhotonsInSeed,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Neutral_Shots_NPhotonsInSeed->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_CellBasedInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged,panTauFloat);
+ thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::PanTau_BDTVar_Combined_DeltaR1stNeutralTo1stCharged,panTauFloat);
m_pantau_CellBasedInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_isPanTauCandidate,panTauIntiger);
- m_pantau_eflowRecInput_isPanTauCandidate->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_DecayMode,panTauIntiger);
- m_pantau_eflowRecInput_DecayMode->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTValue_1p0n_vs_1p1n,panTauFloat);
- m_pantau_eflowRecInput_BDTValue_1p0n_vs_1p1n->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTValue_1p1n_vs_1pXn,panTauFloat);
- m_pantau_eflowRecInput_BDTValue_1p1n_vs_1pXn->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTValue_3p0n_vs_3pXn,panTauFloat);
- m_pantau_eflowRecInput_BDTValue_3p0n_vs_3pXn->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Basic_NPi0NeutConsts,panTauIntiger);
- m_pantau_eflowRecInput_BDTVar_Basic_NPi0NeutConsts->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Basic_NNeutralConsts,panTauIntiger);
- m_pantau_eflowRecInput_BDTVar_Basic_NNeutralConsts->Fill(panTauIntiger);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Charged_Ratio_EtOverEtAllConsts,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Charged_Ratio_EtOverEtAllConsts->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_HLV_SumM,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Neutral_HLV_SumM->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_EtSort_1,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_EtSort_1->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_BDTSort_2,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_BDTSort_2->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_Mean_DRToLeading_WrtEtAllConsts,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Neutral_Mean_DRToLeading_WrtEtAllConsts->Fill(panTauFloat);
- thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged,panTauFloat);
- m_pantau_eflowRecInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_isPanTauCandidate,panTauIntiger);
+ // m_pantau_eflowRecInput_isPanTauCandidate->Fill(panTauIntiger);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_DecayMode,panTauIntiger);
+ // m_pantau_eflowRecInput_DecayMode->Fill(panTauIntiger);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTValue_1p0n_vs_1p1n,panTauFloat);
+ // m_pantau_eflowRecInput_BDTValue_1p0n_vs_1p1n->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTValue_1p1n_vs_1pXn,panTauFloat);
+ // m_pantau_eflowRecInput_BDTValue_1p1n_vs_1pXn->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTValue_3p0n_vs_3pXn,panTauFloat);
+ // m_pantau_eflowRecInput_BDTValue_3p0n_vs_3pXn->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Basic_NPi0NeutConsts,panTauIntiger);
+ // m_pantau_eflowRecInput_BDTVar_Basic_NPi0NeutConsts->Fill(panTauIntiger);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Basic_NNeutralConsts,panTauIntiger);
+ // m_pantau_eflowRecInput_BDTVar_Basic_NNeutralConsts->Fill(panTauIntiger);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Charged_Ratio_EtOverEtAllConsts,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Charged_Ratio_EtOverEtAllConsts->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_HLV_SumM,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Neutral_HLV_SumM->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_EtSort_1,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_EtSort_1->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_BDTSort_2,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Neutral_PID_BDTValues_BDTSort_2->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Neutral_Mean_DRToLeading_WrtEtAllConsts,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Neutral_Mean_DRToLeading_WrtEtAllConsts->Fill(panTauFloat);
+ // thisTau.panTauDetail( xAOD::TauJetParameters::PanTauDetails::pantau_eflowRecInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged,panTauFloat);
+ // m_pantau_eflowRecInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged->Fill(panTauFloat);
m_oParamPlots.fill(thisTau);