From e939a978a98d29901b86bdb02cdcaf5157e717de Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 14 Nov 2006 17:11:17 +0000 Subject: [PATCH] Removing inheritances from TAttLine, TAttMarker and AliRndm in AliModule. The copy constructor and assignment operators are moved to the private part of the class and not implemented. The corresponding changes are propagated to the detectors --- CRT/AliCRT.cxx | 21 ----------- CRT/AliCRT.h | 5 +-- CRT/AliCRTv0.cxx | 26 ++------------ CRT/AliCRTv0.h | 6 ++-- CRT/AliCRTv1.cxx | 26 ++------------ CRT/AliCRTv1.h | 6 ++-- EMCAL/AliEMCAL.cxx | 28 --------------- EMCAL/AliEMCAL.h | 10 +++--- EMCAL/AliEMCALDigitizer.cxx | 17 ++++----- EMCAL/AliEMCALWsuCosmicRaySetUp.cxx | 6 ++-- EMCAL/AliEMCALv0.cxx | 16 --------- EMCAL/AliEMCALv0.h | 11 ++---- EMCAL/AliEMCALv1.cxx | 11 ------ EMCAL/AliEMCALv1.h | 12 +++---- EMCAL/AliEMCALv2.cxx | 11 ------ EMCAL/AliEMCALv2.h | 12 +++---- FMD/AliFMD.cxx | 35 +++---------------- FMD/AliFMD.h | 18 +++++----- FMD/AliFMDDigitizer.cxx | 2 +- ITS/AliITS.cxx | 44 ++--------------------- ITS/AliITS.h | 6 ++-- ITS/AliITSsimulationSDD.cxx | 1 + ITS/AliITSsimulationSSD.cxx | 2 ++ ITS/AliITSv11.cxx | 37 -------------------- ITS/AliITSv11.h | 4 +-- ITS/AliITSvBeamTestITS04.cxx | 21 ----------- ITS/AliITSvBeamTestITS04.h | 6 ++-- ITS/AliITSvPPRasymmFMD.cxx | 46 ------------------------ ITS/AliITSvPPRasymmFMD.h | 4 +-- ITS/AliITSvPPRcoarseasymm.cxx | 20 ----------- ITS/AliITSvPPRcoarseasymm.h | 5 +-- ITS/AliITSvSDD03.cxx | 32 ----------------- ITS/AliITSvSDD03.h | 4 +-- ITS/AliITSvSPD02.cxx | 32 ----------------- ITS/AliITSvSPD02.h | 4 +-- ITS/AliITSvSSD03.cxx | 32 ----------------- ITS/AliITSvSSD03.h | 4 +-- ITS/AliITSvtest.cxx | 18 ---------- ITS/AliITSvtest.h | 4 +-- MUON/AliMUON.cxx | 2 +- MUON/AliMUONClusterFinderAZ.cxx | 1 + PHOS/AliPHOS.cxx | 10 ++---- PHOS/AliPHOS.h | 16 ++++----- PHOS/AliPHOSv0.cxx | 10 ++---- PHOS/AliPHOSv0.h | 17 ++++----- PHOS/AliPHOSv1.cxx | 35 ++----------------- PHOS/AliPHOSv1.h | 16 ++++----- PHOS/AliPHOSv2.cxx | 10 ++---- PHOS/AliPHOSv2.h | 11 +++--- PHOS/AliPHOSvFast.cxx | 50 ++------------------------ PHOS/AliPHOSvFast.h | 11 +++--- PHOS/AliPHOSvImpacts.cxx | 21 ++--------- PHOS/AliPHOSvImpacts.h | 14 ++++---- PMD/AliPMDDigitizer.cxx | 1 + RICH/AliRICH.h | 6 ++-- START/AliSTART.cxx | 25 +------------ START/AliSTART.h | 1 + STEER/AliDetector.cxx | 33 ++---------------- STEER/AliDetector.h | 8 ++--- STEER/AliModule.cxx | 38 +------------------- STEER/AliModule.h | 18 ++++------ STRUCT/AliABSO.cxx | 6 ++-- STRUCT/AliABSOv0.cxx | 3 -- STRUCT/AliBODY.cxx | 6 ++-- STRUCT/AliDIPO.cxx | 6 ++-- STRUCT/AliDIPOv2.cxx | 3 -- STRUCT/AliFRAME.cxx | 6 ++-- STRUCT/AliHALL.cxx | 6 ++-- STRUCT/AliMAG.cxx | 6 ++-- STRUCT/AliPIPE.cxx | 6 ++-- STRUCT/AliSHIL.cxx | 6 ++-- STRUCT/AliSHILv0.cxx | 3 -- STRUCT/AliSHILv2.cxx | 3 -- STRUCT/AliSHILv3.cxx | 3 -- STRUCT/AliSHILvF.cxx | 3 -- TOF/AliTOF.cxx | 6 ++-- TOF/AliTOFDigitizer.cxx | 16 +++------ TOF/AliTOFSDigitizer.cxx | 19 ++++------ TOF/AliTOFT0.cxx | 29 ++++++---------- TPC/AliTPC.cxx | 40 +++------------------ TPC/AliTPC.h | 4 +-- TPC/AliTPCFast.cxx | 1 + TPC/AliTPCtrackerParam.cxx | 1 + TRD/AliTRD.cxx | 38 +++----------------- TRD/AliTRD.h | 8 ++--- TRD/AliTRDv1.cxx | 54 ----------------------------- TRD/AliTRDv1.h | 5 ++- VZERO/AliVZERO.cxx | 2 +- VZERO/AliVZERODigitizer.cxx | 1 + 89 files changed, 236 insertions(+), 1013 deletions(-) diff --git a/CRT/AliCRT.cxx b/CRT/AliCRT.cxx index 87a430d8e24..d423f12b607 100644 --- a/CRT/AliCRT.cxx +++ b/CRT/AliCRT.cxx @@ -73,17 +73,6 @@ AliCRT::AliCRT(const char *name, const char *title) //gAlice->GetMCApp()->AddHitList(fHits); } -//_____________________________________________________________________________ -AliCRT::AliCRT(const AliCRT& crt) - : AliDetector(crt), - fModule(crt.fModule) -{ - // - // Copy constructor - // - crt.Copy(*this); -} - //_____________________________________________________________________________ AliCRT::~AliCRT() { @@ -93,16 +82,6 @@ AliCRT::~AliCRT() if ( fModule ) { delete fModule; fModule = 0; } } -//_____________________________________________________________________________ -AliCRT& AliCRT::operator=(const AliCRT& crt) -{ - // - // Asingment operator. - // - crt.Copy(*this); - return *this; -} - //_____________________________________________________________________________ void AliCRT::CreateMaterials() { diff --git a/CRT/AliCRT.h b/CRT/AliCRT.h index ab12aafb659..e02e5a1da65 100644 --- a/CRT/AliCRT.h +++ b/CRT/AliCRT.h @@ -17,10 +17,8 @@ class AliCRT : public AliDetector { public: AliCRT(); AliCRT(const char* name, const char* title); - AliCRT(const AliCRT& crt); virtual ~AliCRT(); - AliCRT& operator=(const AliCRT& crt); virtual void CreateMaterials(); virtual Int_t IsVersion() const { return -1; } @@ -35,6 +33,9 @@ public: protected: AliCRTModule* fModule; private: + AliCRT(const AliCRT& crt); + AliCRT& operator=(const AliCRT& crt); + ClassDef(AliCRT, 1) // Cosmic Ray Trigger (ACORDE) base class }; #endif // ALICRT_H diff --git a/CRT/AliCRTv0.cxx b/CRT/AliCRTv0.cxx index 8408b10daa1..b97173cc804 100644 --- a/CRT/AliCRTv0.cxx +++ b/CRT/AliCRTv0.cxx @@ -81,19 +81,9 @@ AliCRTv0::AliCRTv0(const char *name, const char *title) */ //End_Html - SetMarkerColor(kRed); - SetMarkerStyle(kRed); - SetMarkerSize(0.4); -} - -//_____________________________________________________________________________ -AliCRTv0::AliCRTv0(const AliCRTv0& crt) - : AliCRT(crt) -{ - // - // Copy constructor - // - crt.Copy(*this); + //PH SetMarkerColor(kRed); + //PH SetMarkerStyle(kRed); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ @@ -104,16 +94,6 @@ AliCRTv0::~AliCRTv0() // } -//_____________________________________________________________________________ -AliCRTv0& AliCRTv0::operator=(const AliCRTv0& crt) -{ - // - // Asingment operator. - // - crt.Copy(*this); - return *this; -} - //_____________________________________________________________________________ void AliCRTv0::BuildGeometry() { diff --git a/CRT/AliCRTv0.h b/CRT/AliCRTv0.h index fd65ae98653..517093009d4 100644 --- a/CRT/AliCRTv0.h +++ b/CRT/AliCRTv0.h @@ -14,11 +14,8 @@ class AliCRTv0 : public AliCRT { public: AliCRTv0(); AliCRTv0(const char *name, const char *title); - AliCRTv0(const AliCRTv0& crt); virtual ~AliCRTv0(); - AliCRTv0& operator=(const AliCRTv0& crt); - virtual void CreateGeometry(); virtual void BuildGeometry(); virtual void DrawDetector() const; @@ -28,6 +25,9 @@ protected: virtual void CreateShafts() {} private: + AliCRTv0(const AliCRTv0& crt); + AliCRTv0& operator=(const AliCRTv0& crt); + ClassDef(AliCRTv0,1) // Cosmic Ray Trigger (ACORDE). }; #endif // ALICRTV0_H diff --git a/CRT/AliCRTv1.cxx b/CRT/AliCRTv1.cxx index 390483b8f1b..7be488b2f60 100644 --- a/CRT/AliCRTv1.cxx +++ b/CRT/AliCRTv1.cxx @@ -91,19 +91,9 @@ AliCRTv1::AliCRTv1(const char *name, const char *title) fHits = new TClonesArray("AliCRThit",400); gAlice->GetMCApp()->AddHitList(fHits); - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); -} - -//_____________________________________________________________________________ -AliCRTv1::AliCRTv1(const AliCRTv1& crt) - : AliCRT(crt) -{ - // - // Copy ctor. - // - crt.Copy(*this); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ @@ -114,16 +104,6 @@ AliCRTv1::~AliCRTv1() // } -//_____________________________________________________________________________ -AliCRTv1& AliCRTv1::operator=(const AliCRTv1& crt) -{ - // - // Asingment operator - // - crt.Copy(*this); - return *this; -} - //_____________________________________________________________________________ void AliCRTv1::CreateMaterials() { diff --git a/CRT/AliCRTv1.h b/CRT/AliCRTv1.h index 5ed7aa229fa..2bbc9f13eb2 100644 --- a/CRT/AliCRTv1.h +++ b/CRT/AliCRTv1.h @@ -14,11 +14,8 @@ class AliCRTv1 : public AliCRT { public: AliCRTv1(); AliCRTv1(const char *name, const char *title); - AliCRTv1(const AliCRTv1& crt); virtual ~AliCRTv1(); - AliCRTv1& operator=(const AliCRTv1& crt); - virtual TString Version() { return TString("v1"); } virtual Int_t IsVersion() const { return 1; } @@ -39,6 +36,9 @@ protected: virtual void CreateShafts(); private: + AliCRTv1(const AliCRTv1& crt); + AliCRTv1& operator=(const AliCRTv1& crt); + ClassDef(AliCRTv1, 1) //Class for CRT, version 1, Shafts outside of AliHALL }; diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx index bc39aa4cf98..f4d2d1d1035 100644 --- a/EMCAL/AliEMCAL.cxx +++ b/EMCAL/AliEMCAL.cxx @@ -95,22 +95,6 @@ AliEMCAL::AliEMCAL(const char* name, const char* title) } -//____________________________________________________________________________ -AliEMCAL::AliEMCAL(const AliEMCAL& emcal) - : AliDetector(emcal), - fBirkC0(emcal.fBirkC0), - fBirkC1(emcal.fBirkC1), - fBirkC2(emcal.fBirkC2), - fHighCharge(emcal.fHighCharge), - fHighGain(emcal.fHighGain), - fHighLowGainFactor(emcal.fHighLowGainFactor), - fLowGainOffset(emcal.fLowGainOffset) -{ - //copy ctor - // Init(); - -} - //____________________________________________________________________________ AliEMCAL::~AliEMCAL() { @@ -131,18 +115,6 @@ void AliEMCAL::Init(void) fLowGainOffset = 1 ; // offset added to the module id to distinguish high and low gain data } -//____________________________________________________________________________ -void AliEMCAL::Copy(AliEMCAL & emcal) const -{ - //copy - - TObject::Copy(emcal) ; - emcal.fHighCharge = fHighCharge ; - emcal.fHighGain = fHighGain ; - emcal.fHighLowGainFactor = fHighLowGainFactor ; - emcal.fLowGainOffset = fLowGainOffset; -} - //____________________________________________________________________________ AliDigitizer* AliEMCAL::CreateDigitizer(AliRunDigitizer* manager) const { diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h index 34d87d65430..900cb54f396 100644 --- a/EMCAL/AliEMCAL.h +++ b/EMCAL/AliEMCAL.h @@ -33,15 +33,11 @@ class AliEMCAL : public AliDetector { AliEMCAL(); AliEMCAL(const char* name, const char* title=""); - AliEMCAL(const AliEMCAL& emcal); virtual ~AliEMCAL() ; virtual void AddHit(Int_t, Int_t*, Float_t *) { Fatal("AddHit(Int_t, Int_t*, Float_t *", "not to be used: use AddHit( Int_t shunt, Int_t primary, Int_t track,Int_t id, Float_t *hits )") ; } - virtual void Copy(TObject & emcal) const - { Copy(dynamic_cast(emcal)); } - virtual void Copy(AliEMCAL & emcal) const; virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const; virtual void CreateMaterials() ; // virtual void @@ -79,8 +75,6 @@ class AliEMCAL : public AliDetector { // virtual AliLoader* MakeLoader(const char* topfoldername); virtual const TString Version() const {return TString(" ") ; } - AliEMCAL & operator = (const AliEMCAL & /*rvalue*/) { - Fatal("operator =", "not implemented") ; return *this ; } protected: @@ -106,6 +100,10 @@ protected: static Int_t fgThreshold; // threshold static Int_t fgChannelsPerDDL; // number of channels per DDL + private: + AliEMCAL(const AliEMCAL& emcal); + AliEMCAL & operator = (const AliEMCAL & /*rvalue*/); + ClassDef(AliEMCAL,9) // Electromagnetic calorimeter (base class) } ; diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx index 46b774b9af0..85207b838d3 100644 --- a/EMCAL/AliEMCALDigitizer.cxx +++ b/EMCAL/AliEMCALDigitizer.cxx @@ -59,14 +59,15 @@ //_________________________________________________________________________________ // --- ROOT system --- -#include "TROOT.h" -#include "TTree.h" -#include "TSystem.h" -#include "TBenchmark.h" -#include "TList.h" -#include "TH1.h" -#include "TBrowser.h" -#include "TObjectTable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include // --- AliRoot header files --- #include "AliLog.h" diff --git a/EMCAL/AliEMCALWsuCosmicRaySetUp.cxx b/EMCAL/AliEMCALWsuCosmicRaySetUp.cxx index 47df67e3435..5137c626e18 100644 --- a/EMCAL/AliEMCALWsuCosmicRaySetUp.cxx +++ b/EMCAL/AliEMCALWsuCosmicRaySetUp.cxx @@ -60,9 +60,9 @@ AliEMCALWsuCosmicRaySetUp::AliEMCALWsuCosmicRaySetUp(const char *name, const cha // // Standard constructor of the Wsu Cosmic Ray SetUp external volume // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/EMCAL/AliEMCALv0.cxx b/EMCAL/AliEMCALv0.cxx index 6e662a1e316..366d63bba59 100644 --- a/EMCAL/AliEMCALv0.cxx +++ b/EMCAL/AliEMCALv0.cxx @@ -94,22 +94,6 @@ AliEMCALv0::AliEMCALv0(const char *name, const char *title) fShishKebabModules = geom->GetShishKebabTrd1Modules(); } -//______________________________________________________________________ -AliEMCALv0::AliEMCALv0(const AliEMCALv0 & emcal) - : AliEMCAL(emcal), - fShishKebabModules(emcal.fShishKebabModules), - fEnvelop1(emcal.fEnvelop1), - fIdRotm(emcal.fIdRotm), - fIdTmedArr(emcal.fIdTmedArr), - fSampleWidth(emcal.fSampleWidth), - fSmodPar0(emcal.fSmodPar0), - fSmodPar1(emcal.fSmodPar1), - fSmodPar2(emcal.fSmodPar2) -{ - //copy ctor - for(Int_t i = 0; i < 5; i++) fParEMOD[i] = emcal.fParEMOD[i]; - -} //______________________________________________________________________ void AliEMCALv0::BuildGeometry() { diff --git a/EMCAL/AliEMCALv0.h b/EMCAL/AliEMCALv0.h index d96e73f30ae..d5ceae4d052 100644 --- a/EMCAL/AliEMCALv0.h +++ b/EMCAL/AliEMCALv0.h @@ -33,14 +33,6 @@ class AliEMCALv0 : public AliEMCAL { AliEMCALv0(const char *name, const char *title="") ; virtual ~AliEMCALv0(){} - AliEMCALv0(const AliEMCALv0 & emcal); - - AliEMCALv0 & operator = (const AliEMCALv0 & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented"); - return *this; - } - using AliEMCAL::AddHit; virtual void AddAlignableVolumes() const; @@ -89,6 +81,9 @@ class AliEMCALv0 : public AliEMCAL { Double_t fSmodPar2; //! z size of super module Double_t fParEMOD[5]; //! parameters of EMCAL module (TRD1,2) + AliEMCALv0(const AliEMCALv0 & emcal); + AliEMCALv0 & operator = (const AliEMCALv0 & /*rvalue*/); + ClassDef(AliEMCALv0,3) // Implementation of EMCAL manager class for midrapidity barrel layout between 80 and 180(190) degrees }; diff --git a/EMCAL/AliEMCALv1.cxx b/EMCAL/AliEMCALv1.cxx index 3523a2d9719..02aa79562fc 100644 --- a/EMCAL/AliEMCALv1.cxx +++ b/EMCAL/AliEMCALv1.cxx @@ -73,17 +73,6 @@ AliEMCALv1::AliEMCALv1(const char *name, const char *title) fIshunt = 2; // All hits are associated with particles entering the calorimeter } -//______________________________________________________________________ -AliEMCALv1::AliEMCALv1(const AliEMCALv1 & emcal) - : AliEMCALv0(emcal), - fCurPrimary(emcal.fCurPrimary), - fCurParent(emcal.fCurParent), - fCurTrack(emcal.fCurTrack), - fTimeCut(emcal.fTimeCut) -{ - //copy ctor -} - //______________________________________________________________________ AliEMCALv1::~AliEMCALv1(){ // dtor diff --git a/EMCAL/AliEMCALv1.h b/EMCAL/AliEMCALv1.h index fa61a60bd2e..a0c5bd20633 100644 --- a/EMCAL/AliEMCALv1.h +++ b/EMCAL/AliEMCALv1.h @@ -28,14 +28,6 @@ public: AliEMCALv1(const char *name, const char *title="") ; virtual ~AliEMCALv1(void) ; - AliEMCALv1(const AliEMCALv1 & emcal); - - AliEMCALv1 & operator = (const AliEMCALv1 & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented"); - return *this; - } - using AliEMCALv0::AddHit; virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t iparent, Float_t ienergy, Int_t id, Float_t *hits, Float_t *p); @@ -54,6 +46,10 @@ protected: Int_t fCurTrack; // Current track Float_t fTimeCut; // Cut to remove the background from the ALICE system + private: + AliEMCALv1(const AliEMCALv1 & emcal); + AliEMCALv1 & operator = (const AliEMCALv1 & /*rvalue*/); + ClassDef(AliEMCALv1,9) // Implementation of EMCAL manager class to produce hits in a Central Calorimeter }; diff --git a/EMCAL/AliEMCALv2.cxx b/EMCAL/AliEMCALv2.cxx index abd500b09e0..40c09ce5169 100644 --- a/EMCAL/AliEMCALv2.cxx +++ b/EMCAL/AliEMCALv2.cxx @@ -85,17 +85,6 @@ AliEMCALv2::AliEMCALv2(const char *name, const char *title) } } -//______________________________________________________________________ -AliEMCALv2::AliEMCALv2(const AliEMCALv2 & emcal) - : AliEMCALv1(emcal), - fGeometry(emcal.fGeometry), - fHDe(emcal.fHDe), - fHNhits(emcal.fHNhits) -{ - //copy ctor - -} - //______________________________________________________________________ AliEMCALv2::~AliEMCALv2(){ // dtor diff --git a/EMCAL/AliEMCALv2.h b/EMCAL/AliEMCALv2.h index 9467b628406..0f4ebe96890 100644 --- a/EMCAL/AliEMCALv2.h +++ b/EMCAL/AliEMCALv2.h @@ -33,14 +33,6 @@ public: AliEMCALv2(const char *name, const char *title="") ; virtual ~AliEMCALv2(void) ; - AliEMCALv2(const AliEMCALv2 & emcal); - - AliEMCALv2 & operator = (const AliEMCALv2 & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented"); - return *this; - } - using AliEMCALv1::AddHit; virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t iparent, Float_t ienergy, Int_t id, Float_t *hits, Float_t *p); @@ -68,6 +60,10 @@ public: TH1F* fHDe; //! TH1F* fHNhits; //! + private: + AliEMCALv2(const AliEMCALv2 & emcal); + AliEMCALv2 & operator = (const AliEMCALv2 & /*rvalue*/); + ClassDef(AliEMCALv2,1) //Implementation of EMCAL manager class to produce hits in a Shish-Kebab }; diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx index bc455a1118b..38d8e118a26 100644 --- a/FMD/AliFMD.cxx +++ b/FMD/AliFMD.cxx @@ -142,19 +142,6 @@ AliFMD::AliFMD() fBad = new TClonesArray("AliFMDHit"); } -//____________________________________________________________________ -AliFMD::AliFMD(const AliFMD& other) - : AliDetector(other), - fSDigits(other.fSDigits), - fNsdigits(other.fNsdigits), - fDetailed(other.fDetailed), - fUseOld(other.fUseOld), - fUseAssembly(other.fUseAssembly), - fBad(other.fBad) -{ - // Copy constructor -} - //____________________________________________________________________ AliFMD::AliFMD(const char *name, const char *title) : AliDetector (name, title), @@ -181,8 +168,8 @@ AliFMD::AliFMD(const char *name, const char *title) // CHC: What is this? fIshunt = 0; - SetMarkerColor(kRed); - SetLineColor(kYellow); + //PH SetMarkerColor(kRed); + //PH SetLineColor(kYellow); } //____________________________________________________________________ @@ -211,18 +198,6 @@ AliFMD::~AliFMD () } } -//____________________________________________________________________ -AliFMD& -AliFMD::operator=(const AliFMD& other) -{ - // Assignment operator - AliDetector::operator=(other); - fSDigits = other.fSDigits; - fNsdigits = other.fNsdigits; - fDetailed = other.fDetailed; - fBad = other.fBad; - return *this; -} //==================================================================== // @@ -510,7 +485,7 @@ AliFMD::BuildGeometry() } shape->DefineSection(0, -siThick / 2, 1, 0, 0); shape->DefineSection(1, +siThick / 2, 1, 0, 0); - shape->SetLineColor(GetLineColor()); + shape->SetLineColor(kYellow); //PH kYellow is the default line color in FMD TObjArray* rots = new TObjArray(nmod); for (Int_t j = 0; j < nmod; j++) { @@ -585,7 +560,7 @@ AliFMD::BuildGeometry() TNode* mnod = new TNode(name.Data(), title.Data(), rshape, 0, 0, rz - siThick / 2 + TMath::Sign(offz,z), rot); - mnod->SetLineColor(GetLineColor()); + mnod->SetLineColor(kYellow); //PH kYellow is the default line color in FMD fNodes->Add(mnod); } // for (Int_t k = 0 ; ...) } // for (Int_t j = 0 ; ...) @@ -635,7 +610,7 @@ AliFMD::LoadPoints(Int_t /* track */) // than 1 keV - a MIP is 100 eV. if (edep > absQ * absQ && poverm > 1) bad = kTRUE; - AliFMDPoints* p1 = new AliFMDPoints(hit, GetMarkerColor()); + AliFMDPoints* p1 = new AliFMDPoints(hit, kRed); //PH kRed is the default marker color in FMD // AliPoints* p1 = new AliPoints(); // p1->SetMarkerColor(GetMarkerColor()); // p1->SetMarkerSize(GetMarkerSize()); diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h index 8774809af3d..db18d7e8e01 100644 --- a/FMD/AliFMD.h +++ b/FMD/AliFMD.h @@ -288,15 +288,8 @@ public: @param name Name of object. @param title Title of object. */ AliFMD(const char *name, const char *title); - /** Copy constructor - @param other Object to copy from */ - AliFMD(const AliFMD& other); /** Destructor */ virtual ~AliFMD(); - /** Assignment operator - @param other Object to assign from - @return Reference to this object */ - AliFMD& operator=(const AliFMD& other); /** Wheter to make a detailed geometry @param use If true, make detailed geometry */ void UseDetailed(Bool_t use=kTRUE) { fDetailed = use; } @@ -541,7 +534,16 @@ protected: }; TObjArray* fBad; //! debugging - bad hits - + +private: + /** Copy constructor + @param other Object to copy from */ + AliFMD(const AliFMD& other); + /** Assignment operator + @param other Object to assign from + @return Reference to this object */ + AliFMD& operator=(const AliFMD& other); + ClassDef(AliFMD,11) // Base class FMD entry point }; diff --git a/FMD/AliFMDDigitizer.cxx b/FMD/AliFMDDigitizer.cxx index ab26a1eb607..7bd52f95e9e 100644 --- a/FMD/AliFMDDigitizer.cxx +++ b/FMD/AliFMDDigitizer.cxx @@ -197,7 +197,7 @@ // #include // ROOT_TTree -//#include // ROOT_TRandom +#include // ROOT_TRandom #include // ALILOG_H #include "AliFMDDigitizer.h" // ALIFMDDIGITIZER_H #include "AliFMD.h" // ALIFMD_H diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx index 3cf3f6f5cba..d4c2cd97e10 100644 --- a/ITS/AliITS.cxx +++ b/ITS/AliITS.cxx @@ -117,7 +117,7 @@ fITSmodules(0) // is also called. // SetDetectors(); // default to fOpt="All". This variable not written out. - SetMarkerColor(kRed); +//PH SetMarkerColor(kRed); } //______________________________________________________________________ AliITS::AliITS(const char *name, const char *title):AliDetector(name,title), @@ -147,7 +147,7 @@ fITSmodules(0) fDetTypeSim = new AliITSDetTypeSim(); - SetMarkerColor(kRed); + //PH SetMarkerColor(kRed); if(!fLoader) MakeLoader(AliConfig::GetDefaultEventFolderName()); fDetTypeSim->SetLoader((AliITSLoader*)fLoader); @@ -185,46 +185,6 @@ AliITS::~AliITS(){ } } //______________________________________________________________________ -AliITS::AliITS(const AliITS &source) : AliDetector(source), -fDetTypeSim(0), -fEuclidOut(0), -fOpt("All"), -fIdN(0), -fIdSens(0), -fIdName(0), -fITSmodules(0) -{ - // Copy constructor. This is a function which is not allowed to be - // done to the ITS. It exits with an error. - // Inputs: - // AliITS &source An AliITS class. - // Outputs: - // none. - // Return: - // none. - - if(this==&source) return; - Error("Copy constructor", - "You are not allowed to make a copy of the AliITS"); - exit(1); -} -//______________________________________________________________________ -AliITS& AliITS::operator=(const AliITS &source){ - // Assignment operator. This is a function which is not allowed to be - // done to the ITS. It exits with an error. - // Inputs: - // AliITS &source An AliITS class. - // Outputs: - // none. - // Return: - // none. - - if(this==&source) return *this; - Error("operator=","You are not allowed to make a copy of the AliITS"); - exit(1); - return *this; //fake return -} -//______________________________________________________________________ AliDigitizer* AliITS::CreateDigitizer(AliRunDigitizer* manager)const{ // Creates the AliITSDigitizer in a standard way for use via AliModule. // This function can not be included in the .h file because of problems diff --git a/ITS/AliITS.h b/ITS/AliITS.h index 2833ae32c45..44e3bc9a8ee 100644 --- a/ITS/AliITS.h +++ b/ITS/AliITS.h @@ -38,8 +38,6 @@ class AliITS : public AliDetector { AliITS(); // Default creator. AliITS(const char *name, const char *title); // standard Creator virtual ~AliITS(); // destructor - AliITS(const AliITS &source); // copy constructor. Not to be used! - AliITS& operator=(const AliITS &source); // = operator. Not to be used! virtual Int_t IsVersion() const {return 1;} virtual Int_t DistancetoPrimitive(Int_t , Int_t ) {return 999;} @@ -159,6 +157,10 @@ class AliITS : public AliDetector { Int_t *fIdSens; //[fIdN] layer identifier TString *fIdName; //[fIdN] layer identifier TObjArray *fITSmodules; //! Pointer to ITS modules + + private: + AliITS(const AliITS &source); // copy constructor. Not to be used! + AliITS& operator=(const AliITS &source); // = operator. Not to be used! ClassDef(AliITS,6) // Base class for ITS }; diff --git a/ITS/AliITSsimulationSDD.cxx b/ITS/AliITSsimulationSDD.cxx index c777389d4b5..7d254674dc3 100644 --- a/ITS/AliITSsimulationSDD.cxx +++ b/ITS/AliITSsimulationSDD.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include "AliITS.h" #include "AliITSMapA2.h" diff --git a/ITS/AliITSsimulationSSD.cxx b/ITS/AliITSsimulationSSD.cxx index f6a6ee6aa6b..52f3ff590a2 100644 --- a/ITS/AliITSsimulationSSD.cxx +++ b/ITS/AliITSsimulationSSD.cxx @@ -19,6 +19,8 @@ #include #include #include +#include + #include "AliITSmodule.h" #include "AliITSMapA2.h" #include "AliITSpList.h" diff --git a/ITS/AliITSv11.cxx b/ITS/AliITSv11.cxx index 02d3630f4a8..238e8f2afa9 100644 --- a/ITS/AliITSv11.cxx +++ b/ITS/AliITSv11.cxx @@ -167,43 +167,6 @@ AliITSv11::AliITSv11(Int_t debugITS,Int_t debugSPD,Int_t debugSDD, } -//______________________________________________________________________ -AliITSv11::AliITSv11(const AliITSv11 &source) : - AliITS(source), - fGeomDetOut(kFALSE), // Don't write .det file - fGeomDetIn(kTRUE), // Read .det file - fByThick(kTRUE), - fMajorVersion(0), - fMinorVersion(0), - fSDDgeom(0) -{ - // Copy Constructor for ITS version 11. This function is not to be - // used. If any other instance of this function, other than "this" is - // passed, an error message is returned. - // Inputs: - // const AliITSv11 &source This class - - if(&source == this) return; - Warning("Copy Constructor","Not allowed to copy AliITSv11"); - return; -} - - -//______________________________________________________________________ -AliITSv11& AliITSv11::operator=(const AliITSv11 - &source){ - // Assignment operator for the ITS version 11. This function is not - // to be used. If any other instance of this function, other than "this" - // is passed, an error message is returned. - // Inputs: - // const AliITSv11 &source This class - - if(&source == this) return *this; - Warning("= operator","Not allowed to copy AliITSv11"); - return *this; -} - - //______________________________________________________________________ AliITSv11::~AliITSv11() { delete fSDDgeom; diff --git a/ITS/AliITSv11.h b/ITS/AliITSv11.h index e67b8faa1e7..4444b2012a7 100644 --- a/ITS/AliITSv11.h +++ b/ITS/AliITSv11.h @@ -16,8 +16,6 @@ class AliITSv11 : public AliITS { AliITSv11(const char *name, const char *title); AliITSv11(Int_t debugITS, Int_t debugSPD = 0, Int_t debugSDD = 0, Int_t debugSSD = 0, Int_t debugSUP = 0); - AliITSv11(const AliITSv11 &source); // copy constructor - AliITSv11& operator=(const AliITSv11 &source); // assignment operator virtual ~AliITSv11() ; virtual void BuildGeometry(); virtual void CreateGeometry(); @@ -69,6 +67,8 @@ class AliITSv11 : public AliITS { private: + AliITSv11(const AliITSv11 &source); // copy constructor + AliITSv11& operator=(const AliITSv11 &source); // assignment operator void InitAliITSgeom(); Bool_t fGeomDetOut; // Flag to write .det file out diff --git a/ITS/AliITSvBeamTestITS04.cxx b/ITS/AliITSvBeamTestITS04.cxx index ca3233c3dc1..a5db650d04d 100644 --- a/ITS/AliITSvBeamTestITS04.cxx +++ b/ITS/AliITSvBeamTestITS04.cxx @@ -157,27 +157,6 @@ fGeomDetIn(kFALSE) for(Int_t a=0;a<60;a++) fWrite[a] = '\0'; } -//______________________________________________________________________ -AliITSvBeamTestITS04::AliITSvBeamTestITS04(const AliITSvBeamTestITS04 &source) : AliITS(source), -fITSmotherVolume(source.fITSmotherVolume), -fNspd(source.fNspd), -fNsdd(source.fNsdd), -fNssd(source.fNssd), -fGeomDetOut(source.fGeomDetOut), -fGeomDetIn(source.fGeomDetIn){ - //Copy constructor - -} -//______________________________________________________________________ -AliITSvBeamTestITS04& AliITSvBeamTestITS04::operator=(const AliITSvBeamTestITS04 &source){ - - - // This class is not to be copied. Function only dummy. - if(&source == this) return *this; - Warning("= operator","Not allowed to copy AliITSvSDD03"); - return *this; -} - //__________________________________________________________________ AliITSvBeamTestITS04::~AliITSvBeamTestITS04() { diff --git a/ITS/AliITSvBeamTestITS04.h b/ITS/AliITSvBeamTestITS04.h index 1166a113371..7944ebf6e83 100644 --- a/ITS/AliITSvBeamTestITS04.h +++ b/ITS/AliITSvBeamTestITS04.h @@ -17,8 +17,6 @@ class AliITSvBeamTestITS04 : public AliITS { AliITSvBeamTestITS04(); AliITSvBeamTestITS04(const char* name,const char *title); - AliITSvBeamTestITS04(const AliITSvBeamTestITS04 &source); // Copy constructor - AliITSvBeamTestITS04& operator=(const AliITSvBeamTestITS04 &source); // = operator virtual ~AliITSvBeamTestITS04(); virtual void SetNumberOfSPD(Int_t nSPD) {fNspd=nSPD;} @@ -100,6 +98,10 @@ class AliITSvBeamTestITS04 : public AliITS { char fWrite[60]; //! file name to write .det file char fRead[60]; // file name to read .det file (JC) + private: + AliITSvBeamTestITS04(const AliITSvBeamTestITS04 &source); // Copy constructor + AliITSvBeamTestITS04& operator=(const AliITSvBeamTestITS04 &source); // = operator + ClassDef(AliITSvBeamTestITS04,2) }; diff --git a/ITS/AliITSvPPRasymmFMD.cxx b/ITS/AliITSvPPRasymmFMD.cxx index cc767cb8310..98f606e3bd9 100644 --- a/ITS/AliITSvPPRasymmFMD.cxx +++ b/ITS/AliITSvPPRasymmFMD.cxx @@ -145,52 +145,6 @@ AliITSvPPRasymmFMD::AliITSvPPRasymmFMD(const char *name, const char *title) strncpy(fRead,"$ALICE_ROOT/ITS/ITSgeometry_vPPRasymmFMD.det",60); } //______________________________________________________________________ -AliITSvPPRasymmFMD::AliITSvPPRasymmFMD(const AliITSvPPRasymmFMD &source) : - AliITS(source), - fGeomDetOut(kFALSE), - fGeomDetIn(kFALSE), - fByThick(kTRUE), - fMajorVersion(IsVersion()), - fMinorVersion(2), - fDet1(0), - fDet2(0), - fChip1(0), - fChip2(0), - fRails(0), - fFluid(0), - fIDMother(0) { - // Copy Constructor for ITS version 10. This function is not to be - // used. If any other instance of this function, other than "this" is - // passed, an error message is returned. - // Inputs: - // const AliITSvPPRasymmFMD &source This class - // Outputs: - // none. - // Return: - // an error message - - if(&source == this) return; - Warning("Copy Constructor","Not allowed to copy AliITSvPPRasymmFMD"); - return; -} -//______________________________________________________________________ -AliITSvPPRasymmFMD& AliITSvPPRasymmFMD::operator=(const AliITSvPPRasymmFMD - &source){ - // Assignment operator for the ITS version 10. This function is not - // to be used. If any other instance of this function, other than "this" - // is passed, an error message is returned. - // Inputs: - // const AliITSvPPRasymmFMD &source This class - // Outputs: - // none. - // Return: - // an error message - - if(&source == this) return *this; - Warning("= operator","Not allowed to copy AliITSvPPRasymmFMD"); - return *this; -} -//______________________________________________________________________ AliITSvPPRasymmFMD::~AliITSvPPRasymmFMD() { // Standard destructor for the ITS version 10. // Inputs: diff --git a/ITS/AliITSvPPRasymmFMD.h b/ITS/AliITSvPPRasymmFMD.h index 5ef347274a9..ad95bb68b56 100644 --- a/ITS/AliITSvPPRasymmFMD.h +++ b/ITS/AliITSvPPRasymmFMD.h @@ -16,8 +16,6 @@ class AliITSvPPRasymmFMD : public AliITS { public: AliITSvPPRasymmFMD(); AliITSvPPRasymmFMD(const char *name, const char *title); - AliITSvPPRasymmFMD(const AliITSvPPRasymmFMD &source); // copy constructor - AliITSvPPRasymmFMD& operator=(const AliITSvPPRasymmFMD &source); // assignment operator virtual ~AliITSvPPRasymmFMD() ; virtual void BuildGeometry(); virtual void CreateGeometry(); @@ -99,6 +97,8 @@ class AliITSvPPRasymmFMD : public AliITS { return fFluid;} private: + AliITSvPPRasymmFMD(const AliITSvPPRasymmFMD &source); // copy constructor + AliITSvPPRasymmFMD& operator=(const AliITSvPPRasymmFMD &source); // assignment operator void InitAliITSgeom(); // TString fEuclidGeomtery,fEuclidMaterial defined in AliModule. diff --git a/ITS/AliITSvPPRcoarseasymm.cxx b/ITS/AliITSvPPRcoarseasymm.cxx index d857d8b761a..b67f38f371a 100644 --- a/ITS/AliITSvPPRcoarseasymm.cxx +++ b/ITS/AliITSvPPRcoarseasymm.cxx @@ -85,26 +85,6 @@ fSuppMat(0) { fIdSens = new Int_t[fIdN]; for (Int_t i=0;i #include #include +#include #include "AliMUONClusterFinderAZ.h" #include "AliMUONClusterDrawAZ.h" diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx index 18585f79e1e..b29eb13e2cf 100644 --- a/PHOS/AliPHOS.cxx +++ b/PHOS/AliPHOS.cxx @@ -16,6 +16,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.102 2006/10/27 17:14:27 kharlov + * Introduce AliDebug and AliLog (B.Polichtchouk) + * * Revision 1.101 2006/10/13 06:47:29 kharlov * Simulation of RAW data applies real mapping (B.Polichtchouk) * @@ -128,13 +131,6 @@ AliPHOS::~AliPHOS() { } -//____________________________________________________________________________ -void AliPHOS::Copy(TObject &obj)const -{ - // copy method to be used by the cpy ctor - TObject::Copy(obj); -} - //____________________________________________________________________________ AliDigitizer* AliPHOS::CreateDigitizer(AliRunDigitizer* manager) const { diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h index 8c65abeb8a8..aa394d8eeb4 100644 --- a/PHOS/AliPHOS.h +++ b/PHOS/AliPHOS.h @@ -7,6 +7,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.68 2006/08/11 12:36:25 cvetan + * Update of the PHOS code needed in order to read and reconstruct the beam test raw data (i.e. without an existing galice.root) + * * Revision 1.67 2006/04/07 08:42:00 hristov * Follow AliAlignObj framework and remove AliPHOSAlignData (Yu.Kharlov) * @@ -56,10 +59,6 @@ public: AliPHOS() ; AliPHOS(const char* name, const char* title="") ; - AliPHOS(AliPHOS & phos) : AliDetector(phos) { - //Copy(*this) ; - phos.Copy(*this); - } virtual ~AliPHOS() ; virtual void AddHit(Int_t, Int_t*, Float_t *) { // do not use this definition but the one below @@ -68,7 +67,6 @@ public: } virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) = 0 ; - virtual void Copy(TObject &phos)const; virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const; virtual void CreateMaterials() ; virtual void Digits2Raw(); @@ -101,8 +99,6 @@ public: virtual AliLoader* MakeLoader(const char* topfoldername); virtual void SetTreeAddress(); virtual const TString Version() const {return TString(" ") ; } - AliPHOS & operator = (const AliPHOS & /*rvalue*/) { - Fatal("operator =", "not implemented") ; return *this ; } protected: @@ -119,7 +115,11 @@ protected: static Double_t fgTimeMax ; // maximum sampled time of the raw RO signal static Double_t fgTimePeak ; // peaking time of the raw RO signal static Double_t fgTimeTrigger ; // time of the trigger for the RO signal - + + private: + AliPHOS(AliPHOS & phos); + AliPHOS & operator = (const AliPHOS & /*rvalue*/); + ClassDef(AliPHOS,6) // Photon Spectrometer Detector (base class) } ; diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx index 51663c622df..f92eb586d21 100644 --- a/PHOS/AliPHOSv0.cxx +++ b/PHOS/AliPHOSv0.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.82 2006/09/27 19:55:57 kharlov + * Alignment object with symbolic volume names are introduced + * * Revision 1.81 2006/03/04 20:25:56 kharlov * Set geom parameters from CDB * @@ -73,13 +76,6 @@ AliPHOSv0::AliPHOSv0(const char *name, const char *title): GetGeometry() ; } -//____________________________________________________________________________ -void AliPHOSv0::Copy(TObject & phos) const -{ - TObject::Copy(phos) ; - AliPHOS::Copy(phos) ; -} - //____________________________________________________________________________ void AliPHOSv0::BuildGeometry() { diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h index 0a8df6bb6b8..f29d59e941d 100644 --- a/PHOS/AliPHOSv0.h +++ b/PHOS/AliPHOSv0.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.44 2006/09/27 19:55:57 kharlov + * Alignment object with symbolic volume names are introduced + * * Revision 1.43 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -33,13 +36,9 @@ class AliPHOSv0 : public AliPHOS { AliPHOSv0() {} AliPHOSv0(const char *name, const char *title="") ; - AliPHOSv0(AliPHOSv0 & phos) : AliPHOS(phos) { - phos.Copy(*this) ; - } virtual ~AliPHOSv0(void){ // dtor } - virtual void Copy(TObject &phos) const; // virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) { //this function is not a final-overrider for AliPHOS::AddHit, to @@ -73,14 +72,10 @@ class AliPHOSv0 : public AliPHOS { return TString("v0") ; } - AliPHOSv0 & operator = (const AliPHOSv0 & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented") ; - return *this ; - } - - protected: + private: + AliPHOSv0(AliPHOSv0 & phos); + AliPHOSv0 & operator = (const AliPHOSv0 & /*rvalue*/); ClassDef(AliPHOSv0,1) // Implementation of PHOS manager class for layout EMC+PPSD diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index 6d221a3920b..ee5047f31b2 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.105 2006/09/13 07:31:01 kharlov + * Effective C++ corrections (T.Pocheptsov) + * * Revision 1.104 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -119,22 +122,6 @@ AliPHOSv1::AliPHOSv1(const char *name, const char *title): fAPDFactor = (fRecalibrationFactor/100.) * fAPDGain ; } -AliPHOSv1::AliPHOSv1(AliPHOSv1 & phos) : - AliPHOSv0(phos), - fLightYieldMean(0.), - fIntrinsicPINEfficiency(0.), - fLightYieldAttenuation(0.), - fRecalibrationFactor(0.), - fElectronsPerGeV(0.), - fAPDGain(0.), - fLightFactor(0.), - fAPDFactor(0.) -{ - //Copy ctor. Can be wrong. - phos.Copy(*this) ; -} - - //____________________________________________________________________________ AliPHOSv1::~AliPHOSv1() { @@ -146,22 +133,6 @@ AliPHOSv1::~AliPHOSv1() } } -//____________________________________________________________________________ -void AliPHOSv1::Copy(TObject & base)const -{ - TObject::Copy(base) ; - AliPHOSv0::Copy(base) ; - AliPHOSv1 &phos = static_cast(base); - phos.fLightYieldMean = fLightYieldMean ; - phos.fIntrinsicPINEfficiency = fIntrinsicPINEfficiency ; - phos.fLightYieldAttenuation = fLightYieldAttenuation ; - phos.fRecalibrationFactor = fRecalibrationFactor ; - phos.fElectronsPerGeV = fElectronsPerGeV ; - phos.fAPDGain = fAPDGain ; - phos.fLightFactor = fLightFactor ; - phos.fAPDFactor = fAPDFactor ; -} - //____________________________________________________________________________ void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t Id, Float_t * hits) { diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h index 2187d28c917..3d5c6af030d 100644 --- a/PHOS/AliPHOSv1.h +++ b/PHOS/AliPHOSv1.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.40 2006/09/13 07:31:01 kharlov + * Effective C++ corrections (T.Pocheptsov) + * * Revision 1.39 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -33,11 +36,8 @@ public: AliPHOSv1(void) ; AliPHOSv1(const char *name, const char *title="") ; - AliPHOSv1(AliPHOSv1 & phos); virtual ~AliPHOSv1(void) ; - virtual void Copy(TObject &phos) const; - using AliPHOSv0::AddHit; virtual void AddHit( Int_t shunt, Int_t primary, Int_t id, Float_t *hits) ; virtual void FinishEvent() ; @@ -50,12 +50,6 @@ public: virtual void StepManager(void) ; virtual const TString Version(void)const { return TString("v1") ; } - AliPHOSv1 & operator = (const AliPHOSv1 & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented") ; - return *this ; - } - void CPVDigitize (TLorentzVector p, Float_t *xy, TClonesArray *digits) ; Float_t CPVPadResponseFunction(Float_t qhit, Float_t zg, Float_t xg) ; Double_t CPVCumulPadResponse(Double_t x, Double_t y) ; @@ -91,6 +85,10 @@ protected: Float_t fLightFactor ; //! a calculated factor Float_t fAPDFactor ; //! a calculated factor + private: + AliPHOSv1(AliPHOSv1 & phos); + AliPHOSv1 & operator = (const AliPHOSv1 & /*rvalue*/); + ClassDef(AliPHOSv1,2) // Implementation of PHOS manager class for layout EMC+PPSD }; diff --git a/PHOS/AliPHOSv2.cxx b/PHOS/AliPHOSv2.cxx index 84dbb11754c..14141056bf3 100644 --- a/PHOS/AliPHOSv2.cxx +++ b/PHOS/AliPHOSv2.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.24 2005/05/28 14:19:05 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -62,13 +65,6 @@ AliPHOSv2::~AliPHOSv2() // dtor } -//____________________________________________________________________________ -void AliPHOSv2::Copy(TObject & phos)const -{ - TObject::Copy(phos) ; - AliPHOSv1::Copy(phos) ; -} - //____________________________________________________________________________ void AliPHOSv2::AddHit(Int_t shunt, Int_t primary, Int_t Id, Float_t * hits) { diff --git a/PHOS/AliPHOSv2.h b/PHOS/AliPHOSv2.h index 12b97bafd68..abda045f409 100644 --- a/PHOS/AliPHOSv2.h +++ b/PHOS/AliPHOSv2.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.19 2005/07/01 20:01:36 kharlov + * Warning fix on AddHit in gcc 3.4.2 + * * Revision 1.18 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -31,12 +34,8 @@ public: AliPHOSv2(void) ; AliPHOSv2(const char *name, const char *title="") ; - AliPHOSv2(AliPHOSv2 & phos) : AliPHOSv1(phos){ - phos.Copy(*this) ; - } virtual ~AliPHOSv2(void) ; - virtual void Copy(TObject &phos) const; using AliPHOSv1::AddHit; virtual void AddHit( Int_t shunt, Int_t primary, Int_t id, Float_t *hits); virtual Int_t IsVersion(void) const { @@ -48,7 +47,9 @@ public: return TString("v2") ; } -protected: +private: + + AliPHOSv2(AliPHOSv2 & phos); ClassDef(AliPHOSv2,1) // Class AliPHOSv0 which allows to write ond disk al the information of the hits. diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx index 08c078b0ee1..53b0c2332e8 100644 --- a/PHOS/AliPHOSvFast.cxx +++ b/PHOS/AliPHOSvFast.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.30 2006/09/13 07:31:01 kharlov + * Effective C++ corrections (T.Pocheptsov) + * * Revision 1.29 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -96,29 +99,6 @@ AliPHOSvFast::AliPHOSvFast(const char *name, const char *title): SetBigBox(2, GetGeometry()->GetOuterBoxSize(2) ); } -//____________________________________________________________________________ -AliPHOSvFast::AliPHOSvFast(AliPHOSvFast & fast) : - AliPHOS(fast), - fBigBoxX(0.), - fBigBoxY(0.), - fBigBoxZ(0.), - fFastRecParticles(0), - fNRecParticles(0), - fRan(0), - fResPara1(0.), - fResPara2(0.), - fResPara3(0.), - fPosParaA0(0.), - fPosParaA1(0.), - fPosParaB0(0.), - fPosParaB1(0.), - fPosParaB2(0.) -{ - //Copy ctor. - fast.Copy(*this) ; -} - - //____________________________________________________________________________ AliPHOSvFast::~AliPHOSvFast() { @@ -130,30 +110,6 @@ AliPHOSvFast::~AliPHOSvFast() } -//____________________________________________________________________________ -void AliPHOSvFast::Copy(TObject & base)const -{ - TObject::Copy(base) ; - AliPHOS::Copy(base) ; - AliPHOSvFast &fast = static_cast(base); - fast.fBigBoxX = fBigBoxX ; - fast.fBigBoxY = fBigBoxY ; - fast.fBigBoxZ = fBigBoxZ ; - fast.fNRecParticles = fNRecParticles ; - fast.fRan = fRan ; - fast.fResPara1 = fResPara1 ; - fast.fResPara2 = fResPara2 ; - fast.fResPara3 = fResPara3 ; - fast.fPosParaA0 = fPosParaA0 ; - fast.fPosParaA1 = fPosParaA1 ; - fast.fPosParaB0 = fPosParaB0 ; - fast.fPosParaB1 = fPosParaB1 ; - fast.fFastRecParticles = new TClonesArray(fFastRecParticles->GetClass()->GetName(), 100) ; - Int_t index ; - for (index = 0 ; index < fFastRecParticles->GetEntries(); index++) - (fast.fFastRecParticles)->AddAt(fFastRecParticles->At(index), index) ; -} - //____________________________________________________________________________ void AliPHOSvFast::AddRecParticle(const AliPHOSFastRecParticle & rp) { diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h index bae38b1289d..e72c1865e1e 100644 --- a/PHOS/AliPHOSvFast.h +++ b/PHOS/AliPHOSvFast.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.26 2006/09/13 07:31:01 kharlov + * Effective C++ corrections (T.Pocheptsov) + * * Revision 1.25 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -40,11 +43,9 @@ public: AliPHOSvFast() ; AliPHOSvFast(const char *name, const char *title="") ; - AliPHOSvFast(AliPHOSvFast & fast); virtual ~AliPHOSvFast(void) ; - virtual void Copy(TObject &fast) const; void AddRecParticle(const AliPHOSFastRecParticle & rp) ; // adds primary particle to the RecParticles list virtual void BuildGeometry(void) ; // creates the geometry for the ROOT display virtual void CreateGeometry(void) ; // creates the geometry for GEANT @@ -74,11 +75,9 @@ public: return TString("vFast") ; } - AliPHOSvFast & operator = (const AliPHOSvFast & ) { - Fatal("operator =", "not implemented") ; return *this ; - } - private: + AliPHOSvFast(AliPHOSvFast & fast); + AliPHOSvFast & operator = (const AliPHOSvFast & ); Float_t fBigBoxX ; // main box containing all PHOS (EMC+PPSD) Float_t fBigBoxY ; // main box containing all PHOS (EMC+PPSD) diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx index 55326627561..311231a071f 100644 --- a/PHOS/AliPHOSvImpacts.cxx +++ b/PHOS/AliPHOSvImpacts.cxx @@ -19,6 +19,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.23 2006/09/13 07:31:01 kharlov + * Effective C++ corrections (T.Pocheptsov) + * * Revision 1.22 2005/06/17 07:39:07 hristov * Removing GetDebug and SetDebug from AliRun and AliModule. Using AliLog for the messages * @@ -103,16 +106,6 @@ AliPHOSvImpacts::AliPHOSvImpacts(const char *name, const char *title): } -//____________________________________________________________________________ -AliPHOSvImpacts::AliPHOSvImpacts(AliPHOSvImpacts & phos): - AliPHOSv1(phos), - fEMCImpacts(0), - fCPVImpacts(0), - fPPSDImpacts(0) -{ - phos.Copy(*this); -} - //____________________________________________________________________________ AliPHOSvImpacts::~AliPHOSvImpacts() { @@ -138,14 +131,6 @@ AliPHOSvImpacts::~AliPHOSvImpacts() } } -//____________________________________________________________________________ -void AliPHOSvImpacts::Copy(TObject & phos) const -{ - TObject::Copy(phos) ; - AliPHOS::Copy(phos) ; -} - - //____________________________________________________________________________ void AliPHOSvImpacts::AddImpact(const char* det, Int_t shunt, Int_t primary, Int_t track, Int_t module, Int_t pid, TLorentzVector p, Float_t *xyz) diff --git a/PHOS/AliPHOSvImpacts.h b/PHOS/AliPHOSvImpacts.h index e223fbac438..1aa58b2fbdb 100644 --- a/PHOS/AliPHOSvImpacts.h +++ b/PHOS/AliPHOSvImpacts.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.9 2006/09/13 07:31:01 kharlov + * Effective C++ corrections (T.Pocheptsov) + * * Revision 1.8 2005/05/28 14:19:05 schutz * Compilation warnings fixed by T.P. * @@ -37,10 +40,8 @@ public: AliPHOSvImpacts(void) ; AliPHOSvImpacts(const char *name, const char *title="") ; - AliPHOSvImpacts(AliPHOSvImpacts & phos); virtual ~AliPHOSvImpacts(void) ; - virtual void Copy(TObject & phos) const; virtual void AddImpact(const char* detector, Int_t shunt, Int_t primary, Int_t track, Int_t module, Int_t pid, TLorentzVector p, Float_t *xyz) ; virtual void MakeBranch(Option_t *opt=" "); @@ -55,12 +56,6 @@ public: return TString("vImpacts") ; } - AliPHOSvImpacts & operator = (const AliPHOSvImpacts & /*rvalue*/) { - // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented") ; - return *this ; - } - protected: TList * fEMCImpacts; // Array of impacts in EMC modules @@ -71,6 +66,9 @@ protected: Int_t fNCPVImpacts[5]; // Number of CPV impacts per module Int_t fNPPSDImpacts[5]; // Number of PPSD impacts per module + private: + AliPHOSvImpacts(AliPHOSvImpacts & phos); + AliPHOSvImpacts & operator = (const AliPHOSvImpacts & /*rvalue*/); ClassDef(AliPHOSvImpacts,1) // Implementation of PHOS manager class for layout EMC+PPSD diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx index e17b0a2cd9e..3161a5706be 100644 --- a/PMD/AliPMDDigitizer.cxx +++ b/PMD/AliPMDDigitizer.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include "AliLog.h" #include "AliRun.h" diff --git a/RICH/AliRICH.h b/RICH/AliRICH.h index 19957fdbfd1..b6e4c98df0c 100644 --- a/RICH/AliRICH.h +++ b/RICH/AliRICH.h @@ -15,9 +15,7 @@ public: //ctor & dtor AliRICH(const char *nm,const char *ttl); //named ctor AliRICH( ):AliDetector( ),fSdi(0),fDig(0),fClu(0) {} //default ctor - AliRICH(const AliRICH &rich ):AliDetector(rich),fSdi(0),fDig(0),fClu(0) {} //copy ctor not implemented virtual ~AliRICH(); - AliRICH& operator=(const AliRICH&) {return *this;} //not implemented //framework part void BuildGeometry ( ) {} //from AliModule invoked from AliMC::InitGeometry() to build geometry for old event display virtual void CreateMaterials ( )=0; //from AliModule invoked from AliMC::ConstructGeometry() to define detector materials @@ -55,6 +53,10 @@ protected: TObjArray *fDig; //! each chamber holds it's one list of digits TObjArray *fClu; //! each chamber holds it's one list of clusters + private: + AliRICH(const AliRICH &rich ); + AliRICH& operator=(const AliRICH&); + ClassDef(AliRICH,11) //Main RICH class };//class AliRICH //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/START/AliSTART.cxx b/START/AliSTART.cxx index 8436c64b794..26dd1ca5418 100755 --- a/START/AliSTART.cxx +++ b/START/AliSTART.cxx @@ -97,7 +97,7 @@ AliSTART::AliSTART(const char *name, const char *title) // fRecPoints = new AliSTARTRecPoint(); fIshunt = 1; // fIdSens = 0; - SetMarkerColor(kRed); + //PH SetMarkerColor(kRed); } //_____________________________________________________________________________ @@ -121,29 +121,6 @@ AliSTART::~AliSTART() { */ } -//______________________________________________________________________________ -AliSTART::AliSTART(const AliSTART &source): - AliDetector(source) -{ - // Copy constructor - // not implemented - AliWarning("Copy constructor not implemented!"); -} - -//______________________________________________________________________________ -AliSTART& AliSTART::operator= (const AliSTART& source) -{ - // Asignment operator - // not implemented - if(this==&source) return *this; - - AliWarning("Asignment operator not implemented!"); - - ((TObject *)this)->operator=(source); - - return *this; -} - //_____________________________________________________________________________ void AliSTART::AddHit(Int_t track, Int_t *vol, Float_t *hits) { diff --git a/START/AliSTART.h b/START/AliSTART.h index 545356501b1..0859b4db853 100755 --- a/START/AliSTART.h +++ b/START/AliSTART.h @@ -61,6 +61,7 @@ protected: AliSTARTdigit *fDigits; AliSTARTRecPoint *fRecPoints; + private: AliSTART(const AliSTART&); AliSTART& operator=(const AliSTART&); diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx index 76a89e1eb77..628332ba39b 100644 --- a/STEER/AliDetector.cxx +++ b/STEER/AliDetector.cxx @@ -68,24 +68,6 @@ AliDetector::AliDetector(): // } -//_______________________________________________________________________ -AliDetector::AliDetector(const AliDetector &det): - AliModule(det), - fTimeGate(200.e-9), - fIshunt(0), - fNhits(0), - fNdigits(0), - fBufferSize(1600), - fMaxIterHit(0), - fCurIterHit(0), - fHits(0), - fDigits(0), - fPoints(0), - fLoader(0x0) -{ - det.Copy(*this); -} - //_____________________________________________________________________________ AliDetector::AliDetector(const char* name,const char *title): AliModule(name,title), @@ -219,15 +201,6 @@ void AliDetector::Browse(TBrowser *b) } } -//_______________________________________________________________________ -void AliDetector::Copy(TObject &) const -{ - // - // Copy *this onto det -- not implemented - // - AliFatal("Not implemented"); -} - //_______________________________________________________________________ void AliDetector::FinishRun() { @@ -344,11 +317,11 @@ void AliDetector::LoadPoints(Int_t) for(trk=0; trkSetMarkerColor(GetMarkerColor()); - points->SetMarkerSize(GetMarkerSize()); + points->SetMarkerColor(3); //PH color=3 was set in AliModule + points->SetMarkerSize(1); //PH size-1 is the default value points->SetDetector(this); points->SetParticle(trk); - points->SetPolyMarker(ntrk[trk],coor[trk],GetMarkerStyle()); + points->SetPolyMarker(ntrk[trk],coor[trk],1);//PH style=1 is the default value fPoints->AddAt(points,trk); delete [] coor[trk]; coor[trk]=0; diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h index de5e6b1f775..aab9a5c3347 100644 --- a/STEER/AliDetector.h +++ b/STEER/AliDetector.h @@ -26,11 +26,9 @@ public: // Creators - distructors AliDetector(const char* name, const char *title); AliDetector(); - AliDetector(const AliDetector &det); virtual ~AliDetector(); // Inline functions - void Copy(TObject &det) const; virtual int GetNdigits() const {return fNdigits;} virtual int GetNhits() const {return fNhits;} TClonesArray *Digits() const {return fDigits;} @@ -39,8 +37,6 @@ public: TObjArray *Points() const {return fPoints;} Int_t GetIshunt() const {return fIshunt;} void SetIshunt(Int_t ishunt) {fIshunt=ishunt;} - AliDetector &operator=(const AliDetector &det) - {det.Copy(*this); return (*this);} // Other methods virtual void Publish(const char *dir, void *c, const char *name=0) const; @@ -87,6 +83,10 @@ protected: AliLoader* fLoader;//! pointer to getter for this module skowron + private: + AliDetector(const AliDetector &det); + AliDetector &operator=(const AliDetector &det); + ClassDef(AliDetector,5) //Base class for ALICE detectors }; #endif diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx index 321db450879..b43b0427d68 100644 --- a/STEER/AliModule.cxx +++ b/STEER/AliModule.cxx @@ -114,40 +114,13 @@ AliModule::AliModule(const char* name,const char *title): gAlice->AddModule(this); - SetMarkerColor(3); + //PH SetMarkerColor(3); // // Clear space for tracking media and material indexes for(Int_t i=0;i<100;i++) (*fIdmate)[i]=(*fIdtmed)[i]=0; } -//_______________________________________________________________________ -AliModule::AliModule(const AliModule &mod): - TNamed(mod), - TAttLine(mod), - TAttMarker(mod), - AliRndm(mod), - fEuclidMaterial(""), - fEuclidGeometry(""), - fIdtmed(0), - fIdmate(0), - fLoMedium(0), - fHiMedium(0), - fActive(0), - fHistograms(0), - fNodes(0), - fEnable(0), - fTrackReferences(0), - fMaxIterTrackRef(0), - fCurrentIterTrackRef(0), - fRunLoader(0) -{ - // - // Copy constructor - // - mod.Copy(*this); -} - //_______________________________________________________________________ AliModule::~AliModule() { @@ -184,15 +157,6 @@ AliModule::~AliModule() } -//_______________________________________________________________________ -void AliModule::Copy(TObject & /* mod */) const -{ - // - // Copy *this onto mod, not implemented for AliModule - // - AliFatal("Not implemented!"); -} - //_______________________________________________________________________ void AliModule::Disable() { diff --git a/STEER/AliModule.h b/STEER/AliModule.h index 0525452b9a0..5999858a0c5 100644 --- a/STEER/AliModule.h +++ b/STEER/AliModule.h @@ -13,11 +13,8 @@ // #include -#include -#include #include -#include "AliRndm.h" #include "AliTriggerDetector.h" class TClonesArray; @@ -36,14 +33,12 @@ class AliRunLoader; class AliRawReader; -class AliModule : public TNamed , public TAttLine, public TAttMarker, - public AliRndm { +class AliModule : public TNamed { public: // Creators - distructors AliModule(const char* name, const char *title); AliModule(); - AliModule(const AliModule &mod); virtual ~AliModule(); // Inline functions @@ -102,7 +97,7 @@ public: virtual void Digits2Raw(); virtual void Raw2Digits() {} virtual Bool_t Raw2SDigits(AliRawReader*) {return kFALSE;} - virtual void Browse(TBrowser *) {} + virtual void Browse(TBrowser *) {} //PH Do we need it? virtual void CreateGeometry() {} virtual void CreateMaterials() {} virtual void AddAlignableVolumes() const; @@ -126,7 +121,7 @@ public: virtual AliLoader* GetLoader() const {return 0x0;} //skowron - virtual void Paint(Option_t *) {} + virtual void Paint(Option_t *) {} //PH Do we need it? virtual void ResetDigits() {} virtual void ResetSDigits() {} virtual void ResetHits() {} @@ -158,11 +153,8 @@ public: {fRunLoader = runLoader;} // - AliModule& operator=(const AliModule &mod) - {mod.Copy(*this); return (*this);} protected: - void Copy(TObject &mod) const; // Data members @@ -184,6 +176,10 @@ protected: AliRunLoader* fRunLoader; //!local pointer to run loader + private: + AliModule(const AliModule &mod); + AliModule& operator=(const AliModule &mod); + ClassDef(AliModule,7) //Base class for ALICE Modules }; #endif diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx index c24b5251a19..171c29351fb 100644 --- a/STRUCT/AliABSO.cxx +++ b/STRUCT/AliABSO.cxx @@ -58,9 +58,9 @@ AliABSO::AliABSO(const char *name, const char *title) // // Standard constructor // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliABSOv0.cxx b/STRUCT/AliABSOv0.cxx index be17e215b45..a5d9fcbfa61 100644 --- a/STRUCT/AliABSOv0.cxx +++ b/STRUCT/AliABSOv0.cxx @@ -70,9 +70,6 @@ AliABSOv0::AliABSOv0(const char *name, const char *title) // // Standard constructor // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx index f74c0b1f4a6..38c5b4e568f 100644 --- a/STRUCT/AliBODY.cxx +++ b/STRUCT/AliBODY.cxx @@ -59,9 +59,9 @@ AliBODY::AliBODY(const char *name, const char *title) // // Standard constructor of the Alice external volume // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliDIPO.cxx b/STRUCT/AliDIPO.cxx index 570e2cbf6ee..e940a21edd6 100644 --- a/STRUCT/AliDIPO.cxx +++ b/STRUCT/AliDIPO.cxx @@ -58,9 +58,9 @@ AliDIPO::AliDIPO(const char *name, const char *title) // // Standard constructor for the Magnetic Dipole // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx index 0de0ff60219..1ee292e88e8 100644 --- a/STRUCT/AliDIPOv2.cxx +++ b/STRUCT/AliDIPOv2.cxx @@ -57,9 +57,6 @@ AliDIPOv2::AliDIPOv2(const char *name, const char *title) { // // Standard constructor for the magnetic dipole version 2 - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); } void AliDIPOv2::CreateGeometry() diff --git a/STRUCT/AliFRAME.cxx b/STRUCT/AliFRAME.cxx index 0befd7bfa6f..4f0c2ed680f 100644 --- a/STRUCT/AliFRAME.cxx +++ b/STRUCT/AliFRAME.cxx @@ -59,8 +59,8 @@ AliFRAME::AliFRAME(const char *name, const char *title) // Standard constructor // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx index fa5216a7704..081df85bd1f 100644 --- a/STRUCT/AliHALL.cxx +++ b/STRUCT/AliHALL.cxx @@ -61,9 +61,9 @@ AliHALL::AliHALL(const char *name, const char *title) // // Standard constructor for the experimental Hall // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx index 95a841f1b98..5508150f18b 100644 --- a/STRUCT/AliMAG.cxx +++ b/STRUCT/AliMAG.cxx @@ -71,9 +71,9 @@ AliMAG::AliMAG(const char *name, const char *title) */ //End_Html - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliPIPE.cxx b/STRUCT/AliPIPE.cxx index d2973276c9f..87f2a8a9e9f 100644 --- a/STRUCT/AliPIPE.cxx +++ b/STRUCT/AliPIPE.cxx @@ -47,8 +47,8 @@ AliPIPE::AliPIPE(const char *name, const char *title) // // Standard constructor for beam pipe // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx index c98468b3fde..70a9cc65d2e 100644 --- a/STRUCT/AliSHIL.cxx +++ b/STRUCT/AliSHIL.cxx @@ -52,9 +52,9 @@ AliSHIL::AliSHIL(const char *name, const char *title) // // Standard constructor for muon shield // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx index 8c5f8e20f61..9e10f27985f 100644 --- a/STRUCT/AliSHILv0.cxx +++ b/STRUCT/AliSHILv0.cxx @@ -56,9 +56,6 @@ AliSHILv0::AliSHILv0(const char *name, const char *title) // // Standard constructor for muon shield // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); // Pb cone not yet compatible with muon chamber inner radii // Switched off by default } diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx index 99704b08dfd..f4975f89f50 100644 --- a/STRUCT/AliSHILv2.cxx +++ b/STRUCT/AliSHILv2.cxx @@ -59,9 +59,6 @@ AliSHILv2::AliSHILv2(const char *name, const char *title) // // Standard constructor for muon shield // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); // Pb cone not yet compatible with muon chamber inner radii // Switched off by default } diff --git a/STRUCT/AliSHILv3.cxx b/STRUCT/AliSHILv3.cxx index 7b33c968437..ae048445425 100644 --- a/STRUCT/AliSHILv3.cxx +++ b/STRUCT/AliSHILv3.cxx @@ -53,9 +53,6 @@ AliSHILv3::AliSHILv3(const char *name, const char *title) // // Standard constructor for muon shield // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); } //_____________________________________________________________________________ diff --git a/STRUCT/AliSHILvF.cxx b/STRUCT/AliSHILvF.cxx index d1d2adde86e..0f993210b63 100644 --- a/STRUCT/AliSHILvF.cxx +++ b/STRUCT/AliSHILvF.cxx @@ -51,9 +51,6 @@ AliSHILvF::AliSHILvF(const char *name, const char *title) // // Standard constructor for muon shield // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); // Pb cone not yet compatible with muon chamber inner radii // Switched off by default } diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index 2053cb7b0d6..164de8abc12 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -145,9 +145,9 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) // // (Transfer Functions to be inserted here) // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); // Strip Parameters //fGapA = 4.; //cm Gap beetween tilted strip in A-type plate diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx index 2e44199a303..b302981fc2a 100644 --- a/TOF/AliTOFDigitizer.cxx +++ b/TOF/AliTOFDigitizer.cxx @@ -25,11 +25,12 @@ // // //_________________________________________________________________________// -#include "Riostream.h" +#include -#include "TFile.h" -#include "TH1F.h" -#include "TTree.h" +#include +#include +#include +#include #include "AliLoader.h" #include "AliLog.h" @@ -47,13 +48,6 @@ #include "AliTOFSDigit.h" #include "AliTOF.h" -extern TDirectory *gDirectory; -extern TFile *gFile; -extern TRandom *gRandom; - -extern AliRun *gAlice; - - ClassImp(AliTOFDigitizer) //___________________________________________ diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx index d7a8a987d4f..d86265ce7bd 100644 --- a/TOF/AliTOFSDigitizer.cxx +++ b/TOF/AliTOFSDigitizer.cxx @@ -26,11 +26,12 @@ // Use case: see AliTOFhits2sdigits.C macro in the CVS // //__________________________________________________________// -#include "TBenchmark.h" -#include "TF1.h" -#include "TFile.h" -#include "TParticle.h" -#include "TTree.h" +#include +#include +#include +#include +#include +#include #include "AliLoader.h" #include "AliLog.h" @@ -46,14 +47,6 @@ #include "AliTOFSDigit.h" #include "AliTOF.h" -extern TBenchmark *gBenchmark; -extern TDirectory *gDirectory; -extern TFile *gFile; -extern TRandom *gRandom; -extern TROOT *gROOT; - -extern AliRun *gAlice; - ClassImp(AliTOFSDigitizer) diff --git a/TOF/AliTOFT0.cxx b/TOF/AliTOFT0.cxx index c3dead29946..02d8508cf6d 100644 --- a/TOF/AliTOFT0.cxx +++ b/TOF/AliTOFT0.cxx @@ -79,16 +79,17 @@ // //_________________________________________________________________________ -#include "TCanvas.h" -#include "TClonesArray.h" -#include "TFile.h" -#include "TFolder.h" -#include "TFrame.h" -#include "TH1.h" -#include "TParticle.h" -#include "TBenchmark.h" -#include "TTask.h" -#include "TTree.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "AliMC.h" #include "AliRun.h" @@ -97,14 +98,6 @@ #include "AliTOFT0.h" #include "AliTOF.h" -extern TBenchmark *gBenchmark; -extern TSystem *gSystem; -extern TRandom *gRandom; -extern TROOT *gROOT; - -extern AliRun *gAlice; - - ClassImp(AliTOFT0) //____________________________________________________________________________ diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx index 50a64d09984..231ecaedb57 100644 --- a/TPC/AliTPC.cxx +++ b/TPC/AliTPC.cxx @@ -161,7 +161,7 @@ AliTPC::AliTPC(const char *name, const char *title) fIshunt = 0; // // Initialise color attributes - SetMarkerColor(kYellow); + //PH SetMarkerColor(kYellow); // // Set TPC parameters @@ -179,36 +179,6 @@ AliTPC::AliTPC(const char *name, const char *title) } //_____________________________________________________________________________ -AliTPC::AliTPC(const AliTPC& t):AliDetector(t), - fDefaults(0), - fSens(0), - fNsectors(0), - fDigitsArray(0), - fTPCParam(0), - fTrackHits(0), - fHitType(0), - fDigitsSwitch(0), - fSide(0), - fNoiseDepth(0), - fNoiseTable(0), - fCurrentNoise(0), - fActiveSectors(0) -{ - // - // dummy copy constructor - // -} -// -AliTPC & AliTPC::operator =(const AliTPC & param) -{ - // - // assignment operator - dummy - // - fDefaults=param.fDefaults; - return (*this); -} - -// AliTPC::~AliTPC() { // @@ -2448,11 +2418,11 @@ void AliTPC::LoadPoints2(Int_t) for(trk=0; trkSetMarkerColor(GetMarkerColor()); - points->SetMarkerSize(GetMarkerSize()); + points->SetMarkerColor(kYellow); //PH kYellow it the default in TPC + points->SetMarkerSize(1);//PH Default size=1 points->SetDetector(this); points->SetParticle(trk); - points->SetPolyMarker(ntrk[trk],coor[trk],GetMarkerStyle()); + points->SetPolyMarker(ntrk[trk],coor[trk],1); // Default style=1 fPoints->AddAt(points,trk); delete [] coor[trk]; coor[trk]=0; @@ -2531,7 +2501,7 @@ void AliTPC::LoadPoints3(Int_t) for(trk=0; trkSetMarkerColor(GetMarkerColor()+1); + points->SetMarkerColor(kMagenta); //PH kYellow + 1 is kMagenta points->SetMarkerStyle(5); points->SetMarkerSize(0.2); points->SetDetector(this); diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h index ae46b868543..73e7be787f4 100644 --- a/TPC/AliTPC.h +++ b/TPC/AliTPC.h @@ -30,8 +30,6 @@ class AliTPC : public AliDetector { public: AliTPC(); AliTPC(const char *name, const char *title); - AliTPC(const AliTPC& t); - AliTPC &operator = (const AliTPC & param); virtual AliLoader* MakeLoader(const char* topfoldername); @@ -118,6 +116,8 @@ protected: Float_t fSide; // selects left(-1), right(+1), or both(0) sides of the TPC private: + AliTPC(const AliTPC& t); + AliTPC &operator = (const AliTPC & param); // void SetDefaults(); void DigitizeRow(Int_t irow,Int_t isec,TObjArray **rowTriplet); diff --git a/TPC/AliTPCFast.cxx b/TPC/AliTPCFast.cxx index 09ee1679667..7d800a98698 100644 --- a/TPC/AliTPCFast.cxx +++ b/TPC/AliTPCFast.cxx @@ -23,6 +23,7 @@ #include #include +#include #include "AliRunLoader.h" #include "AliRun.h" diff --git a/TPC/AliTPCtrackerParam.cxx b/TPC/AliTPCtrackerParam.cxx index 413bc5d3967..693e8da5ad9 100644 --- a/TPC/AliTPCtrackerParam.cxx +++ b/TPC/AliTPCtrackerParam.cxx @@ -76,6 +76,7 @@ #include #include #include +#include //------ AliRoot headers ------ #include "AliGausCorr.h" #include "AliTracker.h" diff --git a/TRD/AliTRD.cxx b/TRD/AliTRD.cxx index 81fab43b8b5..27235dc906a 100644 --- a/TRD/AliTRD.cxx +++ b/TRD/AliTRD.cxx @@ -116,22 +116,7 @@ AliTRD::AliTRD(const char *name, const char *title) fHits = new TClonesArray("AliTRDhit",405); gAlice->GetMCApp()->AddHitList(fHits); - SetMarkerColor(kWhite); - -} - -//_____________________________________________________________________________ -AliTRD::AliTRD(const AliTRD &trd) - :AliDetector(trd) - ,fGeometry(trd.fGeometry) - ,fGasDensity(trd.fGasDensity) - ,fFoilDensity(trd.fFoilDensity) - ,fDrawTR(trd.fDrawTR) - ,fDisplayType(trd.fDisplayType) -{ - // - // Copy constructor - // + //PH SetMarkerColor(kWhite); } @@ -433,21 +418,6 @@ void AliTRD::BuildGeometry() } -//_____________________________________________________________________________ -void AliTRD::Copy(TObject &trd) const -{ - // - // Copy function - // - - ((AliTRD &) trd).fGeometry = fGeometry; - ((AliTRD &) trd).fGasDensity = fGasDensity; - ((AliTRD &) trd).fFoilDensity = fFoilDensity; - ((AliTRD &) trd).fDrawTR = fDrawTR; - ((AliTRD &) trd).fDisplayType = fDisplayType; - -} - //_____________________________________________________________________________ void AliTRD::CreateGeometry() { @@ -844,9 +814,9 @@ void AliTRD::LoadPoints(Int_t ) // Set the dEdx points if (ntrkE[trk]) { - points->SetMarkerColor(GetMarkerColor()); - points->SetMarkerSize(GetMarkerSize()); - points->SetPolyMarker(ntrkE[trk],coorE[trk],GetMarkerStyle()); + points->SetMarkerColor(kWhite); //PH This is the default color in TRD + points->SetMarkerSize(1); //PH Default size=1 + points->SetPolyMarker(ntrkE[trk],coorE[trk],1); //PH Default style=1 delete [] coorE[trk]; coorE[trk] = 0; } diff --git a/TRD/AliTRD.h b/TRD/AliTRD.h index 5d374c22b78..6d3028d6853 100644 --- a/TRD/AliTRD.h +++ b/TRD/AliTRD.h @@ -34,12 +34,8 @@ class AliTRD : public AliDetector { AliTRD(); AliTRD(const char *name, const char *title); - AliTRD(const AliTRD &trd); virtual ~AliTRD(); - AliTRD &operator=(const AliTRD &trd); - - virtual void Copy(TObject &trd) const; virtual void Init(); virtual Int_t IsVersion() const = 0; virtual void ResetDigits(); @@ -90,6 +86,10 @@ class AliTRD : public AliDetector { Int_t fDrawTR; // Switches marking the TR photons in the display Int_t fDisplayType; // Display type (0: normal, 1: detailed) + private: + AliTRD(const AliTRD &trd); + AliTRD &operator=(const AliTRD &trd); + ClassDef(AliTRD,9) // Transition Radiation Detector base class }; diff --git a/TRD/AliTRDv1.cxx b/TRD/AliTRDv1.cxx index 3f13891dbd1..f32a01dc906 100644 --- a/TRD/AliTRDv1.cxx +++ b/TRD/AliTRDv1.cxx @@ -81,28 +81,6 @@ AliTRDv1::AliTRDv1(const char *name, const char *title) } -//_____________________________________________________________________________ -AliTRDv1::AliTRDv1(const AliTRDv1 &trd) - :AliTRD(trd) - ,fTRon(trd.fTRon) - ,fTR(NULL) - ,fTypeOfStepManager(trd.fTypeOfStepManager) - ,fStepSize(trd.fStepSize) - ,fDeltaE(NULL) - ,fDeltaG(NULL) - ,fTrackLength0(trd.fTrackLength0) - ,fPrimaryTrackPid(trd.fPrimaryTrackPid) -{ - // - // Copy constructor - // - - fDeltaE->Copy(*((AliTRDv1 &) trd).fDeltaE); - fDeltaG->Copy(*((AliTRDv1 &) trd).fDeltaG); - fTR->Copy(*((AliTRDv1 &) trd).fTR); - -} - //_____________________________________________________________________________ AliTRDv1::~AliTRDv1() { @@ -127,38 +105,6 @@ AliTRDv1::~AliTRDv1() } -//_____________________________________________________________________________ -AliTRDv1 &AliTRDv1::operator=(const AliTRDv1 &trd) -{ - // - // Assignment operator - // - - if (this != &trd) ((AliTRDv1 &) trd).Copy(*this); - - return *this; - -} - -//_____________________________________________________________________________ -void AliTRDv1::Copy(TObject &trd) const -{ - // - // Copy function - // - - ((AliTRDv1 &) trd).fTypeOfStepManager = fTypeOfStepManager; - ((AliTRDv1 &) trd).fStepSize = fStepSize; - ((AliTRDv1 &) trd).fTRon = fTRon; - ((AliTRDv1 &) trd).fTrackLength0 = fTrackLength0; - ((AliTRDv1 &) trd).fPrimaryTrackPid = fPrimaryTrackPid; - - fDeltaE->Copy(*((AliTRDv1 &) trd).fDeltaE); - fDeltaG->Copy(*((AliTRDv1 &) trd).fDeltaG); - fTR->Copy(*((AliTRDv1 &) trd).fTR); - -} - //_____________________________________________________________________________ void AliTRDv1::AddAlignableVolumes() const { diff --git a/TRD/AliTRDv1.h b/TRD/AliTRDv1.h index 65de0ad989a..99891f6b1ba 100644 --- a/TRD/AliTRDv1.h +++ b/TRD/AliTRDv1.h @@ -30,11 +30,8 @@ class AliTRDv1 : public AliTRD { AliTRDv1(); AliTRDv1(const char *name, const char *title); - AliTRDv1(const AliTRDv1 &trd); virtual ~AliTRDv1(); - AliTRDv1 &operator=(const AliTRDv1 &trd); - virtual void Copy(TObject &trd) const; virtual void Init(); virtual Int_t IsVersion() const { return 1; } @@ -66,6 +63,8 @@ class AliTRDv1 : public AliTRD { Double_t fStepSize; // Used for the fixed step size private: + AliTRDv1(const AliTRDv1 &trd); + AliTRDv1 &operator=(const AliTRDv1 &trd); Double_t BetheBloch(Double_t bg); Double_t BetheBlochGeant(Double_t bg); diff --git a/VZERO/AliVZERO.cxx b/VZERO/AliVZERO.cxx index 8d2a6f4081d..6b614c0745e 100755 --- a/VZERO/AliVZERO.cxx +++ b/VZERO/AliVZERO.cxx @@ -80,7 +80,7 @@ AliVZERO::AliVZERO(const char *name, const char *title) fMaxDestepQua = -1.0; fMaxDestepAlu = -1.0; - SetMarkerColor(kRed); + //PH SetMarkerColor(kRed); } //_____________________________________________________________________________ diff --git a/VZERO/AliVZERODigitizer.cxx b/VZERO/AliVZERODigitizer.cxx index 67e8bbf3114..58a2576a905 100644 --- a/VZERO/AliVZERODigitizer.cxx +++ b/VZERO/AliVZERODigitizer.cxx @@ -23,6 +23,7 @@ // --- ROOT system --- #include +#include // --- AliRoot header files --- #include "AliVZEROConst.h" -- 2.43.0