Changeset f53a4d2 in git for display/Delphes3DGeometry.cc

Timestamp:

Jun 26, 2015, 11:17:38 AM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

28027d5, d38348d

Parents:

c9803f7

Message:

adapt EventDisplay to ROOT 6.04

File:

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

display/Delphes3DGeometry.cc

@@ -17 +17 @@
  */
 
-#include "display/Delphes3DGeometry.h"
 #include <set>
 #include <map>
-#include <string>
 #include <utility>
 #include <vector>
@@ -26 +24 @@
 #include <sstream>
 #include <cassert>
+
+#include "TAxis.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
@@ -35 +35 @@
 #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;
@@ -93 +97 @@
    tk_Bz_     = confReader->GetDouble("ParticlePropagator::Bz", 0.0);                           // tk_Bz
    
-   string buffer;
+   TString buffer;
    const char *it;
  
@@ -103 +107 @@
    tkEffFormula.ReplaceAll("phi","0.");
  
+   buffer.Clear();
    for(it = tkEffFormula.Data(); *it; ++it)
    {
      if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.push_back(*it);
-   }
-
-   TF2* tkEffFunction = new TF2("tkEff",buffer.c_str(),0,1000,-10,10);
+     buffer.Append(*it);
+   }
+
+   TF2* tkEffFunction = new TF2("tkEff",buffer,0,1000,-10,10);
    TH1F etaHisto("eta","eta",100,5.,-5.);
    Double_t pt,eta;
@@ -132 +137 @@
    muonEffFormula.ReplaceAll("phi","0.");
    
-   buffer.clear();
+   buffer.Clear();
    for(it = muonEffFormula.Data(); *it; ++it)
    {
      if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.push_back(*it);
-   }
-
-   TF2* muEffFunction = new TF2("muEff",buffer.c_str(),0,1000,-10,10);
+     buffer.Append(*it);
+   }
+
+   TF2* muEffFunction = new TF2("muEff",buffer,0,1000,-10,10);
    TH1F etaHisto("eta2","eta2",100,5.,-5.);
    Double_t pt,eta;