diff --git a/src/classes/PStartupHandler.cpp b/src/classes/PStartupHandler.cpp index 5660ea88..6ce00364 100644 --- a/src/classes/PStartupHandler.cpp +++ b/src/classes/PStartupHandler.cpp @@ -178,10 +178,6 @@ void PStartupHandler::OnStartDocument() fFourierDefaults.fPlotRange[0] = -1.0; fFourierDefaults.fPlotRange[1] = -1.0; fFourierDefaults.fPhaseIncrement = 1.0; - - fStartupOptions.writeExpectedChisq = false; - fStartupOptions.estimateN0 = true; - fStartupOptions.alphaEstimateN0 = 0.0; } //-------------------------------------------------------------------------- @@ -210,12 +206,6 @@ void PStartupHandler::OnStartElement(const Char_t *str, const TList *attributes) { if (!strcmp(str, "data_path")) { fKey = eDataPath; - } else if (!strcmp(str, "write_per_run_block_chisq")) { - fKey = eWritePerRunBlockChisq; - } else if (!strcmp(str, "estimate_n0")) { - fKey = eEstimateN0; - } else if (!strcmp(str, "alpha_estimate_n0")) { - fKey = eAlphaEstimateN0; } else if (!strcmp(str, "marker")) { fKey = eMarker; } else if (!strcmp(str, "color")) { @@ -270,21 +260,6 @@ void PStartupHandler::OnCharacters(const Char_t *str) // add str to the path list fDataPathList.push_back(str); break; - case eWritePerRunBlockChisq: - tstr = TString(str); - if (tstr.BeginsWith("y") || tstr.BeginsWith("Y")) - fStartupOptions.writeExpectedChisq = true; - break; - case eEstimateN0: - tstr = TString(str); - if (tstr.BeginsWith("n") || tstr.BeginsWith("N")) - fStartupOptions.estimateN0 = false; - break; - case eAlphaEstimateN0: - tstr = TString(str); - if (tstr.IsFloat()) - fStartupOptions.alphaEstimateN0 = tstr.Atof(); - break; case eMarker: // check that str is a number tstr = TString(str); diff --git a/src/include/PMusr.h b/src/include/PMusr.h index 96df487f..d093cbfa 100644 --- a/src/include/PMusr.h +++ b/src/include/PMusr.h @@ -815,12 +815,11 @@ typedef struct { //------------------------------------------------------------- /** - *
Holds the informations for the any2many converter program + *
Holds the informations
*/
typedef struct {
Bool_t writeExpectedChisq; ///< if set to true, expected chisq per block will be written
Bool_t estimateN0; ///< if set to true, for single histogram fits N0 will be estimated
- Double_t alphaEstimateN0; ///< relates the Bkg to N0, i.e. Bkg = alpha*N0
} PStartupOptions;
//-------------------------------------------------------------
diff --git a/src/include/PStartupHandler.h b/src/include/PStartupHandler.h
index 9125a67b..89602014 100644
--- a/src/include/PStartupHandler.h
+++ b/src/include/PStartupHandler.h
@@ -73,17 +73,15 @@ class PStartupHandler : public TObject, public TQObject
virtual void CheckLists();
- virtual PStartupOptions* GetStartupOptions() { return &fStartupOptions; } ///< returns the startup options
virtual PMsrFourierStructure GetFourierDefaults() { return fFourierDefaults; } ///< returns the Fourier defaults
virtual const PStringVector GetDataPathList() const { return fDataPathList; } ///< returns the search data path list
virtual const PIntVector GetMarkerList() const { return fMarkerList; } ///< returns the marker list
virtual const PIntVector GetColorList() const { return fColorList; } ///< returns the color list
- virtual void SetStartupOptions(const PStartupOptions opt) { fStartupOptions = opt; }
-
private:
- enum EKeyWords {eEmpty, eComment, eDataPath, eOptions, eWritePerRunBlockChisq, eEstimateN0, eAlphaEstimateN0,
- eFourierSettings, eUnits, eFourierPower, eApodization, ePlot, ePhase, ePhaseIncrement,
+ enum EKeyWords {eEmpty, eComment, eDataPath, eOptions,
+ eFourierSettings, eUnits, eFourierPower,
+ eApodization, ePlot, ePhase, ePhaseIncrement,
eRootSettings, eMarkerList, eMarker,
eColorList, eColor};
EKeyWords fKey; ///< xml filter key
@@ -94,7 +92,6 @@ class PStartupHandler : public TObject, public TQObject
PStringVector fDataPathList; ///< search data path list
PIntVector fMarkerList; ///< marker list
PIntVector fColorList; ///< color list
- PStartupOptions fStartupOptions; ///< collects all startup options which will be requested by PMsrFileHandler
Bool_t StartupFileExists(Char_t *fln);
diff --git a/src/musrfit.cpp b/src/musrfit.cpp
index 0bb0bd2d..aa6200a1 100644
--- a/src/musrfit.cpp
+++ b/src/musrfit.cpp
@@ -104,9 +104,8 @@ void musrfit_syntax()
cout << endl << " -t, --title-from-data-file: will replace the