Changes in modules/PhotonConversions.cc [341014c:bdfe7f2] in git

File:

• modules/PhotonConversions.cc (modified) (14 diffs)

modules/PhotonConversions.cc

@@ -17 +17 @@
  */
 
+
 /** \class PhotonConversions
  *
@@ -29 +30 @@
 
 #include "classes/DelphesClasses.h"
+#include "classes/DelphesFactory.h"
 #include "classes/DelphesCylindricalFormula.h"
-#include "classes/DelphesFactory.h"
-
+
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootResult.h"
-
+
+#include "TMath.h"
+#include "TF1.h"
+#include "TString.h"
+#include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
 #include "TDatabasePDG.h"
-#include "TF1.h"
-#include "TFormula.h"
 #include "TLorentzVector.h"
-#include "TMath.h"
-#include "TObjArray.h"
-#include "TRandom3.h"
-#include "TString.h"
 #include "TVector3.h"
 
 #include <algorithm>
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -58 +59 @@
   fItInputArray(0), fConversionMap(0), fDecayXsec(0)
 {
-  fDecayXsec = new TF1("decayXsec", "1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0);
+  fDecayXsec = new TF1("decayXsec","1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0);
   fConversionMap = new DelphesCylindricalFormula;
 }
@@ -73 +74 @@
 {
   fRadius = GetDouble("Radius", 1.0);
-  fRadius2 = fRadius * fRadius;
+  fRadius2 = fRadius*fRadius;
 
   fHalfLength = GetDouble("HalfLength", 3.0);
@@ -121 +122 @@
 
   fItInputArray->Reset();
-  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
 
@@ -132 +133 @@
       candidatePosition = candidate->Position;
       candidateMomentum = candidate->Momentum;
-      x = candidatePosition.X() * 1.0E-3;
-      y = candidatePosition.Y() * 1.0E-3;
-      z = candidatePosition.Z() * 1.0E-3;
+      x = candidatePosition.X()*1.0E-3;
+      y = candidatePosition.Y()*1.0E-3;
+      z = candidatePosition.Z()*1.0E-3;
 
       // check that particle position is inside the cylinder
@@ -151 +152 @@
 
       // solve pt2*t^2 + 2*(px*x + py*y)*t - (fRadius2 - x*x - y*y) = 0
-      tmp = px * y - py * x;
-      discr2 = pt2 * fRadius2 - tmp * tmp;
+      tmp = px*y - py*x;
+      discr2 = pt2*fRadius2 - tmp*tmp;
 
       if(discr2 < 0.0)
@@ -160 +161 @@
       }
 
-      tmp = px * x + py * y;
+      tmp = px*x + py*y;
       discr = TMath::Sqrt(discr2);
-      t1 = (-tmp + discr) / pt2;
-      t2 = (-tmp - discr) / pt2;
+      t1 = (-tmp + discr)/pt2;
+      t2 = (-tmp - discr)/pt2;
       t = (t1 < 0.0) ? t2 : t1;
 
-      z_t = z + pz * t;
+      z_t = z + pz*t;
       if(TMath::Abs(z_t) > fHalfLength)
       {
@@ -175 +176 @@
 
       // final position
-      x_t = x + px * t;
-      y_t = y + py * t;
-      z_t = z + pz * t;
-
-      r_t = TMath::Sqrt(x_t * x_t + y_t * y_t + z_t * z_t);
+      x_t = x + px*t;
+      y_t = y + py*t;
+      z_t = z + pz*t;
+
+      r_t = TMath::Sqrt(x_t*x_t + y_t*y_t + z_t*z_t);
+
 
       // here starts conversion code
-      nsteps = Int_t(r_t / fStep);
+      nsteps = Int_t(r_t/fStep);
 
       x_i = x;
@@ -188 +190 @@
       z_i = z;
 
-      dt = t / nsteps;
+      dt = t/nsteps;
 
       converted = false;
@@ -194 +196 @@
       for(i = 0; i < nsteps; ++i)
       {
-        x_i += px * dt;
-        y_i += py * dt;
-        z_i += pz * dt;
-        pos_i.SetXYZ(x_i, y_i, z_i);
+        x_i += px*dt;
+        y_i += py*dt;
+        z_i += pz*dt;
+        pos_i.SetXYZ(x_i,y_i,z_i);
 
         // convert photon position into cylindrical coordinates, cylindrical r,phi,z !!
 
-        r_i = TMath::Sqrt(x_i * x_i + y_i * y_i);
+        r_i = TMath::Sqrt(x_i*x_i + y_i*y_i);
         phi_i = pos_i.Phi();
 
@@ -208 +210 @@
 
         // convert into conversion probability
-        p_conv = 1 - TMath::Exp(-7.0 / 9.0 * fStep * rate);
+        p_conv = 1 - TMath::Exp(-7.0/9.0*fStep*rate);
 
         // case conversion occurs
@@ -219 +221 @@
           x2 = 1 - x1;
 
-          ep = static_cast<Candidate *>(candidate->Clone());
-          em = static_cast<Candidate *>(candidate->Clone());
-
-          ep->Position.SetXYZT(x_i * 1.0E3, y_i * 1.0E3, z_i * 1.0E3, candidatePosition.T() + nsteps * dt * e * 1.0E3);
-          em->Position.SetXYZT(x_i * 1.0E3, y_i * 1.0E3, z_i * 1.0E3, candidatePosition.T() + nsteps * dt * e * 1.0E3);
-
-          ep->Momentum.SetPtEtaPhiE(x1 * pt, eta, phi, x1 * e);
-          em->Momentum.SetPtEtaPhiE(x2 * pt, eta, phi, x2 * e);
+          ep = static_cast<Candidate*>(candidate->Clone());
+          em = static_cast<Candidate*>(candidate->Clone());
+
+          ep->Position.SetXYZT(x_i*1.0E3, y_i*1.0E3, z_i*1.0E3, candidatePosition.T() + nsteps*dt*e*1.0E3);
+          em->Position.SetXYZT(x_i*1.0E3, y_i*1.0E3, z_i*1.0E3, candidatePosition.T() + nsteps*dt*e*1.0E3);
+
+          ep->Momentum.SetPtEtaPhiE(x1*pt, eta, phi, x1*e);
+          em->Momentum.SetPtEtaPhiE(x2*pt, eta, phi, x2*e);
 
           ep->PID = -11;
@@ -249 +251 @@
 
 //------------------------------------------------------------------------------
+