Changes in readers/DelphesPythia8.cpp [78d1846:6934875] in git

File:

• readers/DelphesPythia8.cpp (modified) (10 diffs)

readers/DelphesPythia8.cpp

@@ -146 +146 @@
 }
 
-//---------------------------------------------------------------------------
-
-/*
-Single-particle gun. The particle must be a colour singlet.
-Input: flavour, energy, direction (theta, phi).
-If theta < 0 then random choice over solid angle.
-Optional final argument to put particle at rest => E = m.
-from pythia8 example 21
-*/
-
-void fillParticle(int id, double pMax, double etaMax,
+
+// Single-particle gun. The particle must be a colour singlet.
+// Input: flavour, energy, direction (theta, phi).
+// If theta < 0 then random choice over solid angle.
+// Optional final argument to put particle at rest => E = m.
+// from pythia8 example 21
+
+void fillParticle(int id, double p_max, double eta_max,
   Pythia8::Event &event, Pythia8::ParticleData &pdt, Pythia8::Rndm &rndm)
 {
@@ -164 +161 @@
   // Generate uniform pt and eta.
   double pt, eta, phi, pp, ee, mm;
-
-  // pMin = 0.1 GeV for single particles
-  pp = pow(10, - 1.0 + (log10(pMax) + 1.0) * rndm.flat());
-  eta = (2.0 * rndm.flat() - 1.0) * etaMax;
+  
+  //pmin = 0.1 GeV for single particles
+  pp = pow(10, - 1.0 + (log10(p_max) + 1.0) * rndm.flat()); 
+  eta = (2.0 * rndm.flat() - 1.0) * eta_max;
   phi = 2.0 * M_PI * rndm.flat();
   mm = pdt.mSel(id);
@@ -177 +174 @@
 }
 
-//---------------------------------------------------------------------------
-
-void fillPartons(int id, double pMax, double etaMax,
+void fillPartons(int id, double p_max, double eta_max,
   Pythia8::Event &event, Pythia8::ParticleData &pdt, Pythia8::Rndm &rndm)
 {
+
   // Reset event record to allow for new event.
   event.reset();
@@ -188 +184 @@
   double pt, eta, phi, pp, ee, mm;
 
-  // pMin = 1 GeV for jets
-  pp = pow(10, log10(pMax) * rndm.flat());
-  eta = (2.0 * rndm.flat() - 1.0) * etaMax;
+  //pmin = 1 GeV for jets
+  pp = pow(10, log10(p_max) * rndm.flat());  
+  eta = (2.0 * rndm.flat() - 1.0) * eta_max;
   phi = 2.0 * M_PI * rndm.flat();
   mm = pdt.mSel(id);
@@ -197 +193 @@
 
   if( (id == 4 || id == 5) && pt < 10.0) return;
-
+ 
   if(id == 21)
   {
@@ -209 +205 @@
   }
 }
+
 
 //---------------------------------------------------------------------------
@@ -230 +227 @@
   Long64_t eventCounter, errorCounter;
   Long64_t numberOfEvents, timesAllowErrors;
-  Bool_t spareFlag1;
-  Int_t spareMode1;
-  Double_t spareParm1, spareParm2;
 
   Pythia8::Pythia *pythia = 0;
-
+ 
   // for matching
   Pythia8::CombineMatchingInput *combined = 0;
@@ -285 +279 @@
     // Initialize Pythia
     pythia = new Pythia8::Pythia;
-
+  
     // jet matching
     matching = combined->getHook(*pythia);
-    if(!matching)
+    if (!matching)
     {
       throw runtime_error("can't do matching");
     }
     pythia->setUserHooksPtr(matching);
-
+ 
 
     if(pythia == NULL)
@@ -311 +305 @@
     timesAllowErrors = pythia->mode("Main:timesAllowErrors");
 
-    spareFlag1 = pythia->flag("Main:spareFlag1");
-    spareMode1 = pythia->mode("Main:spareMode1");
-    spareParm1 = pythia->parm("Main:spareParm1");
-    spareParm2 = pythia->parm("Main:spareParm2");
-
     // Check if particle gun
-    if(!spareFlag1)
+    if (!pythia->flag("Main:spareFlag1"))
     {
       inputFile = fopen(pythia->word("Beams:LHEF").c_str(), "r");
@@ -351 +340 @@
         stableParticleOutputArrayLHEF, partonOutputArrayLHEF) && !reader->EventReady());
 
-      if(spareFlag1)
+      if (pythia->flag("Main:spareFlag1"))
       {
-        if((spareMode1 >= 1 && spareMode1 <= 5) || spareMode1 == 21)
-        {
-          fillPartons(spareMode1, spareParm1, spareParm2, pythia->event, pythia->particleData, pythia->rndm);
+        if (pythia->mode("Main:spareMode1") == 11 || pythia->mode("Main:spareMode1") == 13 || pythia->mode("Main:spareMode1") == 15 || pythia->mode("Main:spareMode1") == 22 || pythia->mode("Main:spareMode1") == 211 || pythia->mode("Main:spareMode1") == 2112) 
+        { 
+          fillParticle(pythia->mode("Main:spareMode1"), pythia->parm("Main:spareParm1"), pythia->parm("Main:spareParm2"), pythia->event, pythia->particleData, pythia->rndm);
         }
         else
         {
-          fillParticle(spareMode1, spareParm1, spareParm2, pythia->event, pythia->particleData, pythia->rndm);
+          fillPartons(pythia->mode("Main:spareMode1"), pythia->parm("Main:spareParm1"), pythia->parm("Main:spareParm2"), pythia->event, pythia->particleData, pythia->rndm);
         }
       }