Changeset 0ed696f in git for modules/PileUpMerger.cc

Timestamp:

Jan 20, 2014, 12:23:57 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fe179a1

Parents:

e4caec4

Message:

fix formatting in PileUpMerger

File:

• modules/PileUpMerger.cc (modified) (8 diffs)

modules/PileUpMerger.cc

@@ -63 +63 @@
 
   fMeanPileUp  = GetDouble("MeanPileUp", 10);
-  
+
   fZVertexSpread = GetDouble("ZVertexSpread", 0.15);
   fTVertexSpread = GetDouble("TVertexSpread", 1.5E-09);
 
   // read vertex smearing formula
-        
+
   fFunction->Compile(GetString("VertexDistributionFormula", "0.0"));
-  fFunction->SetRange(-fZVertexSpread,-fTVertexSpread,fZVertexSpread,fTVertexSpread);
- 
+  fFunction->SetRange(-fZVertexSpread, -fTVertexSpread, fZVertexSpread, fTVertexSpread);
+
   fileName = GetString("PileUpFile", "MinBias.pileup");
   fReader = new DelphesPileUpReader(fileName);
@@ -105 +105 @@
   Candidate *candidate, *vertexcandidate;
   DelphesFactory *factory;
-  
+
   const Double_t c_light = 2.99792458E8;
 
   fItInputArray->Reset();
-  
-    // --- Deal with Primary vertex first  ------
-  
-  fFunction->GetRandom2(dz,dt);
- 
-  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
-  
+
+  // --- Deal with Primary vertex first  ------
+
+  fFunction->GetRandom2(dz, dt);
+
+  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
+
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
@@ -124 +124 @@
 
   factory = GetFactory();
-  
+
   vertexcandidate = factory->NewCandidate();
   vertexcandidate->Position.SetXYZT(0.0, 0.0, dz, dt);
   fVertexOutputArray->Add(vertexcandidate);
- 
-  
+
   // --- Then with pile-up vertices  ------
- 
+
   switch(fPileUpDistribution)
   {
@@ -146 +145 @@
 
   allEntries = fReader->GetEntries();
- 
+
   for(event = 0; event < numberOfEvents; ++event)
   {
@@ -156 +155 @@
 
     fReader->ReadEntry(entry);
- 
-   // --- Pile-up vertex smearing 
-    
-    fFunction->GetRandom2(dz,dt);
- 
-    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
- 
+
+   // --- Pile-up vertex smearing
+
+    fFunction->GetRandom2(dz, dt);
+
+    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
+
     dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
 
@@ -169 +168 @@
     vertexcandidate->Position.SetXYZT(0.0, 0.0, dz, dt);
     vertexcandidate->IsPU = 1;
-    
+
     fVertexOutputArray->Add(vertexcandidate);
 
@@ -185 +184 @@
 
       candidate->IsPU = 1;
-    
+
       candidate->Momentum.SetPxPyPzE(px, py, pz, e);
       candidate->Momentum.RotateZ(dphi);
@@ -191 +190 @@
       candidate->Position.SetXYZT(x, y, z+dz, t+dt);
       candidate->Position.RotateZ(dphi);
-      
+
       fParticleOutputArray->Add(candidate);
     }