Changes in modules/PileUpMergerPythia8.cc [341014c:2d494a6] in git

File:

• modules/PileUpMergerPythia8.cc (modified) (6 diffs)

modules/PileUpMergerPythia8.cc

@@ -29 +29 @@
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
+#include "classes/DelphesTF2.h"
 #include "classes/DelphesPileUpReader.h"
-#include "classes/DelphesTF2.h"
-
+
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootResult.h"
 
 #include "Pythia.h"
 
+#include "TMath.h"
+#include "TString.h"
+#include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
 #include "TDatabasePDG.h"
-#include "TFormula.h"
 #include "TLorentzVector.h"
-#include "TMath.h"
-#include "TObjArray.h"
-#include "TRandom3.h"
-#include "TString.h"
 
 #include <algorithm>
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -76 +76 @@
   fPileUpDistribution = GetInt("PileUpDistribution", 0);
 
-  fMeanPileUp = GetDouble("MeanPileUp", 10);
+  fMeanPileUp  = GetDouble("MeanPileUp", 10);
 
   fZVertexSpread = GetDouble("ZVertexSpread", 0.15);
@@ -133 +133 @@
   fFunction->GetRandom2(dz, dt);
 
-  dt *= c_light * 1.0E3; // necessary in order to make t in mm/c
+  dt *= c_light*1.0E3; // necessary in order to make t in mm/c
   dz *= 1.0E3; // necessary in order to make z in mm
   vx = 0.0;
   vy = 0.0;
   numberOfParticles = fInputArray->GetEntriesFast();
-  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
     vx += candidate->Position.X();
@@ -165 +165 @@
   switch(fPileUpDistribution)
   {
-  case 0:
-    numberOfEvents = gRandom->Poisson(fMeanPileUp);
-    break;
-  case 1:
-    numberOfEvents = gRandom->Integer(2 * fMeanPileUp + 1);
-    break;
-  default:
-    numberOfEvents = gRandom->Poisson(fMeanPileUp);
-    break;
+    case 0:
+      numberOfEvents = gRandom->Poisson(fMeanPileUp);
+      break;
+    case 1:
+      numberOfEvents = gRandom->Integer(2*fMeanPileUp + 1);
+      break;
+    default:
+      numberOfEvents = gRandom->Poisson(fMeanPileUp);
+      break;
   }
 
   for(event = 0; event < numberOfEvents; ++event)
   {
-    while(!fPythia->next())
-      ;
-
-    // --- Pile-up vertex smearing
+    while(!fPythia->next());
+
+   // --- Pile-up vertex smearing
 
     fFunction->GetRandom2(dz, dt);
 
-    dt *= c_light * 1.0E3; // necessary in order to make t in mm/c
+    dt *= c_light*1.0E3; // necessary in order to make t in mm/c
     dz *= 1.0E3; // necessary in order to make z in mm
 
@@ -202 +201 @@
 
       pid = particle.id();
-      px = particle.px();
-      py = particle.py();
-      pz = particle.pz();
-      e = particle.e();
-      x = particle.xProd();
-      y = particle.yProd();
-      z = particle.zProd();
-      t = particle.tProd();
+      px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e();
+      x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd();
 
       candidate = factory->NewCandidate();
@@ -218 +211 @@
 
       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 = pdgParticle ? pdgParticle->Mass() : -999.9;