Changeset 4d753a1 in git for modules

Timestamp:

Dec 19, 2014, 11:43:21 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

2b900b8

Parents:

764f12a0

Message:

remove unneeded variables and fix formatting

File:

• modules/ImpactParameterSmearing.cc (modified) (3 diffs)

modules/ImpactParameterSmearing.cc

@@ -24 +24 @@
  *
  */
- 
+
 
 #include "modules/ImpactParameterSmearing.h"
@@ -44 +44 @@
 #include "TLorentzVector.h"
 
-#include <algorithm> 
+#include <algorithm>
 #include <stdexcept>
 #include <iostream>
@@ -96 +96 @@
 {
   Candidate *candidate, *particle, *mother;
-  Double_t xd, yd, zd, dxy, dz, sx, sy, sz, ddxy, ddz;
-  Double_t pt, eta, px, py, ang_mom;
-
- // cout<<"New event"<<endl;
+  Double_t xd, yd, zd, dxy, sx, sy, sz, ddxy;
+  Double_t pt, eta, px, py;
 
   fItInputArray->Reset();
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
-  
-    //take momentum before smearing (otherwise apply double smearing on dxy)
+
+    // take momentum before smearing (otherwise apply double smearing on dxy)
     particle = static_cast<Candidate*>(candidate->GetCandidates()->At(0));
-  
+
     const TLorentzVector &candidateMomentum = particle->Momentum;
-    //  const TLorentzVector &candidateMomentum = candidate->Momentum;
-    
+
     eta = candidateMomentum.Eta();
     pt = candidateMomentum.Pt();
     px = candidateMomentum.Px();
     py = candidateMomentum.Py();
-      
+
     // calculate coordinates of closest approach to track circle in transverse plane xd, yd, zd
     xd =  candidate->Xd;
     yd =  candidate->Yd;
     zd =  candidate->Zd;
-   
-    // calculate smeared values   
-    sx = gRandom->Gaus(0,fFormula->Eval(pt, eta));
-    sy = gRandom->Gaus(0,fFormula->Eval(pt, eta));
-    sz = gRandom->Gaus(0,fFormula->Eval(pt, eta));
-     
+
+    // calculate smeared values
+    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+
     xd += sx;
     yd += sy;
-    zd += sz; 
-     
-    // calculate impact paramater (after-smearing)
-    ang_mom = (xd*py - yd*px);
-    dxy = ang_mom/pt;
-    dz = zd;
-  
-    ddxy = gRandom->Gaus(0,fFormula->Eval(pt, eta));
-    ddz = gRandom->Gaus(0,fFormula->Eval(pt, eta));
-  
-    //fill smeared values in candidate
+    zd += sz;
+
+    // calculate impact parameter (after-smearing)
+    dxy = (xd*py - yd*px)/pt;
+
+    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+
+    // fill smeared values in candidate
     mother = candidate;
-    
+
     candidate = static_cast<Candidate*>(candidate->Clone());
     candidate->Xd = xd;
     candidate->Yd = yd;
     candidate->Zd = zd;
-    
+
     candidate->Dxy = dxy;
     candidate->SDxy = ddxy;
-      
+
     candidate->AddCandidate(mother);
     fOutputArray->Add(candidate);