From a663fddb7519b0023103f98c6177ca1b9d62f44a Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <mouginot.baptiste@gmail.com> Date: Tue, 8 Jul 2014 11:56:27 +0000 Subject: [PATCH] git-svn-id: svn+ssh://svn.in2p3.fr/class@312 0e7d625b-0364-4367-a6be-d5be4a48d228 --- source/branches/CLASSV3/include/CLASSLogger.hxx | 4 ++-- source/branches/CLASSV3/include/Scenario.hxx | 7 +------ source/branches/CLASSV3/src/Scenario.cxx | 2 -- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/source/branches/CLASSV3/include/CLASSLogger.hxx b/source/branches/CLASSV3/include/CLASSLogger.hxx index c47c7d3f2..4f8e0f12c 100755 --- a/source/branches/CLASSV3/include/CLASSLogger.hxx +++ b/source/branches/CLASSV3/include/CLASSLogger.hxx @@ -116,8 +116,8 @@ public: #endif -#ifndef _CLASSLogger_CLASS -#define _CLASSLogger_CLASS +#ifndef _CLASSLogger_CLASS_ +#define _CLASSLogger_CLASS_ diff --git a/source/branches/CLASSV3/include/Scenario.hxx b/source/branches/CLASSV3/include/Scenario.hxx index 6f87ffc37..772d2664a 100755 --- a/source/branches/CLASSV3/include/Scenario.hxx +++ b/source/branches/CLASSV3/include/Scenario.hxx @@ -6,7 +6,6 @@ */ #include "CLASSObject.hxx" -#include "CLASSLogger.hxx" #include "IsotopicVector.hxx" #include <TFile.h> @@ -51,11 +50,7 @@ public : */ //@{ - Scenario(); ///< Normal Constructor. - - - - Scenario(CLASSLogger* Log = new CLASSLogger(), cSecond abstime = 0); ///< Log Constructor. + Scenario(CLASSLogger* Log= new CLASSLogger(), cSecond abstime = 0); ///< Log Constructor. /*! Use to load a CLASSLogger \param CLASSLogger: CLASSLogger used for the log... diff --git a/source/branches/CLASSV3/src/Scenario.cxx b/source/branches/CLASSV3/src/Scenario.cxx index 541407788..b7424153b 100755 --- a/source/branches/CLASSV3/src/Scenario.cxx +++ b/source/branches/CLASSV3/src/Scenario.cxx @@ -100,8 +100,6 @@ Scenario::Scenario(cSecond abstime, CLASSLogger* log):CLASSObject(log) INFO << "\t OutPut will be in \"" << fOutputFileName << "\" File and \"" << fOutputTreeName << "\" TTree" << endl; INFO << "\t Log will be in " << GetLog()->GetCLASSLoggerName() << endl; - - } -- GitLab