KappaAnalysis · hsert · Aug 4, 2017 · Aug 4, 2017 · Aug 5, 2017 · Aug 10, 2017
diff --git a/DataFormats/interface/KBasic.h b/DataFormats/interface/KBasic.h
@@ -67,7 +67,8 @@ struct KRefitVertex : public KVertex
 {
 	virtual ~KRefitVertex() {};
 
-	std::size_t leptonSelectionHash;
+	std::size_t leptonSelectionHash1;
+	std::size_t leptonSelectionHash2;
 
 };
 typedef std::vector<KRefitVertex> KRefitVertices;

diff --git a/DataFormats/interface/KDebug.h b/DataFormats/interface/KDebug.h
@@ -31,6 +31,7 @@ std::ostream &operator<<(std::ostream &os, const KLepton &lep);
 std::ostream &operator<<(std::ostream &os, const KLeptonPair &leptonPair);
 std::ostream &operator<<(std::ostream &os, const KBasicTau &tau);
 std::ostream &operator<<(std::ostream &os, const KTau &tau);
+std::ostream &operator<<(std::ostream &os, const KL1Tau &tau);
 std::ostream &operator<<(std::ostream &os, const KExtendedTau &tau);
 std::ostream &operator<<(std::ostream &os, const KGenTau &tau);
 std::ostream &operator<<(std::ostream &os, const KGenJet &jet);

diff --git a/DataFormats/interface/KJetMET.h b/DataFormats/interface/KJetMET.h
@@ -88,7 +88,8 @@ struct KJet : public KBasicJet
 
 	std::vector<float> tags;            //< float value tags (b-tag, etc.)
 	unsigned int binaryIds;             //< binary value tags (PU jet ID, etc.)
-	int flavour;
+	int hadronFlavour;
+	int partonFlavour;
 	bool genMatch;
 
 	float getTag(const std::string& name, const KJetMetadata *jetmetadata, bool check = true) const

diff --git a/DataFormats/interface/KLepton.h b/DataFormats/interface/KLepton.h
@@ -102,9 +102,8 @@ struct KLepton : public KLV
 	    approximation: effective area as a circle area
 	    rho is usually provided by a KPileupDensity object
 	*/
-	double pfIsoRho(const double rho = 0.0, const double radius = 0.4) const
+	double pfIsoRho(const double rho = 0.0, const double area = 0.5026544) const
 	{
-		double area = radius * radius * 3.14159;
 		return std::max(0.0, static_cast<double>(pfIso(0.0)) - std::max(rho * area, 0.0));
 	}
 

diff --git a/DataFormats/interface/KTau.h b/DataFormats/interface/KTau.h
@@ -77,6 +77,19 @@ struct KBasicTau : public KLepton
 };
 typedef std::vector<KBasicTau> KBasicTaus;
 
+/// Kappa L1 Tau format for L1 Seeds of Taus
+/*  needed for matching Tau trigger objects to their L1 seeds & apply pt cuts,
+	as recommended by Tau Trigger group for 2017 to achieve trigger SF's near 1.
+	It could be easily/generalized to L1 Muons and Electrons, but for now, that's not needed.
+	CMSSW DataFormats reference:
+	https://github.com/cms-sw/cmssw/blob/CMSSW_9_4_X/DataFormats/L1Trigger/interface/L1Candidate.h
+	https://github.com/cms-sw/cmssw/blob/CMSSW_9_4_X/DataFormats/L1Trigger/interface/Tau.h*/
+struct KL1Tau : public KLV
+{
+	virtual ~KL1Tau() {};
+	bool hwIso; // hardware iso: stored as 'int' in MINIAOD; switch to bool since relevant check is hwIso() > 0 in analyses
+};
+typedef std::vector<KL1Tau> KL1Taus;
 
 /// Kappa Tau data format
 /** copy from DataFormats/TauReco/interface/PFTau.h */

diff --git a/DataFormats/interface/KTrack.h b/DataFormats/interface/KTrack.h
@@ -99,12 +99,39 @@ struct KTrack : public KLV
 	};
 
 	// https://github.com/cms-sw/cmssw/blob/09c3fce6626f70fd04223e7dacebf0b485f73f54/DataFormats/TrackReco/interface/TrackBase.h#L3-L49
+	template<class T>
+	std::vector<float> helixParameters(const T &vertex) const
+	{
+		std::vector<float> parameters = { qOverP(), lambda(), phi(), getDxy(vertex), getDsz(vertex) };
+		return parameters;
+	}
+
 	std::vector<float> helixParameters()
 	{
 		KVertex origin;
 		std::vector<float> parameters = { qOverP(), lambda(), phi(), getDxy(&origin), getDsz(&origin) };
 		return parameters;
 	}
+
+	template<class T>
+	float helixParameters(const T &vertex, int index) const
+	{
+		switch (index) {
+			case 0:
+				return qOverP();
+			case 1:
+				return lambda();
+			case 2:
+				return phi();
+			case 3:
+				return getDxy(vertex);
+			case 4:
+				return getDsz(vertex);
+			default:
+				return -999;
+		}
+	}
+
 	ROOT::Math::SMatrix<float, reco::Track::dimension, reco::Track::dimension, ROOT::Math::MatRepSym<float, reco::Track::dimension> > helixCovariance;
 
 	float qOverP() const

diff --git a/DataFormats/interface/Kappa.h b/DataFormats/interface/Kappa.h
@@ -88,6 +88,8 @@ REGISTER_NAME_OF_TYPE(KPhotons,std::vector<KPhoton>);
 REGISTER_NAME_OF_TYPE(KPileupDensity,KPileupDensity);
 REGISTER_NAME_OF_TYPE(KTau,KTau);
 REGISTER_NAME_OF_TYPE(KTaus,std::vector<KTau>);
+REGISTER_NAME_OF_TYPE(KL1Tau,KL1Tau);
+REGISTER_NAME_OF_TYPE(KL1Taus,std::vector<KL1Tau>);
 REGISTER_NAME_OF_TYPE(KExtendedTau,KExtendedTau);
 REGISTER_NAME_OF_TYPE(KExtendedTaus,std::vector<KExtendedTau>);
 REGISTER_NAME_OF_TYPE(KTaupairVerticesMap,KTaupairVerticesMap);

diff --git a/DataFormats/src/KDebug.cpp b/DataFormats/src/KDebug.cpp
@@ -148,7 +148,8 @@ std::ostream &operator<<(std::ostream &os, const KBasicJet &jet)
 std::ostream &operator<<(std::ostream &os, const KJet &jet)
 {
 	os << static_cast<const KBasicJet>(jet);
-	os << "\tflavour=" << jet.flavour;
+	os << "\thadronFlavour=" << jet.hadronFlavour;
+	os << "\tpartonFlavour=" << jet.partonFlavour;
 	os << "\tIDs=" << std::bitset<8>(jet.binaryIds);
 	if (jet.tags.size() > 0)
 		os << std::endl << "\ttags: ";
@@ -475,9 +476,8 @@ std::ostream &operator<<(std::ostream &os, const KGenEventInfo &i)
 std::ostream &displayHLT(std::ostream &os, const KLumiInfo &metaLumi, const KEventInfo &metaEvent)
 {
 	for (size_t hltIdx = 0; hltIdx < metaLumi.hltNames.size(); ++hltIdx)
-		if (metaEvent.bitsHLT[hltIdx])
-			os << hltIdx << ":" << metaLumi.hltNames[hltIdx] << "(" << metaLumi.hltPrescales[hltIdx] << ")" << " ";
-		os << std::endl;
+		if (metaEvent.bitsHLT[hltIdx]) os << hltIdx << ":" << metaLumi.hltNames[hltIdx] << "(" << metaLumi.hltPrescales[hltIdx] << ")" << " ";
+	os << std::endl;
 	return os;
 }
 

diff --git a/DataFormats/src/classes.h b/DataFormats/src/classes.h
@@ -84,6 +84,8 @@ namespace
 		KPileupDensity dict_KPileupDensity;
 		KTau dict_KTau;
 		KTaus dict_KTaus;
+		KL1Tau dict_KL1Tau;
+		KL1Taus dict_KL1Taus;
 		KExtendedTau dict_KExtendedTau;
 		KExtendedTaus dict_KExtendedTaus;
 		KTaupairVerticesMap dict_KTaupairVerticesMap;

diff --git a/DataFormats/src/classes_def.xml b/DataFormats/src/classes_def.xml
@@ -50,6 +50,8 @@
 	<class name="KPileupDensity"/>
 	<class name="KTau"/>
 	<class name="KTaus"/>
+	<class name="KL1Tau"/>
+	<class name="KL1Taus"/>
 	<class name="KExtendedTau"/>
 	<class name="KExtendedTaus"/>
 	<class name="KTaupairVerticesMap"/>

diff --git a/DataFormats/test/testDebug.cc b/DataFormats/test/testDebug.cc
@@ -42,6 +42,7 @@ int main() {
 	cout << "* KPhoton: " << KPhoton() << endl << endl;
 	cout << "* KPileupDensity: " << KPileupDensity() << endl << endl;
 	cout << "* KTau: " << KTau() << endl << endl;
+	cout << "* KL1Tau: " << KL1Tau() << endl << endl;
 	cout << "* KExtendedTau: " << KExtendedTau() << endl << endl;
 	cout << "* KTaupairVerticesMap: " << KTaupairVerticesMap() << endl << endl;
 	cout << "* KTrack: " << KTrack() << endl << endl;

diff --git a/Producers/BuildFile.xml b/Producers/BuildFile.xml
@@ -26,6 +26,7 @@
 <use name="RecoMuon/DetLayers"/>
 <use name="RecoMuon/Records"/>
 <use name="TrackingTools/KalmanUpdators"/>
+<use name="TrackingTools/TransientTrack"/>
 <use name="RecoEgamma/EgammaTools"/>
 <use name="RecoVertex/AdaptiveVertexFit"/>
 <use name="RecoVertex/LinearizationPointFinders"/>

diff --git a/Producers/interface/KBaseMultiLVProducer.h b/Producers/interface/KBaseMultiLVProducer.h
@@ -38,8 +38,8 @@ class KBaseMultiVectorProducer : public KBaseMultiProducer<Tin, Tout>
 		typename KBaseMultiProducer<Tin, Tout>::OutputType &output,
 		const std::string &name, const edm::InputTag *tag, const edm::ParameterSet &pset)
 	{
-		if (KBaseProducer::verbosity > 0)
-			std::cout << input.size() << "KBaseMultiLVProducer::fillProduct :  objects in collection " << name << std::endl;
+		if (KBaseProducer::verbosity >= 3)
+			std::cout << input.size() << " KBaseMultiLVProducer::fillProduct :  objects in collection " << name << std::endl;
 		output.reserve(input.size());
 
 		// Cursor is necessary to get "Refs" later
@@ -59,7 +59,7 @@ class KBaseMultiVectorProducer : public KBaseMultiProducer<Tin, Tout>
 		if (maxN > 0)
 			output.erase(output.begin() + std::min(output.size(), (size_t)maxN), output.end());
 
-		if (KBaseProducer::verbosity > 1)
+		if (KBaseProducer::verbosity >= 3)
 			std::cout << "KBaseMultiLVProducer::fillProduct : \t" << "Number of accepted objects: " << output.size() << "\t";
 	}
 
@@ -106,7 +106,7 @@ class KBaseMultiLVProducer : public KBaseMultiVectorProducer<Tin, Tout>
 		const std::string &name, const edm::InputTag *tag, const edm::ParameterSet &pset)
 	{
 		KBaseMultiVectorProducer<Tin, Tout>::fillProduct(input, output, name, tag, pset);
-		if ((KBaseProducer::verbosity > 1) && (output.size() > 0))
+		if ((KBaseProducer::verbosity >= 3) && (output.size() > 0))
 			std::cout << "KBaseMultiLVProducer::fillProduct : First: " << output[0].p4 << "\tLast: " << output[output.size() - 1].p4 << std::endl;
 	}
 

diff --git a/Producers/interface/KBaseMultiProducer.h b/Producers/interface/KBaseMultiProducer.h
@@ -31,8 +31,7 @@ class KBaseMultiProducer : public KBaseMatchingProducer<Tout>
 		this->cEvent = &event;
 		this->cSetup = &setup;
 
-		for (typename std::map<Tout*, TargetSetupMapContent >::iterator
-			it = targetSetupMap.begin(); it != targetSetupMap.end(); ++it)
+		for(typename std::map<Tout*, TargetSetupMapContent >::iterator it = targetSetupMap.begin(); it != targetSetupMap.end(); ++it)
 		{
 			const edm::ParameterSet &pset = std::get<0>(it->second);
 			const edm::InputTag &src = std::get<1>(it->second);
@@ -45,13 +44,16 @@ class KBaseMultiProducer : public KBaseMatchingProducer<Tout>
 			// Try to get product via id
 			if (!event.getByToken(std::get<2>(it->second), this->handle))
 			{
-				std::cout << "Could not get main product! " << desc.second << ".src = " << src.encode() << std::endl;
+				std::cout << "Could not get main product! " << desc.second << ".src = " << src.encode()
+				<< " desc.first=" << desc.first
+				<< " pset=" << pset
+				<< " this->handle=" << this->handle
+				<< std::endl;
 				continue;
 			}
 
 			std::string name = desc.first;
-			if ((desc.first != desc.second) && !justOutputName)
-				name += " (" + desc.second + ")";
+			if ((desc.first != desc.second) && !justOutputName) name += " (" + desc.second + ")";
 			fillProduct(*(this->handle), ref, name, &src, pset);
 		}
 

diff --git a/Producers/interface/KBasicTauProducer.h b/Producers/interface/KBasicTauProducer.h
@@ -53,6 +53,7 @@ class KBasicTauProducer : public KBaseMultiLVProducer<std::vector<TTau>, TProduc
 
 	virtual bool onRun(edm::Run const &run, edm::EventSetup const &setup)
 	{
+		//edm::ESHandle<TransientTrackBuilder> trackBuilder = edm::ESHandle<TransientTrackBuilder>();
 		setup.get<TransientTrackRecord>().get("TransientTrackBuilder", trackBuilder);
 		return true;
 	}