From 2998a151f46aea532dfcd9512addd458259d4e9b Mon Sep 17 00:00:00 2001 From: martinez Date: Thu, 18 Sep 2003 10:06:42 +0000 Subject: [PATCH] Coding conventions corrections only (I.Hrivnacova) --- MUON/mapping/AliMpConnection.cxx | 24 ++++++++++++++++++++ MUON/mapping/AliMpConnection.h | 7 ++++++ MUON/mapping/AliMpConstants.cxx | 1 + MUON/mapping/AliMpConstants.h | 3 ++- MUON/mapping/AliMpGraphContext.h | 9 ++++---- MUON/mapping/AliMpMotif.cxx | 6 +++++ MUON/mapping/AliMpMotif.h | 19 ++++++++++------ MUON/mapping/AliMpMotifPainter.cxx | 8 ++++++- MUON/mapping/AliMpMotifPainter.h | 2 ++ MUON/mapping/AliMpMotifPositionPadIterator.h | 1 - MUON/mapping/AliMpMotifSpecial.cxx | 11 ++++++++- MUON/mapping/AliMpMotifSpecial.h | 5 ++-- MUON/mapping/AliMpNeighboursPadIterator.h | 8 ++----- MUON/mapping/AliMpPad.cxx | 2 +- MUON/mapping/AliMpPad.h | 4 ++-- MUON/mapping/AliMpPadIteratorPtr.cxx | 24 ++++++++++++++++++++ MUON/mapping/AliMpPadIteratorPtr.h | 13 +++++++---- MUON/mapping/AliMpPadPair.h | 2 +- MUON/mapping/AliMpPlaneAreaPadIterator.h | 2 -- MUON/mapping/AliMpPlaneSegmentation.h | 2 +- MUON/mapping/AliMpRow.h | 1 - MUON/mapping/AliMpRowPainter.cxx | 9 ++++++++ MUON/mapping/AliMpRowPainter.h | 5 +++- MUON/mapping/AliMpRowSegmentPainter.cxx | 10 +++++++- MUON/mapping/AliMpRowSegmentPainter.h | 15 +++++++----- MUON/mapping/AliMpSectorAreaHPadIterator.h | 2 -- MUON/mapping/AliMpSectorPadIterator.h | 9 ++++---- MUON/mapping/AliMpSectorPainter.cxx | 13 ++++++++--- MUON/mapping/AliMpSectorPainter.h | 15 +++++++----- MUON/mapping/AliMpSectorPosition.cxx | 24 ++++++++++++++++++++ MUON/mapping/AliMpSectorPosition.h | 6 +++++ MUON/mapping/AliMpSectorSegmentation.cxx | 7 ++++-- MUON/mapping/AliMpSectorSegmentation.h | 5 ++-- MUON/mapping/AliMpSubZone.cxx | 2 +- MUON/mapping/AliMpSubZone.h | 9 +++----- MUON/mapping/AliMpSubZonePainter.cxx | 8 +++++++ MUON/mapping/AliMpSubZonePainter.h | 6 +++-- MUON/mapping/AliMpTransformPadIterator.cxx | 1 + MUON/mapping/AliMpTransformPadIterator.h | 3 ++- MUON/mapping/AliMpVMotif.cxx | 6 +++++ MUON/mapping/AliMpVMotif.h | 1 + MUON/mapping/AliMpVPainter.cxx | 3 +++ MUON/mapping/AliMpVPainter.h | 6 ++--- MUON/mapping/AliMpVSegmentation.h | 7 +++--- MUON/mapping/AliMpZone.cxx | 1 + MUON/mapping/AliMpZone.h | 4 ++-- MUON/mapping/AliMpZonePainter.cxx | 11 ++++++++- MUON/mapping/AliMpZonePainter.h | 8 ++++--- 48 files changed, 262 insertions(+), 88 deletions(-) diff --git a/MUON/mapping/AliMpConnection.cxx b/MUON/mapping/AliMpConnection.cxx index 504f3493979..0a5adeac289 100755 --- a/MUON/mapping/AliMpConnection.cxx +++ b/MUON/mapping/AliMpConnection.cxx @@ -7,6 +7,8 @@ // // Authors: David Guez, Ivana Hrivnacova; IPN Orsay +#include + #include "AliMpConnection.h" ClassImp(AliMpConnection) @@ -24,6 +26,13 @@ AliMpConnection::AliMpConnection(Int_t padNum, Int_t bergNum,Int_t kaptonNum, // } +//_____________________________________________________________________________ +AliMpConnection::AliMpConnection(const AliMpConnection& right) + : TObject(right) { +// + Fatal("AliMpConnection", "Copy constructor not provided."); +} + //_____________________________________________________________________________ AliMpConnection::AliMpConnection() : TObject(), @@ -40,3 +49,18 @@ AliMpConnection::AliMpConnection() AliMpConnection::~AliMpConnection() { // } + +// operators + +//_____________________________________________________________________________ +AliMpConnection& +AliMpConnection::operator=(const AliMpConnection& right) +{ + // check assignement to self + if (this == &right) return *this; + + Fatal("operator =", "Assignement operator not provided."); + + return *this; +} + diff --git a/MUON/mapping/AliMpConnection.h b/MUON/mapping/AliMpConnection.h index c3d933edf94..fee94dd9b6e 100755 --- a/MUON/mapping/AliMpConnection.h +++ b/MUON/mapping/AliMpConnection.h @@ -11,6 +11,7 @@ #define ALI_MP_CONNECTION_H #include +#include #include "AliMpMotifType.h" #include "AliMpIntPair.h" @@ -36,6 +37,12 @@ class AliMpConnection : public TObject // modifiers void SetOwner(AliMpMotifType *owner) {fOwner=owner;} + protected: + AliMpConnection(const AliMpConnection& right); + + // operators + AliMpConnection& operator=(const AliMpConnection& right); + private: // data members Int_t fPadNum; // Pad number diff --git a/MUON/mapping/AliMpConstants.cxx b/MUON/mapping/AliMpConstants.cxx index d4c4c37d953..32ff67fcc5e 100755 --- a/MUON/mapping/AliMpConstants.cxx +++ b/MUON/mapping/AliMpConstants.cxx @@ -8,6 +8,7 @@ // Authors: David Guez, Ivana Hrivnacova; IPN Orsay #include +#include #include "AliMpConstants.h" diff --git a/MUON/mapping/AliMpConstants.h b/MUON/mapping/AliMpConstants.h index 50ba66eaab5..819793b4c03 100755 --- a/MUON/mapping/AliMpConstants.h +++ b/MUON/mapping/AliMpConstants.h @@ -11,7 +11,8 @@ #define ALI_MP_CONSTANTS_H #include -#include + +class TVector2; class AliMpConstants : public TObject { diff --git a/MUON/mapping/AliMpGraphContext.h b/MUON/mapping/AliMpGraphContext.h index 0fef553b514..cb1ed588d0d 100755 --- a/MUON/mapping/AliMpGraphContext.h +++ b/MUON/mapping/AliMpGraphContext.h @@ -8,8 +8,8 @@ // // Author: David GUEZ, IPN Orsay -#ifndef ALI_MP_GRAPH_CONTEXT -#define ALI_MP_GRAPH_CONTEXT +#ifndef ALI_MP_GRAPH_CONTEXT_H +#define ALI_MP_GRAPH_CONTEXT_H #include #include @@ -18,7 +18,8 @@ class MPainter; -class AliMpGraphContext : public TObject{ +class AliMpGraphContext : public TObject +{ public: void Push() const; void Pop(); @@ -66,6 +67,6 @@ class AliMpGraphContext : public TObject{ ClassDef(AliMpGraphContext,1) // Correspondance pad area/real world }; -#endif //ALI_MP_GRAPH_CONTEXT +#endif //ALI_MP_GRAPH_CONTEXT_H diff --git a/MUON/mapping/AliMpMotif.cxx b/MUON/mapping/AliMpMotif.cxx index 88830e61d62..244a8063567 100755 --- a/MUON/mapping/AliMpMotif.cxx +++ b/MUON/mapping/AliMpMotif.cxx @@ -33,6 +33,12 @@ AliMpMotif::AliMpMotif(const TString &id, AliMpMotifType *motifType, // multiplying the total dimension by the number of pads } +//_____________________________________________________________________________ +AliMpMotif::~AliMpMotif() +{ + // destructor +} + //_____________________________________________________________________________ TVector2 AliMpMotif::GetPadDimensions(const AliMpIntPair& localIndices) const diff --git a/MUON/mapping/AliMpMotif.h b/MUON/mapping/AliMpMotif.h index ef2ac537ba2..1c5a22ebc15 100755 --- a/MUON/mapping/AliMpMotif.h +++ b/MUON/mapping/AliMpMotif.h @@ -8,24 +8,26 @@ // // Authors: David Guez, Ivana Hrivnacova; IPN Orsay -#ifndef M_MOTIF_H -#define M_MOTIF_H +#ifndef ALI_MP_MOTIF_H +#define ALI_MP_MOTIF_H #include -#include #include #include "AliMpVMotif.h" +class TString; + class AliMpMotif : public AliMpVMotif { public: AliMpMotif(const TString &id,AliMpMotifType *motifType, const TVector2& padDimension); AliMpMotif(); + virtual ~AliMpMotif(); // Access methods virtual Int_t GetNofPadDimensions() const; - virtual TVector2 GetPadDimensions(Int_t i = 0) const; + virtual TVector2 GetPadDimensions(Int_t /*i*/ = 0) const; virtual TVector2 GetPadDimensions(const AliMpIntPair& localIndices) const; // Geometry @@ -46,7 +48,10 @@ class AliMpMotif : public AliMpVMotif // inline functions -inline Int_t AliMpMotif::GetNofPadDimensions() const { return 1; } -inline TVector2 AliMpMotif::GetPadDimensions(Int_t i) const { return fPadDimensions; } +inline Int_t AliMpMotif::GetNofPadDimensions() const +{ return 1; } + +inline TVector2 AliMpMotif::GetPadDimensions(Int_t /*i*/) const +{ return fPadDimensions; } -#endif //M_MOTIF_H +#endif //ALI_MP_MOTIF_H diff --git a/MUON/mapping/AliMpMotifPainter.cxx b/MUON/mapping/AliMpMotifPainter.cxx index 48ad555a1b1..528095556cf 100755 --- a/MUON/mapping/AliMpMotifPainter.cxx +++ b/MUON/mapping/AliMpMotifPainter.cxx @@ -7,7 +7,8 @@ // // Authors: David Guez, IPN Orsay -#include +#include +#include #include "AliMpMotifPainter.h" #include "AliMpGraphContext.h" @@ -34,6 +35,11 @@ AliMpMotifPainter::AliMpMotifPainter(AliMpMotifPosition *motifPos) } //_______________________________________________________________________ +AliMpMotifPainter::~AliMpMotifPainter() +{ + // default dummy constructor +} +//_______________________________________________________________________ void AliMpMotifPainter::DumpObject() { // Draw the owned object diff --git a/MUON/mapping/AliMpMotifPainter.h b/MUON/mapping/AliMpMotifPainter.h index 5f3cb8f89b7..73f5c3d9462 100755 --- a/MUON/mapping/AliMpMotifPainter.h +++ b/MUON/mapping/AliMpMotifPainter.h @@ -19,6 +19,8 @@ class AliMpMotifPainter : public AliMpVPainter public: AliMpMotifPainter(); AliMpMotifPainter(AliMpMotifPosition *motifPos); + virtual ~AliMpMotifPainter(); + virtual void DumpObject(); //-MENU- virtual void Paint(Option_t *option); virtual TVector2 GetPosition() const; diff --git a/MUON/mapping/AliMpMotifPositionPadIterator.h b/MUON/mapping/AliMpMotifPositionPadIterator.h index ab0d7933164..aa5d019c572 100755 --- a/MUON/mapping/AliMpMotifPositionPadIterator.h +++ b/MUON/mapping/AliMpMotifPositionPadIterator.h @@ -11,7 +11,6 @@ #define ALI_MP_MOTIF_POSITION_PAD_ITERATOR_H #include "AliMpVPadIterator.h" -#include "AliMpIntPair.h" #include "AliMpMotifTypePadIterator.h" class AliMpMotifPosition; diff --git a/MUON/mapping/AliMpMotifSpecial.cxx b/MUON/mapping/AliMpMotifSpecial.cxx index 216c3c0514e..2e3f88e9710 100755 --- a/MUON/mapping/AliMpMotifSpecial.cxx +++ b/MUON/mapping/AliMpMotifSpecial.cxx @@ -8,6 +8,8 @@ // // Authors: David Guez, Ivana Hrivnacova; IPN Orsay +#include + #include "AliMpMotifSpecial.h" #include "AliMpMotifType.h" #include "AliMpIntPair.h" @@ -25,8 +27,8 @@ Int_t AliMpMotifSpecial::VectorIndex(const AliMpIntPair& indices) const } - //public methods + //______________________________________________________________________________ AliMpMotifSpecial::AliMpMotifSpecial(): AliMpVMotif(), @@ -50,6 +52,13 @@ AliMpMotifSpecial::AliMpMotifSpecial(const TString &id, fPadDimensionsVector.resize(motifType->GetNofPadsX()*motifType->GetNofPadsY()); } +//______________________________________________________________________________ +AliMpMotifSpecial::~AliMpMotifSpecial() +{ + //destructor +} + + //______________________________________________________________________________ TVector2 AliMpMotifSpecial::GetPadDimensions(const AliMpIntPair& localIndices) const diff --git a/MUON/mapping/AliMpMotifSpecial.h b/MUON/mapping/AliMpMotifSpecial.h index c759d7b2964..8b86c81b44b 100755 --- a/MUON/mapping/AliMpMotifSpecial.h +++ b/MUON/mapping/AliMpMotifSpecial.h @@ -11,18 +11,19 @@ #ifndef ALI_MP_MOTIF_SPECIAL_H #define ALI_MP_MOTIF_SPECIAL_H -#include -#include #include #include "AliMpMotifTypes.h" #include "AliMpVMotif.h" +class TString; + class AliMpMotifSpecial : public AliMpVMotif { public: AliMpMotifSpecial(const TString &id, AliMpMotifType *motifType); AliMpMotifSpecial(); + virtual ~AliMpMotifSpecial(); // Access methods virtual TVector2 GetPadDimensions(const AliMpIntPair& localIndices) const; diff --git a/MUON/mapping/AliMpNeighboursPadIterator.h b/MUON/mapping/AliMpNeighboursPadIterator.h index 5fe9ae1ac01..270f3e30982 100755 --- a/MUON/mapping/AliMpNeighboursPadIterator.h +++ b/MUON/mapping/AliMpNeighboursPadIterator.h @@ -10,16 +10,12 @@ #ifndef ALI_MP_NEIGHBOURS_PAD_ITERATOR_H #define ALI_MP_NEIGHBOURS_PAD_ITERATOR_H -#include -#include - #include "AliMpSectorTypes.h" #include "AliMpVPadIterator.h" -#include "AliMpMotifTypePadIterator.h" -#include "AliMpIntPair.h" #include "AliMpPad.h" class AliMpSectorSegmentation; +class AliMpIntPair; class AliMpNeighboursPadIterator : public AliMpVPadIterator { @@ -44,7 +40,7 @@ class AliMpNeighboursPadIterator : public AliMpVPadIterator private: // static members - static const UInt_t fgkInvalidIndex; + static const UInt_t fgkInvalidIndex; // invalid index number // private methods Bool_t IsNeighbours(const AliMpPad& pad) const; diff --git a/MUON/mapping/AliMpPad.cxx b/MUON/mapping/AliMpPad.cxx index 81cf2fb2b0c..1edc3ddc15b 100755 --- a/MUON/mapping/AliMpPad.cxx +++ b/MUON/mapping/AliMpPad.cxx @@ -144,7 +144,7 @@ return left.GetIndices() -#include "AliMpVPadIterator.h" +class AliMpVPadIterator; class AliMpPadIteratorPtr : public TObject { @@ -28,12 +28,15 @@ class AliMpPadIteratorPtr : public TObject AliMpVPadIterator* operator->() { return fIterator; } AliMpVPadIterator& operator*() { return *fIterator; } - private: - // disallow copy and assignment to avoid - // multiple deletion of fIterator + protected: AliMpPadIteratorPtr(const AliMpPadIteratorPtr& right); + + // operators AliMpPadIteratorPtr& operator=(const AliMpPadIteratorPtr& right); - + // copy and assignment are disallowed to avoid + // multiple deletion of fIterator + + private: // data members AliMpVPadIterator* fIterator; //The pad iterator diff --git a/MUON/mapping/AliMpPadPair.h b/MUON/mapping/AliMpPadPair.h index bdcaa95c6ae..abd7b1d37b9 100644 --- a/MUON/mapping/AliMpPadPair.h +++ b/MUON/mapping/AliMpPadPair.h @@ -33,7 +33,7 @@ class AliMpPadPair : public TObject private: // data members - PadPair fPair; + PadPair fPair; // pad pair ClassDef(AliMpPadPair,1) //utility class for the motif type }; diff --git a/MUON/mapping/AliMpPlaneAreaPadIterator.h b/MUON/mapping/AliMpPlaneAreaPadIterator.h index 7cf40e401e7..198b1f0d6ed 100755 --- a/MUON/mapping/AliMpPlaneAreaPadIterator.h +++ b/MUON/mapping/AliMpPlaneAreaPadIterator.h @@ -11,8 +11,6 @@ #ifndef ALI_MP_PLANE_AREA_PAD_ITERATOR_H #define ALI_MP_PLANE_AREA_PAD_ITERATOR_H -#include - #include "AliMpPlaneTypes.h" #include "AliMpVPadIterator.h" #include "AliMpTransformPadIterator.h" diff --git a/MUON/mapping/AliMpPlaneSegmentation.h b/MUON/mapping/AliMpPlaneSegmentation.h index 0b0cb06b464..2d9e4277993 100644 --- a/MUON/mapping/AliMpPlaneSegmentation.h +++ b/MUON/mapping/AliMpPlaneSegmentation.h @@ -24,9 +24,9 @@ #include "AliMpPlaneTypes.h" #include "AliMpVSegmentation.h" +#include "AliMpTransformer.h" #include "AliMpIntPair.h" #include "AliMpPad.h" -#include "AliMpTransformer.h" class AliMpPlane; class AliMpSectorSegmentation; diff --git a/MUON/mapping/AliMpRow.h b/MUON/mapping/AliMpRow.h index f92fcfcafbe..b83b2569d9c 100755 --- a/MUON/mapping/AliMpRow.h +++ b/MUON/mapping/AliMpRow.h @@ -10,7 +10,6 @@ #ifndef ALI_MP_ROW_H #define ALI_MP_ROW_H -#include #include #include "AliMpSectorTypes.h" diff --git a/MUON/mapping/AliMpRowPainter.cxx b/MUON/mapping/AliMpRowPainter.cxx index ea100928171..f1f953deee1 100755 --- a/MUON/mapping/AliMpRowPainter.cxx +++ b/MUON/mapping/AliMpRowPainter.cxx @@ -7,6 +7,9 @@ // // Authors: David Guez, IPN Orsay +#include +#include + #include "AliMpRowPainter.h" #include "AliMpGraphContext.h" #include "AliMpRow.h" @@ -30,6 +33,12 @@ AliMpRowPainter::AliMpRowPainter(AliMpRow *row) // normal constructor } +//_______________________________________________________________________ +AliMpRowPainter::~AliMpRowPainter() +{ + // destructor +} + //_______________________________________________________________________ void AliMpRowPainter::DumpObject() { diff --git a/MUON/mapping/AliMpRowPainter.h b/MUON/mapping/AliMpRowPainter.h index 7b5fed39855..285ca1ea5b5 100755 --- a/MUON/mapping/AliMpRowPainter.h +++ b/MUON/mapping/AliMpRowPainter.h @@ -19,11 +19,14 @@ class AliMpRowPainter : public AliMpVPainter public: AliMpRowPainter(); AliMpRowPainter(AliMpRow *row); - virtual void DumpObject(); //*MENU* + virtual ~AliMpRowPainter(); + + virtual void DumpObject(); //-MENU- virtual void Draw(Option_t *option); virtual void Paint(Option_t *option); virtual TVector2 GetPosition() const; virtual TVector2 GetDimensions() const; + private: AliMpRow *fRow; // the row to paint ClassDef(AliMpRowPainter,1) // Row painter diff --git a/MUON/mapping/AliMpRowSegmentPainter.cxx b/MUON/mapping/AliMpRowSegmentPainter.cxx index af6de878913..f12f4a6aa83 100755 --- a/MUON/mapping/AliMpRowSegmentPainter.cxx +++ b/MUON/mapping/AliMpRowSegmentPainter.cxx @@ -7,6 +7,9 @@ // // Authors: David Guez, IPN Orsay +#include +#include + #include "AliMpRowSegmentPainter.h" #include "AliMpGraphContext.h" #include "AliMpVRowSegment.h" @@ -32,6 +35,11 @@ AliMpRowSegmentPainter::AliMpRowSegmentPainter(AliMpVRowSegment *row) } //_______________________________________________________________________ +AliMpRowSegmentPainter::~AliMpRowSegmentPainter() +{ + // destructor +} +//_______________________________________________________________________ TVector2 AliMpRowSegmentPainter::GetPosition() const { // Get the owned object's position @@ -97,7 +105,7 @@ void AliMpRowSegmentPainter::Draw(Option_t *option) //_______________________________________________________________________ -void AliMpRowSegmentPainter::Paint(Option_t *option) +void AliMpRowSegmentPainter::Paint(Option_t* /*option*/) { // Paint the object AliMpGraphContext *gr = AliMpGraphContext::Instance(); diff --git a/MUON/mapping/AliMpRowSegmentPainter.h b/MUON/mapping/AliMpRowSegmentPainter.h index 7ee3151c3d8..f75bcfbdf51 100755 --- a/MUON/mapping/AliMpRowSegmentPainter.h +++ b/MUON/mapping/AliMpRowSegmentPainter.h @@ -7,8 +7,8 @@ // // Authors: David Guez, IPN Orsay -#ifndef M_ROW_SEGMENT_PAINTER_H -#define M_ROW_SEGMENT_PAINTER_H +#ifndef ALI_MP_ROW_SEGMENT_PAINTER_H +#define ALI_MP_ROW_SEGMENT_PAINTER_H #include "AliMpVPainter.h" @@ -19,13 +19,16 @@ class AliMpRowSegmentPainter : public AliMpVPainter public: AliMpRowSegmentPainter(); AliMpRowSegmentPainter(AliMpVRowSegment *rowSegment); - virtual void DumpObject(); //*MENU* - virtual void Draw(Option_t *option); - virtual void Paint(Option_t *option); + virtual ~AliMpRowSegmentPainter(); + + virtual void DumpObject(); //-MENU- + virtual void Draw(Option_t* option); + virtual void Paint(Option_t* /*option*/); virtual TVector2 GetPosition() const; virtual TVector2 GetDimensions() const; + private: AliMpVRowSegment *fRowSegment; // the row segment to draw ClassDef(AliMpRowSegmentPainter,1) // Row Segment painter }; -#endif //M_ROW_SEGMENT_PAINTER_H +#endif //ALI_MP_ROW_SEGMENT_PAINTER_H diff --git a/MUON/mapping/AliMpSectorAreaHPadIterator.h b/MUON/mapping/AliMpSectorAreaHPadIterator.h index b9667956304..a772cd75a2b 100755 --- a/MUON/mapping/AliMpSectorAreaHPadIterator.h +++ b/MUON/mapping/AliMpSectorAreaHPadIterator.h @@ -11,8 +11,6 @@ #ifndef ALI_MP_SECTOR_AREA_H_PAD_ITERATOR_H #define ALI_MP_SECTOR_AREA_H_PAD_ITERATOR_H -#include - #include "AliMpVPadIterator.h" #include "AliMpArea.h" #include "AliMpPad.h" diff --git a/MUON/mapping/AliMpSectorPadIterator.h b/MUON/mapping/AliMpSectorPadIterator.h index eface744ccb..16a4ed8edcc 100755 --- a/MUON/mapping/AliMpSectorPadIterator.h +++ b/MUON/mapping/AliMpSectorPadIterator.h @@ -7,11 +7,10 @@ // // Authors: David Guez, Ivana Hrivnacova; IPN Orsay -#ifndef M_SECTOR_PAD_ITERATOR_H -#define M_SECTOR_PAD_ITERATOR_H - -#include +#ifndef ALI_MP_SECTOR_PAD_ITERATOR_H +#define ALI_MP_SECTOR_PAD_ITERATOR_H +#include "AliMpVPadIterator.h" #include "AliMpMotifPositionPadIterator.h" class AliMpSector; @@ -52,4 +51,4 @@ class AliMpSectorPadIterator : public AliMpVPadIterator ClassDef(AliMpSectorPadIterator,1) // iterator over motif's pads }; -#endif // M_SECTOR_PAD_ITERATOR_H +#endif // ALI_MP_SECTOR_PAD_ITERATOR_H diff --git a/MUON/mapping/AliMpSectorPainter.cxx b/MUON/mapping/AliMpSectorPainter.cxx index 5390b9071f2..c058995bda6 100755 --- a/MUON/mapping/AliMpSectorPainter.cxx +++ b/MUON/mapping/AliMpSectorPainter.cxx @@ -2,6 +2,9 @@ // // Authors: David Guez, IPN Orsay +#include +#include + #include "AliMpSectorPainter.h" #include "AliMpGraphContext.h" #include "AliMpSector.h" @@ -9,12 +12,11 @@ #include "AliMpSubZone.h" #include "AliMpRow.h" #include "AliMpVRowSegment.h" -//#include "AliMpZonePainter.h" ClassImp(AliMpSectorPainter) //_______________________________________________________________________ - AliMpSectorPainter::AliMpSectorPainter() +AliMpSectorPainter::AliMpSectorPainter() :AliMpVPainter(), fSector(0) { @@ -29,6 +31,11 @@ AliMpSectorPainter::AliMpSectorPainter(AliMpSector *sector) } //_______________________________________________________________________ +AliMpSectorPainter::~AliMpSectorPainter() +{ + // destructor +} +//_______________________________________________________________________ void AliMpSectorPainter::DumpObject() { // Draw the owned object @@ -164,7 +171,7 @@ void AliMpSectorPainter::Draw(Option_t *option) //_______________________________________________________________________ -void AliMpSectorPainter::Paint(Option_t *option) +void AliMpSectorPainter::Paint(Option_t* /*option*/) { // Paint the object AliMpGraphContext *gr = AliMpGraphContext::Instance(); diff --git a/MUON/mapping/AliMpSectorPainter.h b/MUON/mapping/AliMpSectorPainter.h index f523e799592..8f2d82bd58f 100755 --- a/MUON/mapping/AliMpSectorPainter.h +++ b/MUON/mapping/AliMpSectorPainter.h @@ -7,8 +7,8 @@ // // Authors: David Guez, IPN Orsay -#ifndef M_SECTOR_PAINTER_H -#define M_SECTOR_PAINTER_H +#ifndef ALI_MP_SECTOR_PAINTER_H +#define ALI_MP_SECTOR_PAINTER_H #include "AliMpVPainter.h" @@ -19,13 +19,16 @@ class AliMpSectorPainter : public AliMpVPainter public: AliMpSectorPainter(); AliMpSectorPainter(AliMpSector *sector); - virtual void Draw(Option_t *option); - virtual void Paint(Option_t *option); - virtual void DumpObject(); // *MENU* + virtual ~AliMpSectorPainter(); + + virtual void Draw(Option_t* option); + virtual void Paint(Option_t* /*option*/); + virtual void DumpObject(); // -MENU- virtual TVector2 GetPosition() const; virtual TVector2 GetDimensions() const; + private: AliMpSector *fSector; // the sector to draw ClassDef(AliMpSectorPainter,1) // Sector painter }; -#endif //M_SECTOR_PAINTER_H +#endif //ALI_MP_SECTOR_PAINTER_H diff --git a/MUON/mapping/AliMpSectorPosition.cxx b/MUON/mapping/AliMpSectorPosition.cxx index 8e20cce1c0f..d13d3515967 100644 --- a/MUON/mapping/AliMpSectorPosition.cxx +++ b/MUON/mapping/AliMpSectorPosition.cxx @@ -9,6 +9,8 @@ // // Authors: David Guez, Ivana Hrivnacova; IPN Orsay +#include + #include "AliMpSectorPosition.h" ClassImp(AliMpSectorPosition) @@ -25,6 +27,13 @@ AliMpSectorPosition::AliMpSectorPosition(const AliMpSector* sector, // } +//_____________________________________________________________________________ +AliMpSectorPosition::AliMpSectorPosition(const AliMpSectorPosition& right) + : TObject(right) { +// + Fatal("AliMpSectorPosition", "Copy constructor not provided."); +} + //_____________________________________________________________________________ AliMpSectorPosition::AliMpSectorPosition() : TObject(), @@ -39,3 +48,18 @@ AliMpSectorPosition::AliMpSectorPosition() AliMpSectorPosition::~AliMpSectorPosition() { // } + +// operators + +//_____________________________________________________________________________ +AliMpSectorPosition& +AliMpSectorPosition::operator=(const AliMpSectorPosition& right) +{ + // check assignement to self + if (this == &right) return *this; + + Fatal("operator =", "Assignement operator not provided."); + + return *this; +} + diff --git a/MUON/mapping/AliMpSectorPosition.h b/MUON/mapping/AliMpSectorPosition.h index 05e713e82db..f7a352257da 100644 --- a/MUON/mapping/AliMpSectorPosition.h +++ b/MUON/mapping/AliMpSectorPosition.h @@ -32,6 +32,12 @@ class AliMpSectorPosition : public TObject TVector2 GetOffset() const; AliMpIntPair GetScale() const; + protected: + AliMpSectorPosition(const AliMpSectorPosition& right); + + // operators + AliMpSectorPosition& operator=(const AliMpSectorPosition& right); + private: // data members const AliMpSector* fkSector; // sector diff --git a/MUON/mapping/AliMpSectorSegmentation.cxx b/MUON/mapping/AliMpSectorSegmentation.cxx index dd5b9bf336e..7ba6a99b9d5 100755 --- a/MUON/mapping/AliMpSectorSegmentation.cxx +++ b/MUON/mapping/AliMpSectorSegmentation.cxx @@ -16,6 +16,7 @@ #include "AliMpSectorSegmentation.h" #include "AliMpSector.h" #include "AliMpZone.h" +#include "AliMpSubZone.h" #include "AliMpRow.h" #include "AliMpVRowSegment.h" #include "AliMpMotifMap.h" @@ -25,6 +26,8 @@ #include "AliMpNeighboursPadIterator.h" #include "AliMpSectorAreaHPadIterator.h" #include "AliMpSectorAreaVPadIterator.h" +#include "AliMpIntPair.h" +#include "AliMpArea.h" #include "AliMpConstants.h" ClassImp(AliMpSectorSegmentation) @@ -440,7 +443,7 @@ Int_t AliMpSectorSegmentation::Zone(const AliMpPad& pad, Bool_t warning) const return 0; } - PadDimensionsMap::const_iterator it; + PadDimensionsMapCIterator it; for (it = fPadDimensionsMap.begin(); it != fPadDimensionsMap.end(); ++it) { if (AliMpConstants::IsEqual(it->second, pad.Dimensions())) return it->first; @@ -458,7 +461,7 @@ AliMpSectorSegmentation::PadDimensions(Int_t zone, Bool_t warning) const // Returns the pad dimensions for the zone with the specified zone index. // --- - PadDimensionsMap::const_iterator it = fPadDimensionsMap.find(zone); + PadDimensionsMapCIterator it = fPadDimensionsMap.find(zone); if (it != fPadDimensionsMap.end()) return it->second; if (warning) Warning("PadDimensions(zone)", "not found"); diff --git a/MUON/mapping/AliMpSectorSegmentation.h b/MUON/mapping/AliMpSectorSegmentation.h index b50952b1c74..3b75b791088 100755 --- a/MUON/mapping/AliMpSectorSegmentation.h +++ b/MUON/mapping/AliMpSectorSegmentation.h @@ -17,14 +17,13 @@ #include "AliMpSectorTypes.h" #include "AliMpVSegmentation.h" -#include "AliMpIntPair.h" -#include "AliMpPadPair.h" #include "AliMpPad.h" -#include "AliMpArea.h" class AliMpSector; class AliMpMotifPosition; class AliMpVPadIterator; +class AliMpIntPair; +class AliMpArea; class AliMpSectorSegmentation : public AliMpVSegmentation { diff --git a/MUON/mapping/AliMpSubZone.cxx b/MUON/mapping/AliMpSubZone.cxx index a3171b2bade..776a07f5422 100755 --- a/MUON/mapping/AliMpSubZone.cxx +++ b/MUON/mapping/AliMpSubZone.cxx @@ -48,7 +48,7 @@ void AliMpSubZone::AddRowSegment(AliMpVRowSegment* rowSegment) //_____________________________________________________________________________ -void AliMpSubZone::Print() const +void AliMpSubZone::Print(const char* /*option*/) const { // Prints motif position Ids for all row segments. // -- diff --git a/MUON/mapping/AliMpSubZone.h b/MUON/mapping/AliMpSubZone.h index 5ea811ff622..361e0cbca7b 100755 --- a/MUON/mapping/AliMpSubZone.h +++ b/MUON/mapping/AliMpSubZone.h @@ -27,7 +27,7 @@ class AliMpSubZone : public TObject // methods void AddRowSegment(AliMpVRowSegment* rowSegment); - void Print() const; + virtual void Print(const char* /*option*/ = 0) const; // access methods Int_t GetNofRowSegments() const; @@ -35,12 +35,9 @@ class AliMpSubZone : public TObject AliMpVMotif* GetMotif() const; private: - // unused derrived functions - virtual void Print(const char* option) const {} - // data members - AliMpVMotif* fMotif; - RowSegmentVector fSegments; + AliMpVMotif* fMotif; // the motif in this subzone + RowSegmentVector fSegments;// contained row segments ClassDef(AliMpSubZone,1) //Zone segment }; diff --git a/MUON/mapping/AliMpSubZonePainter.cxx b/MUON/mapping/AliMpSubZonePainter.cxx index 88653a2e00c..f5409053093 100755 --- a/MUON/mapping/AliMpSubZonePainter.cxx +++ b/MUON/mapping/AliMpSubZonePainter.cxx @@ -7,6 +7,9 @@ // // Authors: David Guez, IPN Orsay +#include +#include + #include "AliMpSubZonePainter.h" #include "AliMpGraphContext.h" #include "AliMpSubZone.h" @@ -31,6 +34,11 @@ AliMpSubZonePainter::AliMpSubZonePainter(AliMpSubZone *subZone) } //_______________________________________________________________________ +AliMpSubZonePainter::~AliMpSubZonePainter() +{ + // destructor +} +//_______________________________________________________________________ Int_t AliMpSubZonePainter::DistancetoPrimitive(Int_t x, Int_t y) { // dist to the nearest segment center if (x,y) is inside the sub-zone diff --git a/MUON/mapping/AliMpSubZonePainter.h b/MUON/mapping/AliMpSubZonePainter.h index 9e03f0895bb..ed422f6fe8b 100755 --- a/MUON/mapping/AliMpSubZonePainter.h +++ b/MUON/mapping/AliMpSubZonePainter.h @@ -19,15 +19,17 @@ class AliMpSubZonePainter : public AliMpVPainter public: AliMpSubZonePainter(); AliMpSubZonePainter(AliMpSubZone *subZone); - virtual void DumpObject(); //*MENU* + virtual ~AliMpSubZonePainter(); + + virtual void DumpObject(); //-MENU- virtual void Draw(Option_t *option); virtual void Paint(Option_t *option); // get/set methods virtual TVector2 GetPosition() const; virtual TVector2 GetDimensions() const; virtual Int_t DistancetoPrimitive(Int_t x, Int_t y); - private: + private: AliMpSubZone *fSubZone; // the subzone to draw ClassDef(AliMpSubZonePainter,1) // SubZone painter }; diff --git a/MUON/mapping/AliMpTransformPadIterator.cxx b/MUON/mapping/AliMpTransformPadIterator.cxx index 796beb17de9..c689b0f3ba0 100755 --- a/MUON/mapping/AliMpTransformPadIterator.cxx +++ b/MUON/mapping/AliMpTransformPadIterator.cxx @@ -9,6 +9,7 @@ // Authors: David Guez, Ivana Hrivnacova; IPN Orsay #include "AliMpTransformPadIterator.h" +#include "AliMpTransformer.h" ClassImp(AliMpTransformPadIterator) diff --git a/MUON/mapping/AliMpTransformPadIterator.h b/MUON/mapping/AliMpTransformPadIterator.h index 8aebe308bb2..bb1c658179c 100755 --- a/MUON/mapping/AliMpTransformPadIterator.h +++ b/MUON/mapping/AliMpTransformPadIterator.h @@ -12,9 +12,10 @@ #define ALI_MP_TRANSFORM_PAD_ITERATOR_H #include "AliMpVPadIterator.h" -#include "AliMpTransformer.h" #include "AliMpPad.h" +class AliMpTransformer; + class AliMpTransformPadIterator : public AliMpVPadIterator { public: diff --git a/MUON/mapping/AliMpVMotif.cxx b/MUON/mapping/AliMpVMotif.cxx index c8c6d4fb599..2d6d4791d63 100755 --- a/MUON/mapping/AliMpVMotif.cxx +++ b/MUON/mapping/AliMpVMotif.cxx @@ -39,6 +39,12 @@ AliMpVMotif::AliMpVMotif(const TString &id, AliMpMotifType *motifType): } +//_____________________________________________________________________________ +AliMpVMotif::~AliMpVMotif() +{ + // destructor +} + //_____________________________________________________________________________ AliMpConnection* AliMpVMotif::FindConnectionByLocalPos(const TVector2& localPos) const diff --git a/MUON/mapping/AliMpVMotif.h b/MUON/mapping/AliMpVMotif.h index 7932085de10..131de0bf142 100755 --- a/MUON/mapping/AliMpVMotif.h +++ b/MUON/mapping/AliMpVMotif.h @@ -24,6 +24,7 @@ class AliMpVMotif : public TObject public: AliMpVMotif(const TString &id, AliMpMotifType *motifType); AliMpVMotif(); + virtual ~AliMpVMotif(); // Access methods AliMpMotifType *GetMotifType() const; diff --git a/MUON/mapping/AliMpVPainter.cxx b/MUON/mapping/AliMpVPainter.cxx index 923da66090b..95a44f49886 100755 --- a/MUON/mapping/AliMpVPainter.cxx +++ b/MUON/mapping/AliMpVPainter.cxx @@ -8,6 +8,9 @@ // Authors: David Guez, IPN Orsay #include +#include +#include +#include #include "AliMpVPainter.h" #include "AliMpGraphContext.h" diff --git a/MUON/mapping/AliMpVPainter.h b/MUON/mapping/AliMpVPainter.h index 7015e604f28..905b61c8134 100755 --- a/MUON/mapping/AliMpVPainter.h +++ b/MUON/mapping/AliMpVPainter.h @@ -11,11 +11,9 @@ #define ALI_MP_V_PAINTER_H #include -#include #include -#include -#include -#include + +class TList; class AliMpVPainter : public TObject { diff --git a/MUON/mapping/AliMpVSegmentation.h b/MUON/mapping/AliMpVSegmentation.h index 1c868a3a78f..46d5bd7db70 100644 --- a/MUON/mapping/AliMpVSegmentation.h +++ b/MUON/mapping/AliMpVSegmentation.h @@ -14,14 +14,15 @@ #define ALI_MP_V_SEGMENTATION_H #include -#include -#include "AliMpIntPair.h" #include "AliMpPadPair.h" #include "AliMpPad.h" -#include "AliMpArea.h" + +class TVector2; class AliMpVPadIterator; +class AliMpIntPair; +class AliMpArea; class AliMpVSegmentation : public TObject { diff --git a/MUON/mapping/AliMpZone.cxx b/MUON/mapping/AliMpZone.cxx index aaf03a9ad8d..2642d04a100 100755 --- a/MUON/mapping/AliMpZone.cxx +++ b/MUON/mapping/AliMpZone.cxx @@ -9,6 +9,7 @@ // Authors: David Guez, Ivana Hrivnacova; IPN Orsay #include "AliMpZone.h" +#include "AliMpSubZone.h" ClassImp(AliMpZone) diff --git a/MUON/mapping/AliMpZone.h b/MUON/mapping/AliMpZone.h index 9e55c4552e7..de0289bb712 100755 --- a/MUON/mapping/AliMpZone.h +++ b/MUON/mapping/AliMpZone.h @@ -12,11 +12,11 @@ #define ALI_MP_ZONE_H #include -#include #include #include "AliMpSectorTypes.h" -#include "AliMpSubZone.h" + +class AliMpSubZone; class AliMpZone : public TObject { diff --git a/MUON/mapping/AliMpZonePainter.cxx b/MUON/mapping/AliMpZonePainter.cxx index 7bf51cc1c60..9811737ea60 100755 --- a/MUON/mapping/AliMpZonePainter.cxx +++ b/MUON/mapping/AliMpZonePainter.cxx @@ -7,12 +7,14 @@ // // Authors: David Guez, IPN Orsay +#include +#include + #include "AliMpZonePainter.h" #include "AliMpGraphContext.h" #include "AliMpZone.h" #include "AliMpSubZone.h" #include "AliMpVRowSegment.h" -//#include "AliMpSubZonePainter.h" ClassImp(AliMpZonePainter) @@ -33,6 +35,13 @@ AliMpZonePainter::AliMpZonePainter(AliMpZone *zone) } +//_______________________________________________________________________ +AliMpZonePainter::~AliMpZonePainter() +{ + // destructor + +} + //_______________________________________________________________________ Int_t AliMpZonePainter::DistancetoPrimitive(Int_t x, Int_t y) { diff --git a/MUON/mapping/AliMpZonePainter.h b/MUON/mapping/AliMpZonePainter.h index c125f789fb5..66875c3c563 100755 --- a/MUON/mapping/AliMpZonePainter.h +++ b/MUON/mapping/AliMpZonePainter.h @@ -7,8 +7,8 @@ // // Authors: David Guez, IPN Orsay -#ifndef M_ZONE_PAINTER_H -#define M_ZONE_PAINTER_H +#ifndef ALI_MP_ZONE_PAINTER_H +#define ALI_MP_ZONE_PAINTER_H #include "AliMpVPainter.h" @@ -19,6 +19,8 @@ class AliMpZonePainter : public AliMpVPainter public: AliMpZonePainter(); AliMpZonePainter(AliMpZone *zone); + virtual ~AliMpZonePainter(); + virtual void DumpObject(); //*MENU* virtual void Draw(Option_t *option); virtual void Paint(Option_t *option); @@ -31,4 +33,4 @@ class AliMpZonePainter : public AliMpVPainter AliMpZone *fZone; // the zone to draw ClassDef(AliMpZonePainter,1) // Zone painter }; -#endif //M_ZONE_PAINTER_H +#endif //ALI_MP_ZONE_PAINTER_H -- 2.43.0