From 64839d60fdfb0a3ac800b054cf05abcf15e68cd8 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Mon, 7 Feb 2011 20:30:49 +0000
Subject: [PATCH] * Now save analysis Config for MUST2 and SSSD
---
NPLib/IORoot/RootOutput.cxx | 13 +++++--------
NPLib/MUST2/TMust2Physics.cxx | 5 ++++-
NPLib/SSSD/TSSSDPhysics.cxx | 8 +++++++-
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/NPLib/IORoot/RootOutput.cxx b/NPLib/IORoot/RootOutput.cxx
index d1aa9dc47..4a9c69bff 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 74e0d3415..9742a6e26 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 8c6197d56..f7af8c051 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()) {
--
GitLab