Move tStartingValue to its own header.

aaust · Oct 10, 2011 · 70806e9 · 70806e9
1 parent f76394b
commit 70806e9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ clean:
 .cc.o:
 	g++ -c ${CXXFLAGS} $< -o $@
 
-myFit.o: myFit.cc control.h wave.h likelihood.h gHist.h
+myFit.o: myFit.cc control.h wave.h likelihood.h gHist.h startingValue.h
 control.o: control.cc control.h
 wave.o: wave.cc wave.h event.h
 event.o: event.cc event.h

diff --git a/myFit.cc b/myFit.cc
@@ -23,6 +23,7 @@ using namespace std;
 #include "3j.h"
 #include "event.h"
 #include "likelihood.h"
+#include "startingValue.h"
 #include "gHist.h"
 
 #define NFLATMCEVENTS 100000
@@ -113,16 +114,6 @@ class combinedLikelihood : public ROOT::Minuit2::FCNBase {
   size_t getNChannels() const { return myLs.size(); }
 };
 
-struct tStartingValue {
-  string name;
-  Double_t value;
-  bool fixed;
-
-  tStartingValue(const string& n, Double_t v, bool f)
-    : name(n), value(v), fixed(f)
-  {}
-};
-
 
 void
 fillRDhists(const event& e)

diff --git a/startingValue.h b/startingValue.h
@@ -0,0 +1,18 @@
+#ifndef STARTINGVALUE_H__
+#define STARTINGVALUE_H__
+
+#include <string>
+
+#include "Rtypes.h" // for Double_t
+
+struct tStartingValue {
+  std::string name;
+  Double_t value;
+  bool fixed;
+
+  tStartingValue(const std::string& n, Double_t v, bool f)
+    : name(n), value(v), fixed(f)
+  {}
+};
+
+#endif