diff --git a/NPLib/IORoot/RootInput.cxx b/NPLib/IORoot/RootInput.cxx index 55d13fcdeac0582205ecc82ef34db7ea63689e60..3590f7c9445640b5b40f6aa3f6743b135deef94e 100644 --- a/NPLib/IORoot/RootInput.cxx +++ b/NPLib/IORoot/RootInput.cxx @@ -216,6 +216,7 @@ string RootInput::DumpAsciiFile(const char* type, const char* folder) else name = sfolder + "/" + title; aFile->WriteToFile(name.c_str()); } + else if (stype == "DetectorConfiguration") { TAsciiFile *aFile = (TAsciiFile*)pRootFile->Get(stype.c_str()); // build file name @@ -225,8 +226,17 @@ string RootInput::DumpAsciiFile(const char* type, const char* folder) else name = sfolder + "/" + title; aFile->WriteToFile(name.c_str()); } + else if (stype == "Calibration") { + TAsciiFile *aFile = (TAsciiFile*)pRootFile->Get(stype.c_str()); + // build file name + string title = aFile->GetTitle(); + unsigned int pos = title.rfind("/"); + if (pos != string::npos) name = sfolder + title.substr(pos); + else name = sfolder + "/" + title; + aFile->WriteToFile(name.c_str()); } + else if (stype == "RunToTreat") { } else { diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx index 143a5449f47b52a39b96798568fcdcdf494f9190..a4bd87c9490da018522574d4a4193cc04ced3fe3 100644 --- a/NPLib/MUST2/TMust2Physics.cxx +++ b/NPLib/MUST2/TMust2Physics.cxx @@ -31,7 +31,7 @@ using namespace MUST2_LOCAL; // NPL #include "RootInput.h" #include "RootOutput.h" - +#include "TAsciiFile.h" // ROOT #include "TChain.h" /////////////////////////////////////////////////////////////////////////// @@ -554,7 +554,9 @@ void TMust2Physics::ReadAnalysisConfig() return; } cout << " Loading user parameter for Analysis from ConfigMust2.dat " << endl; - + TAsciiFile* asciiConfig = RootOutput::getInstance->GetAsciiFileAnalysisConfig(); + asciiConfig->Append(FileName.c_str()); + // read analysis config file string LineBuffer,DataBuffer,whatToDo; while (!AnalysisConfigFile.eof()) { diff --git a/NPLib/Tools/TAsciiFile.h b/NPLib/Tools/TAsciiFile.h index a448b9a1794cfaf0cbf97bfe8d3ebfe55030fe77..5604476704af387ea14cd8298060c57e0cb35d34 100644 --- a/NPLib/Tools/TAsciiFile.h +++ b/NPLib/Tools/TAsciiFile.h @@ -50,6 +50,8 @@ class TAsciiFile : public TNamed { void Print(const Option_t*) const {}; void Print() const; void Print(UInt_t begin, UInt_t end) const; + bool IsEmpty () {if (fLines.size()!=0) return true; + else return false ;} ClassDef(TAsciiFile, 1); // Class TAsciiFile for storing ascii text };