Changes in modules/Hector.cc [341014c:cab38f6] in git

File:

• modules/Hector.cc (modified) (5 diffs)

modules/Hector.cc

@@ -17 +17 @@
  */
 
+
 /** \class Hector
  *
@@ -31 +32 @@
 #include "classes/DelphesFormula.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 "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>
 
 #include "Hector/H_BeamLine.h"
+#include "Hector/H_RecRPObject.h"
 #include "Hector/H_BeamParticle.h"
-#include "Hector/H_RecRPObject.h"
 
 using namespace std;
@@ -119 +120 @@
 
   fItInputArray->Reset();
-  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
     const TLorentzVector &candidatePosition = candidate->Position;
@@ -131 +132 @@
     z = 1.0E-3 * candidatePosition.Z();
 
-    //    tx = 1.0E6 * TMath::ATan(candidateMomentum.Px()/pz);
-    //    ty = 1.0E6 * TMath::ATan(candidateMomentum.Py()/pz);
+//    tx = 1.0E6 * TMath::ATan(candidateMomentum.Px()/pz);
+//    ty = 1.0E6 * TMath::ATan(candidateMomentum.Py()/pz);
 
     tx = 0.0;
     ty = 0.0;
 
-    theta = TMath::Hypot(TMath::ATan(candidateMomentum.Px() / pz), TMath::ATan(candidateMomentum.Py() / pz));
-    distance = (fDistance - 1.0E-3 * candidatePosition.Z()) / TMath::Cos(theta);
-    time = gRandom->Gaus((distance + 1.0E-3 * candidatePosition.T()) / c_light, fSigmaT);
+    theta = TMath::Hypot(TMath::ATan(candidateMomentum.Px()/pz), TMath::ATan(candidateMomentum.Py()/pz));
+    distance = (fDistance - 1.0E-3 * candidatePosition.Z())/TMath::Cos(theta);
+    time = gRandom->Gaus((distance + 1.0E-3 * candidatePosition.T())/c_light, fSigmaT);
 
     H_BeamParticle particle(candidate->Mass, candidate->Charge);
-    //    particle.set4Momentum(candidateMomentum);
-    particle.set4Momentum(candidateMomentum.Px(), candidateMomentum.Py(),
-      candidateMomentum.Pz(), candidateMomentum.E());
+//    particle.set4Momentum(candidateMomentum);
+    particle.set4Momentum(candidateMomentum.Px(), candidateMomentum.Py(), 
+                          candidateMomentum.Pz(), candidateMomentum.E());
     particle.setPosition(x, y, tx, ty, z);
 
@@ -157 +158 @@
 
     mother = candidate;
-    candidate = static_cast<Candidate *>(candidate->Clone());
+    candidate = static_cast<Candidate*>(candidate->Clone());
     candidate->Position.SetXYZT(particle.getX(), particle.getY(), particle.getS(), time);
     candidate->Momentum.SetPxPyPzE(particle.getTX(), particle.getTY(), 0.0, particle.getE());