Changeset dd514ae in git for display/Delphes3DGeometry.cc

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict in DelphesClasses.h

File:

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

display/Delphes3DGeometry.cc

@@ -20 +20 @@
 #include <set>
 #include <map>
+#include <string>
 #include <utility>
 #include <vector>
@@ -37 +38 @@
 #include "classes/DelphesClasses.h"
 #include "TF2.h"
+#include "TFormula.h"
 #include "TH1F.h"
 #include "TMath.h"
@@ -90 +92 @@
    tk_length_ = confReader->GetDouble(Form("%s::HalfLength",ParticlePropagator), 3.0)*100.;     // tk_length
    tk_Bz_     = confReader->GetDouble("ParticlePropagator::Bz", 0.0);                           // tk_Bz
-
+   
+   string buffer;
+   const char *it;
+ 
+   
    {
    TString tkEffFormula = confReader->GetString(Form("%s::EfficiencyFormula",TrackingEfficiency),"abs(eta)<3.0");
@@ -96 +102 @@
    tkEffFormula.ReplaceAll("eta","y");
    tkEffFormula.ReplaceAll("phi","0.");
-   TF2* tkEffFunction = new TF2("tkEff",tkEffFormula,0,1000,-10,10);
+ 
+   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);
    TH1F etaHisto("eta","eta",100,5.,-5.);
    Double_t pt,eta;
@@ -118 +131 @@
    muonEffFormula.ReplaceAll("eta","y");
    muonEffFormula.ReplaceAll("phi","0.");
-   TF2* muEffFunction = new TF2("muEff",muonEffFormula,0,1000,-10,10);
+   
+   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);
    TH1F etaHisto("eta2","eta2",100,5.,-5.);
    Double_t pt,eta;