diff --git a/Jet/plugins/CSVInputTagPlugin.cc b/Jet/plugins/CSVInputTagPlugin.cc index 7e18192..635d32c 100644 --- a/Jet/plugins/CSVInputTagPlugin.cc +++ b/Jet/plugins/CSVInputTagPlugin.cc @@ -74,14 +74,11 @@ class CSVInputTagDataPlugin: //http://cmslxr.fnal.gov/source/DataFormats/BTauReco/interface/TaggingVariable.h?v=CMSSW_9_4_0_pre1#0033 float trackSumJetEtRatio = vars.get(reco::btau::trackSumJetEtRatio, -1); - if (trackSumJetEtRatio>0) trackSumJetEtRatio = 0.1/(0.1+trackSumJetEtRatio); jetTagData.trackSumJetEtRatio = trackSumJetEtRatio; float trackSumJetDeltaR = vars.get(reco::btau::trackSumJetDeltaR, -1); - if (trackSumJetDeltaR>0) trackSumJetDeltaR = 0.1/(0.1+trackSumJetDeltaR); jetTagData.trackSumJetDeltaR = trackSumJetDeltaR; - - + jetTagData.vertexCategory = vars.get(reco::btau::vertexCategory, -1); jetTagData.jetNSelectedTracks = vars.get(reco::btau::jetNSelectedTracks, -1); jetTagData.jetNTracksEtaRel = vars.get(reco::btau::jetNTracksEtaRel, -1); diff --git a/Jet/plugins/ChargedPFTagPlugin.cc b/Jet/plugins/ChargedPFTagPlugin.cc index b522111..dd36f4b 100644 --- a/Jet/plugins/ChargedPFTagPlugin.cc +++ b/Jet/plugins/ChargedPFTagPlugin.cc @@ -77,7 +77,6 @@ class ChargedPFTagDataPlugin: { const pat::Jet& jet = jetCollection->at(ijet); const float jet_pt_uncorr = jet.correctedJet("Uncorrected").pt(); - //const float jet_e_uncorr = jet.correctedJet("Uncorrected").energy(); std::vector cpfData; for (unsigned int idaughter = 0; idaughter < jet.numberOfDaughters(); ++idaughter) diff --git a/Jet/plugins/JetOriginTagPlugin.cc b/Jet/plugins/JetOriginTagPlugin.cc index 1493af3..2b10002 100644 --- a/Jet/plugins/JetOriginTagPlugin.cc +++ b/Jet/plugins/JetOriginTagPlugin.cc @@ -120,7 +120,7 @@ class JetOriginTagDataPlugin: { mother = mother->mother(); } - //find gluon anchestor + //find gluon ancestor if (mother->mother() and mother->mother()->pdgId()==21) { nGluons+=1; diff --git a/Jet/plugins/NeutralPFTagPlugin.cc b/Jet/plugins/NeutralPFTagPlugin.cc index ac4b154..8d378ca 100644 --- a/Jet/plugins/NeutralPFTagPlugin.cc +++ b/Jet/plugins/NeutralPFTagPlugin.cc @@ -63,7 +63,6 @@ class NeutralPFTagDataPlugin: { const pat::Jet& jet = jetCollection->at(ijet); const float jet_pt_uncorr = jet.correctedJet("Uncorrected").pt(); - //const float jet_e_uncorr = jet.correctedJet("Uncorrected").energy(); std::vector npfData; for (unsigned int idaughter = 0; idaughter < jet.numberOfDaughters(); ++idaughter) @@ -89,7 +88,7 @@ class NeutralPFTagDataPlugin: data.drminsv = std::min(data.drminsv,dR); } - if (jet.mass()<1e-10) data.jetmassdroprel = 0; + if (jet.mass()<1e-10) data.jetmassdroprel = -9; else data.jetmassdroprel = (jet.p4()- constituent->p4()).mass()/jet.mass(); diff --git a/LLPSpecific/test/produce_80X_NANOX.py b/LLPSpecific/test/produce_80X_NANOX.py index ecbb359..3791c9b 100644 --- a/LLPSpecific/test/produce_80X_NANOX.py +++ b/LLPSpecific/test/produce_80X_NANOX.py @@ -271,7 +271,7 @@ def addFilter(seq,inputTag,cutString,minN=None): #'softPFElectronBJetTags', #'pfJetBProbabilityBJetTags', #'pfJetProbabilityBJetTags', - 'pfCombinedInclusiveSecondaryVertexV2BJetTags', + 'pfCombinedSecondaryVertexV2BJetTags', 'pfDeepCSVJetTags:probudsg', #to be fixed with new names 'pfDeepCSVJetTags:probb', 'pfDeepCSVJetTags:probc',