From 47ea230448db5d5ed9d3bc821375fd63d8e4449b Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Thu, 17 Feb 2011 22:29:48 +0000
Subject: [PATCH] * Removing alod ref to calibration manager in NPA project *
renaming Must2Scorer to MUST2Scorer in NPS
---
NPAnalysis/10He_Riken/Analysis.cxx | 3 ---
NPAnalysis/Gaspard/Analysis.cxx | 1 -
NPAnalysis/Hyde/Analysis.cxx | 1 -
NPAnalysis/Paris/Analysis.cxx | 1 -
NPAnalysis/RRC66/Analysis.cxx | 1 -
NPAnalysis/W1/Analysis.cxx | 1 -
NPAnalysis/must2/Analysis.cxx | 7 -------
NPAnalysis/sssd/Analysis.cxx | 1 -
NPSimulation/src/MUST2Array.cc | 2 +-
NPSimulation/src/Must2Scorers.cc | 2 +-
10 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/NPAnalysis/10He_Riken/Analysis.cxx b/NPAnalysis/10He_Riken/Analysis.cxx
index 0bef83e13..337854f57 100644
--- a/NPAnalysis/10He_Riken/Analysis.cxx
+++ b/NPAnalysis/10He_Riken/Analysis.cxx
@@ -26,7 +26,6 @@ int main(int argc,char** argv)
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Instantiate some Reaction
@@ -40,8 +39,6 @@ int main(int argc,char** argv)
NPA::DetectorManager* myDetector = new DetectorManager ;
myDetector -> ReadConfigurationFile(detectorfileName) ;
- // Instantiate the Calibration Manger using a file
- CalibrationManager* myCalibration = CalibrationManager::getInstance(calibrationfileName) ;
// Attach more branch to the output
diff --git a/NPAnalysis/Gaspard/Analysis.cxx b/NPAnalysis/Gaspard/Analysis.cxx
index 01edddb46..87c382706 100644
--- a/NPAnalysis/Gaspard/Analysis.cxx
+++ b/NPAnalysis/Gaspard/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Initialize the reaction
diff --git a/NPAnalysis/Hyde/Analysis.cxx b/NPAnalysis/Hyde/Analysis.cxx
index ad9f68460..1d37c5332 100644
--- a/NPAnalysis/Hyde/Analysis.cxx
+++ b/NPAnalysis/Hyde/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Initialize the reaction
diff --git a/NPAnalysis/Paris/Analysis.cxx b/NPAnalysis/Paris/Analysis.cxx
index 634cfa7d1..9b10c2a0c 100644
--- a/NPAnalysis/Paris/Analysis.cxx
+++ b/NPAnalysis/Paris/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Initialize the reaction
diff --git a/NPAnalysis/RRC66/Analysis.cxx b/NPAnalysis/RRC66/Analysis.cxx
index a1fd58ebb..4fd81654b 100644
--- a/NPAnalysis/RRC66/Analysis.cxx
+++ b/NPAnalysis/RRC66/Analysis.cxx
@@ -18,7 +18,6 @@ int main(int argc, char** argv)
// get input files from NPOptionManager
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Instantiate RootOutput
diff --git a/NPAnalysis/W1/Analysis.cxx b/NPAnalysis/W1/Analysis.cxx
index 26aec0473..558d068b2 100644
--- a/NPAnalysis/W1/Analysis.cxx
+++ b/NPAnalysis/W1/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Initialize the reaction
diff --git a/NPAnalysis/must2/Analysis.cxx b/NPAnalysis/must2/Analysis.cxx
index 0f7d002f1..7c69e2d4e 100644
--- a/NPAnalysis/must2/Analysis.cxx
+++ b/NPAnalysis/must2/Analysis.cxx
@@ -31,7 +31,6 @@ int main(int argc,char** argv)
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Instantiate some Reaction
@@ -39,9 +38,6 @@ int main(int argc,char** argv)
NPL::Reaction* myReaction = new Reaction();
myReaction->ReadConfigurationFile(reactionfileName);
- // Instantiate the Calibration Manger using a file (WARNING:prior to the detector instantiation)
- CalibrationManager* myCalibration = CalibrationManager::getInstance(calibrationfileName) ;
-
// Instantiate the detector using a file
NPA::DetectorManager* myDetector = new DetectorManager();
myDetector->ReadConfigurationFile(detectorfileName);
@@ -60,9 +56,6 @@ int main(int argc,char** argv)
// Set energy beam at target middle
myReaction->SetBeamEnergy(BeamEnergy);
myReaction->Print();
-
- // Ask the detector manager to load the parameter added by the detector in the calibrationfileName
- myCalibration->LoadParameterFromFile() ;
// Attach more branch to the output
const int mult = 2;
diff --git a/NPAnalysis/sssd/Analysis.cxx b/NPAnalysis/sssd/Analysis.cxx
index b5b590d36..9dce1f6dd 100644
--- a/NPAnalysis/sssd/Analysis.cxx
+++ b/NPAnalysis/sssd/Analysis.cxx
@@ -18,7 +18,6 @@ int main(int argc, char** argv)
// get input files from NPOptionManager
string detectorfileName = myOptionManager->GetDetectorFile();
- string calibrationfileName = myOptionManager->GetCalibrationFile();
string OutputfileName = myOptionManager->GetOutputFile();
// Instantiate RootOutput
diff --git a/NPSimulation/src/MUST2Array.cc b/NPSimulation/src/MUST2Array.cc
index e55ea8bf1..1b39c9db6 100644
--- a/NPSimulation/src/MUST2Array.cc
+++ b/NPSimulation/src/MUST2Array.cc
@@ -43,7 +43,7 @@
//G4 sensitive
#include "GeneralScorers.hh"
-#include "Must2Scorers.hh"
+#include "MUST2Scorers.hh"
//Not G4
#include "RootOutput.h"
diff --git a/NPSimulation/src/Must2Scorers.cc b/NPSimulation/src/Must2Scorers.cc
index d00f95e7a..b94747015 100644
--- a/NPSimulation/src/Must2Scorers.cc
+++ b/NPSimulation/src/Must2Scorers.cc
@@ -22,7 +22,7 @@
* a global ID for each event you should not use those scorer with some G4 *
* provided ones or being very carefull doing so. *
*****************************************************************************/
-#include "Must2Scorers.hh"
+#include "MUST2Scorers.hh"
#include "G4UnitsTable.hh"
#include "GeneralScorers.hh"
#include <string>
--
GitLab