Update KGenEventInfo

KIT-CMS · Nov 30, 2014 · 26b6863 · 26b6863
1 parent 2738bb3
commit 26b6863
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/DataFormats/interface/KInfo.h b/DataFormats/interface/KInfo.h
@@ -105,15 +105,15 @@ typedef int bx_id;
 
 struct KGenEventInfo : public KEventInfo
 {
-	double weight;
-	double binValue;
-	double alphaQCD;
-	float numPUInteractionsTruth;	// "true" number of PU interactions
-	unsigned char numPUInteractionsM2;	// bx = -2
-	unsigned char numPUInteractionsM1;	// bx = -1
-	unsigned char numPUInteractions0;	// bx =  0
-	unsigned char numPUInteractionsP1;	// bx = +1
-	unsigned char numPUInteractionsP2;	// bx = +2
+	double weight;                      //< Monte-Carlo weight of the event
+	double binValue;                    //< ?
+	double alphaQCD;                    //< value of alpha_S for this event
+	float nPUMean;        //< mean ("true") number of PU interactions
+	unsigned char nPUm2;  // bx = -2
+	unsigned char nPUm1;  // bx = -1
+	unsigned char nPU;    // bx =  0
+	unsigned char nPUp1;  // bx = +1
+	unsigned char nPUp2;  // bx = +2
 };
 
 

diff --git a/DataFormats/test/KDebug.cpp b/DataFormats/test/KDebug.cpp
@@ -194,7 +194,7 @@ std::ostream &operator<<(std::ostream &os, const KGenEventInfo &m)
 	os << static_cast<const KEventInfo>(m) << std::endl;
 	return os
 		<< "Weight: " << m.weight
-		<< "#PU: " << m.numPUInteractionsTruth;
+		<< "#PU: " << m.nPUMean;
 }
 
 std::ostream &displayHLT(std::ostream &os, const KLumiInfo &metaLumi, const KEventInfo &metaEvent)

diff --git a/Producers/interface/KGenInfoProducer.h b/Producers/interface/KGenInfoProducer.h
@@ -82,38 +82,37 @@ class KGenInfoProducer : public KInfoProducer<Tmeta>
 		//metaEvent->alphaQED = hEventInfo->alphaQED();
 
 		// Get PU infos
-		this->metaEvent->numPUInteractionsM2 = 0;
-		this->metaEvent->numPUInteractionsM1 = 0;
-		this->metaEvent->numPUInteractions0 = 0;
-		this->metaEvent->numPUInteractionsP1 = 0;
-		this->metaEvent->numPUInteractionsP2 = 0;
+		this->metaEvent->nPUm2 = 0;
+		this->metaEvent->nPUm1 = 0;
+		this->metaEvent->nPU   = 0;
+		this->metaEvent->nPUp1 = 0;
+		this->metaEvent->nPUp2 = 0;
 		edm::Handle<std::vector<PileupSummaryInfo> > puHandles;
 		if (event.getByLabel(puInfoSource, puHandles) && puHandles.isValid())
 		{
 			for (std::vector<PileupSummaryInfo>::const_iterator it = puHandles->begin(); it != puHandles->end(); ++it)
 			{
 				unsigned char nPU = (unsigned char)std::min(255, it->getPU_NumInteractions());
 				if (it->getBunchCrossing() == -2)
-					this->metaEvent->numPUInteractionsM2 = nPU;
+					this->metaEvent->nPUm2 = nPU;
 				else if (it->getBunchCrossing() == -1)
-					this->metaEvent->numPUInteractionsM1 = nPU;
+					this->metaEvent->nPUm1 = nPU;
 				else if (it->getBunchCrossing() == 0)
-					this->metaEvent->numPUInteractions0 = nPU;
+					this->metaEvent->nPU = nPU;
 				else if (it->getBunchCrossing() == 1)
-					this->metaEvent->numPUInteractionsP1 = nPU;
+					this->metaEvent->nPUp1 = nPU;
 				else if (it->getBunchCrossing() == 2)
-					this->metaEvent->numPUInteractionsP2 = nPU;
+					this->metaEvent->nPUp2 = nPU;
 
-				// remove the following line to compile with CMSSW 4.2.7 or earlier
-				this->metaEvent->numPUInteractionsTruth = it->getTrueNumInteractions();
+				this->metaEvent->nPUMean = it->getTrueNumInteractions();  // remove this line to compile with CMSSW 4.2.7 or earlier
 			}
 		}
 		else
 		{
 			// in some versions of CMSSW it's not a vector:
 			edm::Handle<PileupSummaryInfo> puHandle;
 			if (event.getByLabel(puInfoSource, puHandle) && puHandle.isValid())
-				this->metaEvent->numPUInteractions0 = (unsigned char)std::min(255, puHandle->getPU_NumInteractions());
+				this->metaEvent->nPU = (unsigned char)std::min(255, puHandle->getPU_NumInteractions());
 		}
 
 		return true;
@@ -172,11 +171,11 @@ class KHepMCInfoProducer : public KInfoProducer<Tmeta>
 		//metaEvent->alphaQED = hEventInfo->alphaQED();
 
 		// Get PU infos
-		this->metaEvent->numPUInteractionsM2 = 0;
-		this->metaEvent->numPUInteractionsM1 = 0;
-		this->metaEvent->numPUInteractions0 = 0;
-		this->metaEvent->numPUInteractionsP1 = 0;
-		this->metaEvent->numPUInteractionsP2 = 0;
+		this->metaEvent->nPUm2 = 0;
+		this->metaEvent->nPUm1 = 0;
+		this->metaEvent->nPU   = 0;
+		this->metaEvent->nPUp1 = 0;
+		this->metaEvent->nPUp2 = 0;
 
 		return true;
 	}