implemented PR cms-sw#17247 comments

mverzett · Mar 3, 2017 · dcda37d · dcda37d
1 parent 75454be
commit dcda37d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 20 deletions.
diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml
@@ -72,8 +72,7 @@
   <class name="edm::Wrapper<reco::BoostedDoubleSVTagInfoCollection>"/>
 
   <class name="reco::ShallowTagInfo" ClassVersion="4">
-		<version ClassVersion="3" checksum="3123030258"/>
-		<version ClassVersion="4" checksum="3904302444"/>
+		<version ClassVersion="3" checksum="3904302444"/>
   </class>
   <class name="reco::ShallowTagInfoCollection"/>
   <class name="reco::ShallowTagInfoRef"/>

diff --git a/PhysicsTools/PatAlgos/plugins/PATJetProducer.cc b/PhysicsTools/PatAlgos/plugins/PATJetProducer.cc
@@ -35,7 +35,6 @@
 #include <vector>
 #include <memory>
 #include <algorithm>
-#include <sstream>
 
 using namespace pat;
 
@@ -101,9 +100,7 @@ PATJetProducer::PATJetProducer(const edm::ParameterSet& iConfig)  :
             label.erase(pos+7); // trim a tail after "JetTags"
         }
         if(it->instance().size()) {
-            std::stringstream name;
-            name << label << ":" << it->instance();
-            label = name.str();
+            label = (label+string(":")+it->instance()); 
         }
         discriminatorLabels_.push_back(label);
     }

diff --git a/PhysicsTools/PatAlgos/plugins/PATJetUpdater.cc b/PhysicsTools/PatAlgos/plugins/PATJetUpdater.cc
@@ -20,7 +20,6 @@
 #include <vector>
 #include <memory>
 #include <algorithm>
-#include <sstream>
 
 using namespace pat;
 
@@ -52,9 +51,7 @@ PATJetUpdater::PATJetUpdater(const edm::ParameterSet& iConfig) :
             label.erase(pos+7); // trim a tail after "JetTags"
         }
         if(it->instance().size()) {
-            std::stringstream name;
-            name << label << ":" << it->instance();
-            label = name.str();
+            label = (label+string(":")+it->instance());
         }
         discriminatorLabels_.push_back(label);
     }

diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py
@@ -49,6 +49,8 @@
         # CTagging
         cms.InputTag('pfCombinedCvsLJetTags'),
         cms.InputTag('pfCombinedCvsBJetTags'),
+        # The following code is commented-out to avoid breaking any unit test
+        # waiting for a set of AOD RelVals which have the jet tags in the event content 
         # DeepFlavour
         # cms.InputTag('pfDeepCSVJetTags:probb'),
         # cms.InputTag('pfDeepCSVJetTags:probc'),

diff --git a/RecoBTag/Combined/plugins/DeepCMVATagInfoProducer.cc b/RecoBTag/Combined/plugins/DeepCMVATagInfoProducer.cc
@@ -44,7 +44,7 @@
 #include "RecoBTau/JetTagComputer/interface/JetTagComputerRecord.h"
 #include "DataFormats/BTauReco/interface/JetTag.h"
 
-#include <math.h>
+#include <cmath>
 #include <map>
 
 using namespace reco;
@@ -131,7 +131,6 @@ DeepCMVATagInfoProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSet
 	// get other Taginfos
 	edm::Handle< edm::View<BaseTagInfo> > ipInfos;
 	iEvent.getByToken(ipInfoSrc_, ipInfos);
-	std::vector<const BaseTagInfo*> ipBaseInfo;
 	edm::Handle< edm::View<BaseTagInfo> > muInfos;
 	iEvent.getByToken(muInfoSrc_, muInfos);
 	edm::Handle< edm::View<BaseTagInfo> > elInfos;

diff --git a/RecoBTag/Combined/python/deepFlavour_cff.py b/RecoBTag/Combined/python/deepFlavour_cff.py
@@ -1,7 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from RecoBTag.Combined.DeepNNTagInfoProducer_cfi import pfDeepCSVTagInfos
+from RecoBTag.Combined.pfDeepCSVTagInfos_cfi import pfDeepCSVTagInfos
 from RecoBTag.Combined.DeepCMVATagInfoProducer_cfi import pfDeepCMVATagInfos
-from RecoBTag.Combined.DeepFlavourJetTagsProducer_cfi import pfDeepCSVJetTags, pfDeepCMVAJetTags
+from RecoBTag.Combined.pfDeepCSVJetTags_cfi import pfDeepCSVJetTags 
+from RecoBTag.Combined.pfDeepCMVAJetTags_cfi import pfDeepCMVAJetTags
 
 ##
 ## Negative and positive taggers for light SF estimation

diff --git a/.../python/DeepFlavourJetTagsProducer_cfi.py → .../Combined/python/pfDeepCMVAJetTags_cfi.py b/.../python/DeepFlavourJetTagsProducer_cfi.py → .../Combined/python/pfDeepCMVAJetTags_cfi.py
@@ -1,10 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-
-pfDeepCSVJetTags = cms.EDProducer(
-	'DeepFlavourJetTagsProducer',
-	src = cms.InputTag('pfDeepCSVTagInfos'),
-	NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepFlavourNoSL.json')
-	)
 
 pfDeepCMVAJetTags = cms.EDProducer(
 	'DeepFlavourJetTagsProducer',

diff --git a/RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py b/RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+pfDeepCSVJetTags = cms.EDProducer(
+	'DeepFlavourJetTagsProducer',
+	src = cms.InputTag('pfDeepCSVTagInfos'),
+	NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepFlavourNoSL.json')
+	)
diff --git a/...bined/python/DeepNNTagInfoProducer_cfi.py → .../Combined/python/pfDeepCSVTagInfos_cfi.py b/...bined/python/DeepNNTagInfoProducer_cfi.py → .../Combined/python/pfDeepCSVTagInfos_cfi.py