From 042755046813332e10e6007995bf712bcbc09211 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Fri, 11 Feb 2011 20:06:24 +0000
Subject: [PATCH] * Modify Template so it effectively read the Calibration
---
Inputs/DetectorConfiguration/Riken_65mm.detector | 2 +-
NPAnalysis/Template/src/Analysis.cc | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector
index 4b8151dd7..6e6994315 100644
--- a/Inputs/DetectorConfiguration/Riken_65mm.detector
+++ b/Inputs/DetectorConfiguration/Riken_65mm.detector
@@ -128,7 +128,7 @@ VIS= all
%%%%%%%%%%%%%%%%%%%%%
-%AddThinSi
+AddThinSi
%%%%%%%%%% Det 1 %%%%%%%%
ThinSi
A= 17.61 9.85 104.11
diff --git a/NPAnalysis/Template/src/Analysis.cc b/NPAnalysis/Template/src/Analysis.cc
index 786355c53..5a12b578d 100644
--- a/NPAnalysis/Template/src/Analysis.cc
+++ b/NPAnalysis/Template/src/Analysis.cc
@@ -17,21 +17,22 @@ int main(int argc, char** argv)
myOptionManager->SetDetectorFile(name);
}
- // Instantiate RootOutput
- RootOutput::getInstance("Analysis/Template_AnalyzedData", "AnalysedTree");
+
// get input files from NPOptionManager
string detectorfileName = myOptionManager->GetDetectorFile();
string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
-
+
+ // Instantiate RootOutput
+ RootOutput::getInstance("Analysis/"+OutputfileName, "AnalysedTree");
// Instantiate the Calibration Manger using a file
CalibrationManager* myCalibration = CalibrationManager::getInstance(calibrationfileName);
// Instantiate the detector using a file
NPA::DetectorManager* myDetector = new DetectorManager();
myDetector->ReadConfigurationFile(detectorfileName);
-
+ myCalibration->LoadParameterFromFile();
// Get the formed Chained Tree and Treat it
TChain* Chain = RootInput:: getInstance() -> GetChain();
--
GitLab