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

File:

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

readers/DelphesPythia8.cpp

@@ -17 +17 @@
  */
 
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 #include <string>
 
@@ -27 +27 @@
 #include "Pythia8Plugins/CombineMatchingInput.h"
 
+#include "TROOT.h"
 #include "TApplication.h"
-#include "TROOT.h"
-
+
+#include "TFile.h"
+#include "TObjArray.h"
+#include "TStopwatch.h"
 #include "TDatabasePDG.h"
-#include "TFile.h"
+#include "TParticlePDG.h"
 #include "TLorentzVector.h"
-#include "TObjArray.h"
-#include "TParticlePDG.h"
-#include "TStopwatch.h"
-
+
+#include "modules/Delphes.h"
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
 #include "classes/DelphesLHEFReader.h"
-#include "modules/Delphes.h"
-
+
+#include "ExRootAnalysis/ExRootTreeWriter.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootProgressBar.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootTreeWriter.h"
 
 using namespace std;
@@ -98 +98 @@
     pid = particle.id();
     status = particle.statusHepMC();
-    px = particle.px();
-    py = particle.py();
-    pz = particle.pz();
-    e = particle.e();
-    mass = particle.m();
-    x = particle.xProd();
-    y = particle.yProd();
-    z = particle.zProd();
-    t = particle.tProd();
+    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e(); mass = particle.m();
+    x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd();
 
     candidate = factory->NewCandidate();
@@ -122 +115 @@
 
     pdgParticle = pdg->GetParticle(pid);
-    candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge() / 3.0) : -999;
+    candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
     candidate->Mass = mass;
 
@@ -173 +166 @@
 
   // pMin = 0.1 GeV for single particles
-  pp = pow(10, -1.0 + (log10(pMax) + 1.0) * rndm.flat());
+  pp = pow(10, - 1.0 + (log10(pMax) + 1.0) * rndm.flat());
   eta = (2.0 * rndm.flat() - 1.0) * etaMax;
   phi = 2.0 * M_PI * rndm.flat();
   mm = pdt.mSel(id);
-  ee = Pythia8::sqrtpos(pp * pp + mm * mm);
+  ee = Pythia8::sqrtpos(pp*pp + mm*mm);
   pt = pp / cosh(eta);
 
@@ -200 +193 @@
   phi = 2.0 * M_PI * rndm.flat();
   mm = pdt.mSel(id);
-  ee = Pythia8::sqrtpos(pp * pp + mm * mm);
+  ee = Pythia8::sqrtpos(pp*pp + mm*mm);
   pt = pp / cosh(eta);
 
-  if((id == 4 || id == 5) && pt < 10.0) return;
+  if( (id == 4 || id == 5) && pt < 10.0) return;
 
   if(id == 21)
@@ -245 +238 @@
   // for matching
   Pythia8::CombineMatchingInput *combined = 0;
-  Pythia8::UserHooks *matching = 0;
+  Pythia8::UserHooks* matching = 0;
 
   if(argc != 4)
   {
-    cout << " Usage: " << appName << " config_file"
-         << " pythia_card"
-         << " output_file" << endl;
+    cout << " Usage: " << appName << " config_file" << " pythia_card" << " output_file" << endl;
     cout << " config_file - configuration file in Tcl format," << endl;
     cout << " pythia_card - Pythia8 configuration file," << endl;
@@ -302 +293 @@
     }
     pythia->setUserHooksPtr(matching);
+
 
     if(pythia == NULL)
@@ -356 +348 @@
     for(eventCounter = 0; eventCounter < numberOfEvents && !interrupted; ++eventCounter)
     {
-      while(reader && reader->ReadBlock(factory, allParticleOutputArrayLHEF, stableParticleOutputArrayLHEF, partonOutputArrayLHEF) && !reader->EventReady())
-        ;
+      while(reader && reader->ReadBlock(factory, allParticleOutputArrayLHEF,
+        stableParticleOutputArrayLHEF, partonOutputArrayLHEF) && !reader->EventReady());
 
       if(spareFlag1)