From 6b095074a83e2fe39648ff7322c32e5fcc95c116 Mon Sep 17 00:00:00 2001 From: Mohammad Al-Turany Date: Mon, 25 Jul 2016 16:19:35 +0200 Subject: [PATCH] Correct the duplicate in preproccessor define for TPC and ITS --- .../ITS/simulation/include/DigitizerTask.h | 16 ++++++++-------- Detectors/TPC/simulation/include/DigitizerTask.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Detectors/ITSMFT/ITS/simulation/include/DigitizerTask.h b/Detectors/ITSMFT/ITS/simulation/include/DigitizerTask.h index e4098dd101a53..572abbcabfb49 100644 --- a/Detectors/ITSMFT/ITS/simulation/include/DigitizerTask.h +++ b/Detectors/ITSMFT/ITS/simulation/include/DigitizerTask.h @@ -6,8 +6,8 @@ // // -#ifndef __ALICEO2__DigitizerTask__ -#define __ALICEO2__DigitizerTask__ +#ifndef __ALICEO2__ITS__DigitizerTask__ +#define __ALICEO2__ITS_DigitizerTask__ #include #include "FairTask.h" // for FairTask, InitStatus @@ -17,25 +17,25 @@ namespace AliceO2 { namespace ITS { class Digitizer; } } // lines 19-19 namespace AliceO2 { namespace ITS{ - + class Digitizer; - + class DigitizerTask : public FairTask{ public: DigitizerTask(); virtual ~DigitizerTask(); - + virtual InitStatus Init(); virtual void Exec(Option_t *option); - + Digitizer *GetDigiztizer() const { return fDigitizer; } private: Digitizer *fDigitizer; - + TClonesArray *fPointsArray; TClonesArray *fDigitsArray; - + ClassDef(DigitizerTask, 1) }; } diff --git a/Detectors/TPC/simulation/include/DigitizerTask.h b/Detectors/TPC/simulation/include/DigitizerTask.h index 4144bb2464cad..2f3a680ff59d7 100644 --- a/Detectors/TPC/simulation/include/DigitizerTask.h +++ b/Detectors/TPC/simulation/include/DigitizerTask.h @@ -1,7 +1,7 @@ /// \file DigitizerTask.h /// \brief Task for ALICE TPC digitization -#ifndef __ALICEO2__DigitizerTask__ -#define __ALICEO2__DigitizerTask__ +#ifndef __ALICEO2__TPC__DigitizerTask__ +#define __ALICEO2__TPC__DigitizerTask__ #include #include "FairTask.h" @@ -11,23 +11,23 @@ namespace AliceO2 { namespace TPC { class Digitizer; } } namespace AliceO2 { namespace TPC{ - + class Digitizer; - + class DigitizerTask : public FairTask{ public: DigitizerTask(); virtual ~DigitizerTask(); - + virtual InitStatus Init(); virtual void Exec(Option_t *option); - + private: Digitizer *mDigitizer; - + TClonesArray *mPointsArray; TClonesArray *mDigitsArray; - + ClassDef(DigitizerTask, 1) }; }