Changeset 6934875 in git for readers

Timestamp:

Sep 23, 2016, 1:36:24 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

56562d0

Parents:

6387aea

Message:

changed into flat generation in E, included neutron, charged pions, c-jets in particle gun

File:

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

readers/DelphesPythia8.cpp

@@ -153 +153 @@
 // from pythia8 example 21
 
-void fillParticle(int id, double pt_max, double eta_max,
+void fillParticle(int id, double p_max, double eta_max,
   Pythia8::Event &event, Pythia8::ParticleData &pdt, Pythia8::Rndm &rndm)
 {
@@ -161 +161 @@
   // Generate uniform pt and eta.
   double pt, eta, phi, pp, ee, mm;
-  pt = pow(10, 1.0 + (log10(pt_max) - 1.0) * rndm.flat());
+  
+  //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();
-  pp = pt * cosh(eta);
   mm = pdt.mSel(id);
   ee = Pythia8::sqrtpos(pp*pp + mm*mm);
+  pt = pp / cosh(eta);
 
   // Store the particle in the event record.
@@ -172 +174 @@
 }
 
-void fillPartons(int id, double pt_max, double eta_max,
+void fillPartons(int id, double p_max, double eta_max,
   Pythia8::Event &event, Pythia8::ParticleData &pdt, Pythia8::Rndm &rndm)
 {
@@ -179 +181 @@
   event.reset();
 
-  // Information on a q qbar system, to be hadronized.
-
   // Generate uniform pt and eta.
   double pt, eta, phi, pp, ee, mm;
-  pt = pow(10, 1.0 + (log10(pt_max) - 1.0) * rndm.flat());
+
+  //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();
-  pp = pt * cosh(eta);
-  mm = pdt.m0(id);
+  mm = pdt.mSel(id);
   ee = Pythia8::sqrtpos(pp*pp + mm*mm);
-
+  pt = pp / cosh(eta);
+
+  if( (id == 4 || id == 5) && pt < 10.0) return;
+ 
   if(id == 21)
   {
@@ -338 +342 @@
       if (pythia->flag("Main:spareFlag1"))
       {
-        if (pythia->mode("Main:spareMode1") == 11 || pythia->mode("Main:spareMode1") == 13 || pythia->mode("Main:spareMode1") == 15 || pythia->mode("Main:spareMode1") == 22) 
+        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);