From 31fe5c0dfac508a8b95d87eccd78e243181cd437 Mon Sep 17 00:00:00 2001 From: adrien-matta <a.matta@surrey.ac.uk> Date: Tue, 21 Apr 2015 10:16:34 +0100 Subject: [PATCH] * fixing NPA ref in NPAnalysis project --- NPAnalysis/Example1/Analysis.cxx | 6 +++--- NPAnalysis/Example1/Analysis.h | 4 ++-- NPAnalysis/TAMU/Analysis.cxx | 6 +++--- NPAnalysis/TAMU/Analysis.h | 4 ++-- NPAnalysis/new/Analysis.cxx | 6 +++--- NPAnalysis/new/Analysis.h | 4 ++-- NPAnalysis/newMUGAST/Analysis.cxx | 6 +++--- NPAnalysis/newMUGAST/Analysis.h | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NPAnalysis/Example1/Analysis.cxx b/NPAnalysis/Example1/Analysis.cxx index 0ca09aa68..febc1f594 100644 --- a/NPAnalysis/Example1/Analysis.cxx +++ b/NPAnalysis/Example1/Analysis.cxx @@ -203,8 +203,8 @@ void Analysis::ReInitValue(){ //////////////////////////////////////////////////////////////////////////////// // Construct Method to be pass to the DetectorFactory // //////////////////////////////////////////////////////////////////////////////// -NPA::VAnalysis* Analysis::Construct(){ - return (NPA::VAnalysis*) new Analysis(); +NPL::VAnalysis* Analysis::Construct(){ + return (NPL::VAnalysis*) new Analysis(); } //////////////////////////////////////////////////////////////////////////////// @@ -214,7 +214,7 @@ extern "C"{ class proxy{ public: proxy(){ - NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); + NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); } }; diff --git a/NPAnalysis/Example1/Analysis.h b/NPAnalysis/Example1/Analysis.h index 6537a6a23..d7f368ed3 100644 --- a/NPAnalysis/Example1/Analysis.h +++ b/NPAnalysis/Example1/Analysis.h @@ -29,7 +29,7 @@ #include "NPEnergyLoss.h" #include "NPReaction.h" #include "TRandom3.h" -class Analysis: public NPA::VAnalysis{ +class Analysis: public NPL::VAnalysis{ public: Analysis(); ~Analysis(); @@ -41,7 +41,7 @@ class Analysis: public NPA::VAnalysis{ void InitOutputBranch(); void InitInputBranch(); void ReInitValue(); - static NPA::VAnalysis* Construct(); + static NPL::VAnalysis* Construct(); private: double Ex; diff --git a/NPAnalysis/TAMU/Analysis.cxx b/NPAnalysis/TAMU/Analysis.cxx index e307198ae..c37a57e95 100644 --- a/NPAnalysis/TAMU/Analysis.cxx +++ b/NPAnalysis/TAMU/Analysis.cxx @@ -250,8 +250,8 @@ void Analysis::InitInputBranch(){ //////////////////////////////////////////////////////////////////////////////// // Construct Method to be pass to the DetectorFactory // //////////////////////////////////////////////////////////////////////////////// -NPA::VAnalysis* Analysis::Construct(){ - return (NPA::VAnalysis*) new Analysis(); +NPL::VAnalysis* Analysis::Construct(){ + return (NPL::VAnalysis*) new Analysis(); } //////////////////////////////////////////////////////////////////////////////// @@ -261,7 +261,7 @@ extern "C"{ class proxy{ public: proxy(){ - NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); + NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); } }; diff --git a/NPAnalysis/TAMU/Analysis.h b/NPAnalysis/TAMU/Analysis.h index 0e2d15144..74b6ef1cd 100644 --- a/NPAnalysis/TAMU/Analysis.h +++ b/NPAnalysis/TAMU/Analysis.h @@ -35,7 +35,7 @@ -class Analysis: public NPA::VAnalysis{ +class Analysis: public NPL::VAnalysis{ public: Analysis(); ~Analysis(); @@ -47,7 +47,7 @@ class Analysis: public NPA::VAnalysis{ void ReInitValue(); void InitOutputBranch(); void InitInputBranch(); - static NPA::VAnalysis* Construct(); + static NPL::VAnalysis* Construct(); private: diff --git a/NPAnalysis/new/Analysis.cxx b/NPAnalysis/new/Analysis.cxx index 0767bf3ff..6698f224f 100644 --- a/NPAnalysis/new/Analysis.cxx +++ b/NPAnalysis/new/Analysis.cxx @@ -48,8 +48,8 @@ void Analysis::End(){ //////////////////////////////////////////////////////////////////////////////// // Construct Method to be pass to the DetectorFactory // //////////////////////////////////////////////////////////////////////////////// -NPA::VAnalysis* Analysis::Construct(){ - return (NPA::VAnalysis*) new Analysis(); +NPL::VAnalysis* Analysis::Construct(){ + return (NPL::VAnalysis*) new Analysis(); } //////////////////////////////////////////////////////////////////////////////// @@ -59,7 +59,7 @@ extern "C"{ class proxy{ public: proxy(){ - NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); + NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); } }; diff --git a/NPAnalysis/new/Analysis.h b/NPAnalysis/new/Analysis.h index 58859766e..8c4974eac 100644 --- a/NPAnalysis/new/Analysis.h +++ b/NPAnalysis/new/Analysis.h @@ -23,7 +23,7 @@ *****************************************************************************/ #include"NPVAnalysis.h" #include"TAnnularS1Physics.h" -class Analysis: public NPA::VAnalysis{ +class Analysis: public NPL::VAnalysis{ public: Analysis(); ~Analysis(); @@ -33,7 +33,7 @@ class Analysis: public NPA::VAnalysis{ void TreatEvent(); void End(); - static NPA::VAnalysis* Construct(); + static NPL::VAnalysis* Construct(); private: TAnnularS1Physics* S1; diff --git a/NPAnalysis/newMUGAST/Analysis.cxx b/NPAnalysis/newMUGAST/Analysis.cxx index 65d54642a..42349c3a5 100644 --- a/NPAnalysis/newMUGAST/Analysis.cxx +++ b/NPAnalysis/newMUGAST/Analysis.cxx @@ -205,8 +205,8 @@ void Analysis::ReInitValue(){ //////////////////////////////////////////////////////////////////////////////// // Construct Method to be pass to the AnalysisFactory // //////////////////////////////////////////////////////////////////////////////// -NPA::VAnalysis* Analysis::Construct(){ - return (NPA::VAnalysis*) new Analysis(); +NPL::VAnalysis* Analysis::Construct(){ + return (NPL::VAnalysis*) new Analysis(); } //////////////////////////////////////////////////////////////////////////////// @@ -216,7 +216,7 @@ extern "C"{ class proxy{ public: proxy(){ - NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); + NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct); } }; diff --git a/NPAnalysis/newMUGAST/Analysis.h b/NPAnalysis/newMUGAST/Analysis.h index 72dd8d00d..67905f72c 100644 --- a/NPAnalysis/newMUGAST/Analysis.h +++ b/NPAnalysis/newMUGAST/Analysis.h @@ -33,7 +33,7 @@ #include <TVector3.h> #include <TMath.h> -class Analysis: public NPA::VAnalysis{ +class Analysis: public NPL::VAnalysis{ public: Analysis(); ~Analysis(); @@ -46,7 +46,7 @@ class Analysis: public NPA::VAnalysis{ void InitOutputBranch(); void InitInputBranch(); void ReInitValue(); - static NPA::VAnalysis* Construct(); + static NPL::VAnalysis* Construct(); private: double Ex; -- GitLab