diff --git a/NPLib/IORoot/RootOutput.cxx b/NPLib/IORoot/RootOutput.cxx index d1aa9dc4776893fcf2142633b6a0c81c54740fe2..4a9c69bff3fd4086f7f323a021dde1357c104b79 100644 --- a/NPLib/IORoot/RootOutput.cxx +++ b/NPLib/IORoot/RootOutput.cxx @@ -107,6 +107,7 @@ void RootOutput::InitAsciiFiles() // Analysis configuration files pAnalysisConfigFile = new TAsciiFile(); + pAnalysisConfigFile->SetNameTitle("AnalysisConfig", "AnalysisConfig"); } @@ -121,17 +122,13 @@ RootOutput::~RootOutput() // write TAsciiFile if used // EventGenerator - TString EGName = pEventGenerator->GetName(); - if (!EGName.IsNull()) pEventGenerator->Write(); + if (!pEventGenerator->IsEmpty()) pEventGenerator->Write(); // DetectorConfiguration - TString DCName = pDetectorConfiguration->GetName(); - if (!DCName.IsNull()) pDetectorConfiguration->Write(); + if (!pDetectorConfiguration->IsEmpty()) pDetectorConfiguration->Write(); // CalibrationFile - TString CFName = pCalibrationFile->GetName(); - if (!CFName.IsNull()) pCalibrationFile->Write(); + if (!pCalibrationFile->IsEmpty()) pCalibrationFile->Write(); // RunToTreatFile - TString RTName = pRunToTreatFile->GetName(); - if (!RTName.IsNull()) pRunToTreatFile->Write(); + if (!pRunToTreatFile->IsEmpty()) pRunToTreatFile->Write(); // Analysis ConfigFile if (!pAnalysisConfigFile->IsEmpty()) pAnalysisConfigFile->Write(); diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx index 74e0d34151ccdff794595e00d4b2f19611321d7e..9742a6e26fe404ad1b43f17c0c652ca490b69f45 100644 --- a/NPLib/MUST2/TMust2Physics.cxx +++ b/NPLib/MUST2/TMust2Physics.cxx @@ -554,9 +554,12 @@ void TMust2Physics::ReadAnalysisConfig() return; } cout << " Loading user parameter for Analysis from ConfigMust2.dat " << endl; + + // Save it in a TAsciiFile TAsciiFile* asciiConfig = RootOutput::getInstance()->GetAsciiFileAnalysisConfig(); + asciiConfig->AppendLine("%%% ConfigMust2.dat %%%"); asciiConfig->Append(FileName.c_str()); - + asciiConfig->AppendLine(""); // read analysis config file string LineBuffer,DataBuffer,whatToDo; while (!AnalysisConfigFile.eof()) { diff --git a/NPLib/SSSD/TSSSDPhysics.cxx b/NPLib/SSSD/TSSSDPhysics.cxx index 8c6197d565a696a255fa211c76b41009aacbda53..f7af8c0515a8985d36e774e953382b7d930d0886 100644 --- a/NPLib/SSSD/TSSSDPhysics.cxx +++ b/NPLib/SSSD/TSSSDPhysics.cxx @@ -366,7 +366,13 @@ void TSSSDPhysics::ReadAnalysisConfig() return; } cout << " Loading user parameter for Analysis from ConfigSSSD.dat " << endl; - + + // Save it in a TAsciiFile + TAsciiFile* asciiConfig = RootOutput::getInstance()->GetAsciiFileAnalysisConfig(); + asciiConfig->AppendLine("%%% ConfigSSSD.dat %%%"); + asciiConfig->Append(FileName.c_str()); + asciiConfig->AppendLine(""); + // read analysis config file string LineBuffer,DataBuffer,whatToDo; while (!AnalysisConfigFile.eof()) {