KappaAnalysis · rfriese · Aug 1, 2017 · Jul 13, 2017 · Jul 13, 2017 · Jul 13, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ language: cpp
 services:
   - docker
 env:
-  - TEST_CMSSW_VERSION=CMSSW_9_2_4 SCRAM_ARCH=slc6_amd64_gcc530 KAPPA_BRANCH=dictchanges CHECKOUTSCRIPT=checkoutCmssw92xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=false
-  - TEST_CMSSW_VERSION=CMSSW_8_0_26_patch1 SCRAM_ARCH=slc6_amd64_gcc530 KAPPA_BRANCH=dictchanges CHECKOUTSCRIPT=checkoutCmssw80xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=false
-  - TEST_CMSSW_VERSION=CMSSW_7_6_3 SCRAM_ARCH=slc6_amd64_gcc493 KAPPA_BRANCH=dictchanges CHECKOUTSCRIPT=checkoutCmssw76xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=true
+  - TEST_CMSSW_VERSION=CMSSW_9_2_4 SCRAM_ARCH=slc6_amd64_gcc530 KAPPA_BRANCH=${TRAVIS_BRANCH} CHECKOUTSCRIPT=checkoutCmssw92xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=false
+  - TEST_CMSSW_VERSION=CMSSW_8_0_26_patch1 SCRAM_ARCH=slc6_amd64_gcc530 KAPPA_BRANCH=${TRAVIS_BRANCH} CHECKOUTSCRIPT=checkoutCmssw80xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=false
+  - TEST_CMSSW_VERSION=CMSSW_7_6_3 SCRAM_ARCH=slc6_amd64_gcc493 KAPPA_BRANCH=${TRAVIS_BRANCH} CHECKOUTSCRIPT=checkoutCmssw76xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=true
   #- TEST_CMSSW_VERSION=CMSSW_5_3_29 SCRAM_ARCH=slc6_amd64_gcc472 CHECKOUTSCRIPT=checkoutCmssw76xPackagesForSkimming.sh SKIMMING_SCRIPT=Kappa/Skimming/higgsTauTau/kSkimming_run2_cfg.py ADDITIONAL_OUTPUT=false
   # skim_tutorial1_basic.py - checkoutDummy.sh and checkoutTauRefit.py are not available
   #- CHECKOUTSCRIPT=checkoutTauRefit.py SKIMMING_SCRIPT=Kappa/Skimming/examples/skim_tutorial1_basic.py ADDITIONAL_OUTPUT=false

diff --git a/DataFormats/interface/KDebug.h b/DataFormats/interface/KDebug.h
@@ -48,7 +48,7 @@ std::ostream &operator<<(std::ostream &os, const KMuon &mu);
 std::ostream &operator<<(std::ostream &os, const KMuonTriggerCandidate &cand);
 std::ostream &operator<<(std::ostream &os, const KProvenance &p);
 std::ostream &operator<<(std::ostream &os, const KLumiInfo &info);
-std::ostream &operator<<(std::ostream &os, const KGenLumiInfo &info);
+std::ostream &operator<<(std::ostream &os, const KGenRunInfo &info);
 std::ostream &operator<<(std::ostream &os, const KDataLumiInfo &info);
 std::ostream &operator<<(std::ostream &os, const KEventInfo &i);
 std::ostream &operator<<(std::ostream &os, const KTauMetadata &m);

diff --git a/DataFormats/interface/KInfo.h b/DataFormats/interface/KInfo.h
@@ -41,9 +41,9 @@ struct KLumiInfo
 };
 
 
-struct KGenLumiInfo : public KLumiInfo
+struct KGenRunInfo
 {
-	virtual ~KGenLumiInfo() {};
+	virtual ~KGenRunInfo() {};
 
 	double filterEff;              //< generator filter efficiency
 	double xSectionExt;            //< external process cross section

diff --git a/DataFormats/interface/KJetMET.h b/DataFormats/interface/KJetMET.h
@@ -227,9 +227,7 @@ struct KHCALNoiseSummary
 struct KPileupDensity
 {
 	virtual ~KPileupDensity() {};
-
 	double rho;
-	double sigma;
 };
 
 #endif
diff --git a/DataFormats/interface/Kappa.h b/DataFormats/interface/Kappa.h
@@ -104,7 +104,7 @@ REGISTER_NAME_OF_TYPE(KHCALNoiseSummary,KHCALNoiseSummary);
 REGISTER_NAME_OF_TYPE(KTrackSummary,KTrackSummary);
 REGISTER_NAME_OF_TYPE(KVertexSummary,KVertexSummary);
 REGISTER_NAME_OF_TYPE(KLumiInfo,KLumiInfo);
-REGISTER_NAME_OF_TYPE(KGenLumiInfo,KGenLumiInfo);
+REGISTER_NAME_OF_TYPE(KGenRunInfo,KGenRunInfo);
 REGISTER_NAME_OF_TYPE(KDataLumiInfo,KDataLumiInfo);
 REGISTER_NAME_OF_TYPE(KElectronMetadata,KElectronMetadata);
 REGISTER_NAME_OF_TYPE(KFilterMetadata,KFilterMetadata);

diff --git a/DataFormats/src/KDebug.cpp b/DataFormats/src/KDebug.cpp
@@ -36,7 +36,6 @@ std::ostream &operator<<(std::ostream &os, const KBeamSpot &bs)
 {
 	os << bs.position << " beta*=" << bs.betaStar;
 	os << " beamWidth=(" << bs.beamWidthX << ", " << bs.beamWidthY << ")";
-	os << " dx/dz=" << bs.dxdz << " dy/dz=" << bs.dydz << " sigmaZ=" << bs.sigmaZ;
 	return os;
 }
 
@@ -264,7 +263,7 @@ std::ostream &operator<<(std::ostream &os, const KTriggerObjects &to)
 
 std::ostream &operator<<(std::ostream &os, const KPileupDensity &pu)
 {
-	return os << "rho=" << pu.rho << " sigma=" << pu.sigma;
+	return os << "rho=" << pu.rho;
 }
 
 std::ostream &operator<<(std::ostream &os, const KHit &hit)
@@ -358,9 +357,8 @@ std::ostream &operator<<(std::ostream &os, const KLumiInfo &info)
 	return os;
 }
 
-std::ostream &operator<<(std::ostream &os, const KGenLumiInfo &info)
+std::ostream &operator<<(std::ostream &os, const KGenRunInfo &info)
 {
-	os << static_cast<const KLumiInfo>(info) << std::endl;
 	os << "\txSec(ext)=" << info.xSectionExt << " xSec(int)=" << info.xSectionInt;
 	os << " filterEff=" << info.filterEff;
 	return os;

diff --git a/DataFormats/src/classes.h b/DataFormats/src/classes.h
@@ -104,7 +104,7 @@ namespace
 		KTrackSummary dict_KTrackSummary;
 		KVertexSummary dict_KVertexSummary;
 		KLumiInfo dict_KLumiInfo;
-		KGenLumiInfo dict_KGenLumiInfo;
+		KGenRunInfo dict_KGenRunInfo;
 		KDataLumiInfo dict_KDataLumiInfo;
 		KElectronMetadata dict_KElectronMetadata;
 		KFilterMetadata dict_KFilterMetadata;

diff --git a/DataFormats/src/classes.md b/DataFormats/src/classes.md
@@ -74,7 +74,7 @@ These classes should be filled once per lumi section.
 
 ### Lumi section info
 + KLumiInfo
-+ KGenLumiInfo
++ KGenRunInfo
 + KDataLumiInfo
 
 ### Object metadata

diff --git a/DataFormats/src/classes_def.xml b/DataFormats/src/classes_def.xml
@@ -70,7 +70,7 @@
 	<class name="KTrackSummary"/>
 	<class name="KVertexSummary"/>
 	<class name="KLumiInfo"/>
-	<class name="KGenLumiInfo"/>
+	<class name="KGenRunInfo"/>
 	<class name="KDataLumiInfo"/>
 	<class name="KElectronMetadata"/>
 	<class name="KFilterMetadata"/>

diff --git a/DataFormats/test/testDebug.cc b/DataFormats/test/testDebug.cc
@@ -52,7 +52,7 @@ int main() {
 	cout << "* KTrackSummary: " << KTrackSummary() << endl << endl;
 	cout << "* KVertexSummary: " << KVertexSummary() << endl << endl;
 	cout << "* KLumiInfo: " << KLumiInfo() << endl << endl;
-	cout << "* KGenLumiInfo: " << KGenLumiInfo() << endl << endl;
+	cout << "* KGenRunInfo: " << KGenRunInfo() << endl << endl;
 	cout << "* KDataLumiInfo: " << KDataLumiInfo() << endl << endl;
 	cout << "* KElectronMetadata: " << KElectronMetadata() << endl << endl;
 	cout << "* KFilterMetadata: " << KFilterMetadata() << endl << endl;

diff --git a/Producers/interface/KBaseMatchingProducer.h b/Producers/interface/KBaseMatchingProducer.h
@@ -17,8 +17,8 @@ template<typename Tout>
 class KBaseMatchingProducer : public KBaseProducerWP
 {
 public:
-	KBaseMatchingProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
-		KBaseProducerWP(cfg, _event_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
+	KBaseMatchingProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
+		KBaseProducerWP(cfg, _event_tree, _lumi_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
 		event_tree(_event_tree), matchingCounter(0), producerLabel(producerName),
 		viManual(cfg.getParameter<std::vector<edm::InputTag> >("manual")),
 

diff --git a/Producers/interface/KBaseMultiLVProducer.h b/Producers/interface/KBaseMultiLVProducer.h
@@ -30,8 +30,8 @@ class KBaseMultiVectorProducer : public KBaseMultiProducer<Tin, Tout>
 	typedef typename KBaseMultiProducer<Tin, Tout>::InputType::value_type SingleInputType;
 	typedef typename KBaseMultiProducer<Tin, Tout>::OutputType::value_type SingleOutputType;
 public:
-	KBaseMultiVectorProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
-		KBaseMultiProducer<Tin, Tout>(cfg, _event_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
+	KBaseMultiVectorProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
+		KBaseMultiProducer<Tin, Tout>(cfg, _event_tree, _lumi_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
 		maxN(cfg.getParameter<int>("maxN")),
 		firstObject(true) {}
 
@@ -87,8 +87,8 @@ template<typename Tin, typename Tout>
 class KBaseMultiLVProducer : public KBaseMultiVectorProducer<Tin, Tout>
 {
 public:
-	KBaseMultiLVProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
-		KBaseMultiVectorProducer<Tin, Tout>(cfg, _event_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
+	KBaseMultiLVProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
+		KBaseMultiVectorProducer<Tin, Tout>(cfg, _event_tree, _lumi_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
 		minPt(cfg.getParameter<double>("minPt")),
 		maxEta(cfg.getParameter<double>("maxEta")) {}
 

diff --git a/Producers/interface/KBaseMultiProducer.h b/Producers/interface/KBaseMultiProducer.h
@@ -17,39 +17,34 @@ template<typename Tin, typename Tout>
 class KBaseMultiProducer : public KBaseMatchingProducer<Tout>
 {
 public:
-	KBaseMultiProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector, bool _justOutputName = false) :
-		KBaseMatchingProducer<Tout>(cfg, _event_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
+	KBaseMultiProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector, bool _justOutputName = false) :
+		KBaseMatchingProducer<Tout>(cfg, _event_tree, _lumi_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
 		event_tree(_event_tree), justOutputName(_justOutputName)
 		{
 			this->addPSetRequests();
-			for (typename std::map<Tout*, std::pair<const edm::ParameterSet, const edm::InputTag> >::iterator
-				it = targetSetupMap.begin(); it != targetSetupMap.end(); ++it)
-			{
-				const edm::InputTag &src = it->second.second;
-				consumescollector.consumes<Tin>(src);
-			}
 
 		}
+	typedef std::tuple<const edm::ParameterSet, const edm::InputTag, const edm::EDGetTokenT<Tin>> TargetSetupMapContent;
 	virtual ~KBaseMultiProducer() {}
 
 	virtual bool onEvent(const edm::Event &event, const edm::EventSetup &setup)
 	{
 		this->cEvent = &event;
 		this->cSetup = &setup;
 
-		for (typename std::map<Tout*, std::pair<const edm::ParameterSet, const edm::InputTag> >::iterator
+		for (typename std::map<Tout*, TargetSetupMapContent >::iterator
 			it = targetSetupMap.begin(); it != targetSetupMap.end(); ++it)
 		{
-			const edm::ParameterSet &pset = it->second.first;
-			const edm::InputTag &src = it->second.second;
+			const edm::ParameterSet &pset = std::get<0>(it->second);
+			const edm::InputTag &src = std::get<1>(it->second);
 			const std::pair<std::string, std::string> desc = this->nameMap[it->first];
 
 			// Clear previous collection
 			Tout &ref = *it->first;
 			clearProduct(ref);
 
 			// Try to get product via id
-			if (!event.getByLabel(src, this->handle))
+			if (!event.getByToken(std::get<2>(it->second), this->handle))
 			{
 				std::cout << "Could not get main product! " << desc.second << ".src = " << src.encode() << std::endl;
 				continue;
@@ -92,8 +87,7 @@ class KBaseMultiProducer : public KBaseMatchingProducer<Tout>
 		nameMap[target] = make_pair(targetName, inputName);
 
 		// Used for fast lookup of selector and lv collection
-		typedef std::pair<const edm::ParameterSet, const edm::InputTag> TmpType;
-		this->targetSetupMap.insert(std::pair<Tout*, TmpType>(target, TmpType(pset, tag)));
+		this->targetSetupMap.insert(std::pair<Tout*, TargetSetupMapContent>(target, TargetSetupMapContent(pset, tag, this->consumescollector_.template consumes<Tin>(tag))));
 	}
 
 	virtual void fillProduct(const InputType &input, OutputType &output,
@@ -105,8 +99,8 @@ class KBaseMultiProducer : public KBaseMatchingProducer<Tout>
 	TTree *event_tree;
 	const edm::Event *cEvent;
 	const edm::EventSetup *cSetup;
-
-	std::map<Tout*, std::pair<const edm::ParameterSet, const edm::InputTag> > targetSetupMap;
+	
+	std::map<Tout*, TargetSetupMapContent > targetSetupMap;
 	std::map<Tout*, std::pair<std::string, std::string> > nameMap;
 
 private:

diff --git a/Producers/interface/KBaseProducer.h b/Producers/interface/KBaseProducer.h
@@ -25,6 +25,7 @@ class KBaseProducer
 	virtual bool onEvent(const edm::Event &event, const edm::EventSetup &setup);
 	virtual bool onFirstEvent(const edm::Event &event, const edm::EventSetup &setup);
 	virtual bool endLuminosityBlock(const edm::LuminosityBlock &lumiBlock, const edm::EventSetup &setup);
+	virtual bool endRun(edm::Run const &run, edm::EventSetup const &setup);
 	virtual ~KBaseProducer() {};
 
 protected:
@@ -49,10 +50,11 @@ class KBaseProducerWP : public KBaseProducer
 {
 public:
 	virtual ~KBaseProducerWP() {};
-	KBaseProducerWP(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector);
+	KBaseProducerWP(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector);
 	void addProvenance(std::string oldName, std::string newName);
 
 protected:
+	edm::ConsumesCollector& consumescollector_;
 	const edm::ParameterSet psBase;
 	KProvenance *provenance;
 };

diff --git a/Producers/interface/KBasicJetProducer.h b/Producers/interface/KBasicJetProducer.h
@@ -17,8 +17,8 @@
 class KBasicJetProducer : public KBaseMultiLVProducer<reco::PFJetCollection, std::vector<KBasicJet> >
 {
 public:
-	KBasicJetProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, edm::ConsumesCollector && consumescollector) :
-		KBaseMultiLVProducer<reco::PFJetCollection, KBasicJets>(cfg, _event_tree, _run_tree, getLabel(), std::forward<edm::ConsumesCollector>(consumescollector)) {}
+	KBasicJetProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, edm::ConsumesCollector && consumescollector) :
+		KBaseMultiLVProducer<reco::PFJetCollection, KBasicJets>(cfg, _event_tree, _lumi_tree, _run_tree, getLabel(), std::forward<edm::ConsumesCollector>(consumescollector)) {}
 
 	static const std::string getLabel() { return "BasicJets"; }
 

diff --git a/Producers/interface/KBasicTauProducer.h b/Producers/interface/KBasicTauProducer.h
@@ -23,8 +23,9 @@ template<typename TTau, typename TTauDiscriminator, typename TProduct>
 class KBasicTauProducer : public KBaseMultiLVProducer<std::vector<TTau>, TProduct>
 {
 public:
-	KBasicTauProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
-		KBaseMultiLVProducer<std::vector<TTau>, TProduct>(cfg, _event_tree, _lumi_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector))
+	KBasicTauProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, const std::string &producerName, edm::ConsumesCollector && consumescollector) :
+		KBaseMultiLVProducer<std::vector<TTau>, TProduct>(cfg, _event_tree, _lumi_tree, _run_tree, producerName, std::forward<edm::ConsumesCollector>(consumescollector)),
+		VertexCollectionSource(cfg.getParameter<edm::InputTag>("vertexcollection"))
 	{
 		const edm::ParameterSet &psBase = this->psBase;
 		std::vector<std::string> names = psBase.getParameterNamesForType<edm::ParameterSet>();
@@ -47,7 +48,7 @@ class KBasicTauProducer : public KBaseMultiLVProducer<std::vector<TTau>, TProduc
 			floatDiscrWhitelist[names[i]] = pset.getParameter< std::vector<std::string> >("floatDiscrWhitelist");
 			floatDiscrBlacklist[names[i]] = pset.getParameter< std::vector<std::string> >("floatDiscrBlacklist");
 			tauDiscrProcessName[names[i]] = pset.getParameter< std::string >("tauDiscrProcessName");
-			if(pset.existsAs<edm::InputTag>("vertexcollection")) consumescollector.consumes<reco::VertexCollection>(pset.getParameter<edm::InputTag>("vertexcollection"));
+			this->VertexCollectionToken = consumescollector.consumes<reco::VertexCollection>(VertexCollectionSource);
 		}
 	}
 
@@ -124,8 +125,7 @@ class KBasicTauProducer : public KBaseMultiLVProducer<std::vector<TTau>, TProduc
 		const std::string &name, const edm::InputTag *tag, const edm::ParameterSet &pset)
 	{
 		// Get vertices from event
-		edm::InputTag VertexCollectionSource = pset.getParameter<edm::InputTag>("vertexcollection");
-		this->cEvent->getByLabel(VertexCollectionSource, VertexHandle);
+		this->cEvent->getByToken(this->VertexCollectionToken, VertexHandle);
 
 		// Get tau discriminators from event
 		this->cEvent->getManyByType(currentTauDiscriminators);
@@ -276,6 +276,8 @@ class KBasicTauProducer : public KBaseMultiLVProducer<std::vector<TTau>, TProduc
 	}
 
 protected:
+	edm::InputTag VertexCollectionSource;
+	edm::EDGetTokenT<reco::VertexCollection> VertexCollectionToken;
 	std::map<std::string, std::vector<std::string> > preselectionDiscr;
 	std::map<std::string, std::vector<std::string> > binaryDiscrWhitelist, binaryDiscrBlacklist, floatDiscrWhitelist, floatDiscrBlacklist;
 	std::map<std::string, KTauMetadata *> discriminatorMap;

diff --git a/Producers/interface/KBeamSpotProducer.h b/Producers/interface/KBeamSpotProducer.h
@@ -15,8 +15,8 @@
 class KBeamSpotProducer : public KBaseMultiProducer<reco::BeamSpot, KBeamSpot>
 {
 public:
-	KBeamSpotProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, edm::ConsumesCollector && consumescollector) :
-		KBaseMultiProducer<reco::BeamSpot, KBeamSpot>(cfg, _event_tree, _run_tree, getLabel(), std::forward<edm::ConsumesCollector>(consumescollector)) {}
+	KBeamSpotProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, edm::ConsumesCollector && consumescollector) :
+		KBaseMultiProducer<reco::BeamSpot, KBeamSpot>(cfg, _event_tree, _lumi_tree, _run_tree, getLabel(), std::forward<edm::ConsumesCollector>(consumescollector)) {}
 	virtual ~KBeamSpotProducer() {};
 
 	static const std::string getLabel() { return "BeamSpot"; }

diff --git a/Producers/interface/KCaloJetProducer.h b/Producers/interface/KCaloJetProducer.h
@@ -17,18 +17,18 @@
 class KCaloJetProducer : public KBaseMultiLVProducer<reco::CaloJetCollection, KCaloJets>
 {
 public:
-	KCaloJetProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_run_tree, edm::ConsumesCollector && consumescollector) :
-		KBaseMultiLVProducer<reco::CaloJetCollection, KCaloJets>(cfg, _event_tree, _run_tree, getLabel(), std::forward<edm::ConsumesCollector>(consumescollector)) {}
+	KCaloJetProducer(const edm::ParameterSet &cfg, TTree *_event_tree, TTree *_lumi_tree, TTree *_run_tree, edm::ConsumesCollector && consumescollector) :
+		KBaseMultiLVProducer<reco::CaloJetCollection, KCaloJets>(cfg, _event_tree, _lumi_tree, _run_tree, getLabel(), std::forward<edm::ConsumesCollector>(consumescollector)) {}
 
 	static const std::string getLabel() { return "CaloJets"; }
 
 	virtual void fillProduct(const InputType &in, OutputType &out,
 		const std::string &name, const edm::InputTag *tag, const edm::ParameterSet &pset)
 	{
 		// Retrieve additional input products
-		tagJetID = pset.getParameter<edm::InputTag>("srcJetID");
-		if (tagJetID.label() != "")
-			cEvent->getByLabel(tagJetID, hJetID);
+		//tagJetID = pset.getParameter<edm::InputTag>("srcJetID");
+		//if (tagJetID.label() != "")
+		//	cEvent->getByLabel(tagJetID, hJetID);
 
 		// Continue normally
 		KBaseMultiLVProducer<reco::CaloJetCollection, KCaloJets>::fillProduct(in, out, name, tag, pset);
@@ -46,20 +46,20 @@ class KCaloJetProducer : public KBaseMultiLVProducer<reco::CaloJetCollection, KC
 		out.fHPD = -2;
 		out.fRBX = -2;
 		out.fHO = -2;
-		if (tagJetID.label() != "")
-		{
-			edm::RefToBase<reco::Jet> jetRef(edm::Ref<reco::CaloJetCollection>(handle, this->nCursor));
-			const reco::JetID &jetID = (*hJetID)[jetRef];
-			out.n90Hits = static_cast<int>(jetID.n90Hits);
-			out.fHPD = jetID.fHPD;
-			out.fRBX = jetID.fRBX;
-			out.fHO = jetID.fHO;
-		}
+		//if (tagJetID.label() != "")
+		//{
+		//	edm::RefToBase<reco::Jet> jetRef(edm::Ref<reco::CaloJetCollection>(handle, this->nCursor));
+		//	const reco::JetID &jetID = (*hJetID)[jetRef];
+		//	out.n90Hits = static_cast<int>(jetID.n90Hits);
+		//	out.fHPD = jetID.fHPD;
+		//	out.fRBX = jetID.fRBX;
+		//	out.fHO = jetID.fHO;
+		//}
 	}
 
 private:
-	edm::InputTag tagJetID;
-	edm::Handle<edm::ValueMap<reco::JetID> > hJetID;
+	//edm::InputTag tagJetID;
+	//edm::Handle<edm::ValueMap<reco::JetID> > hJetID;
 };
 
 #endif