Changes in display/Delphes3DGeometry.cc [f53a4d2:1fa50c2] in git

File:

• display/Delphes3DGeometry.cc (modified) (6 diffs)

display/Delphes3DGeometry.cc

@@ -17 +17 @@
  */
 
+#include "display/Delphes3DGeometry.h"
 #include <set>
 #include <map>
@@ -24 +25 @@
 #include <sstream>
 #include <cassert>
-
-#include "TAxis.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
@@ -35 +34 @@
 #include "TGeoCone.h"
 #include "TGeoArb8.h"
+#include "external/ExRootAnalysis/ExRootConfReader.h"
+#include "classes/DelphesClasses.h"
 #include "TF2.h"
-#include "TFormula.h"
 #include "TH1F.h"
 #include "TMath.h"
-#include "TString.h"
-
-#include "display/Delphes3DGeometry.h"
-
-#include "classes/DelphesClasses.h"
-#include "external/ExRootAnalysis/ExRootConfReader.h"
 
 using namespace std;
@@ -96 +90 @@
    tk_length_ = confReader->GetDouble(Form("%s::HalfLength",ParticlePropagator), 3.0)*100.;     // tk_length
    tk_Bz_     = confReader->GetDouble("ParticlePropagator::Bz", 0.0);                           // tk_Bz
-   
-   TString buffer;
-   const char *it;
- 
-   
+
    {
    TString tkEffFormula = confReader->GetString(Form("%s::EfficiencyFormula",TrackingEfficiency),"abs(eta)<3.0");
@@ -106 +96 @@
    tkEffFormula.ReplaceAll("eta","y");
    tkEffFormula.ReplaceAll("phi","0.");
- 
-   buffer.Clear();
-   for(it = tkEffFormula.Data(); *it; ++it)
-   {
-     if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.Append(*it);
-   }
-
-   TF2* tkEffFunction = new TF2("tkEff",buffer,0,1000,-10,10);
+   TF2* tkEffFunction = new TF2("tkEff",tkEffFormula,0,1000,-10,10);
    TH1F etaHisto("eta","eta",100,5.,-5.);
    Double_t pt,eta;
@@ -136 +118 @@
    muonEffFormula.ReplaceAll("eta","y");
    muonEffFormula.ReplaceAll("phi","0.");
-   
-   buffer.Clear();
-   for(it = muonEffFormula.Data(); *it; ++it)
-   {
-     if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.Append(*it);
-   }
-
-   TF2* muEffFunction = new TF2("muEff",buffer,0,1000,-10,10);
+   TF2* muEffFunction = new TF2("muEff",muonEffFormula,0,1000,-10,10);
    TH1F etaHisto("eta2","eta2",100,5.,-5.);
    Double_t pt,eta;