Changeset 1268 in svn for trunk

Timestamp:

Aug 19, 2013, 3:53:30 PM (11 years ago)

Author:

Pavel Demin

Message:

added PileUpDistribution parameter to the PileUpMerger module

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• modules/PileUpMerger.cc (modified) (3 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
 3.0.10:
+  added PileUpDistribution parameter to the PileUpMerger module
   added UsePTSum and PTSumMax parameters to the Isolation module
   added posibility to read reweighting information from LHEF

trunk/modules/PileUpMerger.cc

@@ -57 +57 @@
   const char *fileName;
 
+  fPileUpDistribution = GetInt("PileUpDistribution", 0);
+
   fMeanPileUp  = GetDouble("MeanPileUp", 10);
   fZVertexSpread = GetDouble("ZVertexSpread", 0.05)*1.0E3;
@@ -88 +90 @@
   Float_t px, py, pz, e;
   Double_t dz, dphi;
-  Int_t poisson, event;
+  Int_t numberOfEvents, event;
   Long64_t allEntries, entry;
   Candidate *candidate;
@@ -101 +103 @@
   factory = GetFactory();
 
-  poisson = gRandom->Poisson(fMeanPileUp);
+  switch(fPileUpDistribution)
+  {
+    case 0:
+      numberOfEvents = gRandom->Poisson(fMeanPileUp);
+      break;
+    case 1:
+      numberOfEvents = gRandom->Integer(2*fMeanPileUp + 1);
+      break;
+    default:
+      numberOfEvents = gRandom->Poisson(fMeanPileUp);
+      break;
+  }
 
   allEntries = fReader->GetEntries();
 
-  for(event = 0; event < poisson; ++event)
+  for(event = 0; event < numberOfEvents; ++event)
   {
     do