Coding conventions corrections only
authormartinez <martinez@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 18 Sep 2003 10:06:42 +0000 (10:06 +0000)
committermartinez <martinez@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 18 Sep 2003 10:06:42 +0000 (10:06 +0000)
(I.Hrivnacova)

48 files changed:
MUON/mapping/AliMpConnection.cxx
MUON/mapping/AliMpConnection.h
MUON/mapping/AliMpConstants.cxx
MUON/mapping/AliMpConstants.h
MUON/mapping/AliMpGraphContext.h
MUON/mapping/AliMpMotif.cxx
MUON/mapping/AliMpMotif.h
MUON/mapping/AliMpMotifPainter.cxx
MUON/mapping/AliMpMotifPainter.h
MUON/mapping/AliMpMotifPositionPadIterator.h
MUON/mapping/AliMpMotifSpecial.cxx
MUON/mapping/AliMpMotifSpecial.h
MUON/mapping/AliMpNeighboursPadIterator.h
MUON/mapping/AliMpPad.cxx
MUON/mapping/AliMpPad.h
MUON/mapping/AliMpPadIteratorPtr.cxx
MUON/mapping/AliMpPadIteratorPtr.h
MUON/mapping/AliMpPadPair.h
MUON/mapping/AliMpPlaneAreaPadIterator.h
MUON/mapping/AliMpPlaneSegmentation.h
MUON/mapping/AliMpRow.h
MUON/mapping/AliMpRowPainter.cxx
MUON/mapping/AliMpRowPainter.h
MUON/mapping/AliMpRowSegmentPainter.cxx
MUON/mapping/AliMpRowSegmentPainter.h
MUON/mapping/AliMpSectorAreaHPadIterator.h
MUON/mapping/AliMpSectorPadIterator.h
MUON/mapping/AliMpSectorPainter.cxx
MUON/mapping/AliMpSectorPainter.h
MUON/mapping/AliMpSectorPosition.cxx
MUON/mapping/AliMpSectorPosition.h
MUON/mapping/AliMpSectorSegmentation.cxx
MUON/mapping/AliMpSectorSegmentation.h
MUON/mapping/AliMpSubZone.cxx
MUON/mapping/AliMpSubZone.h
MUON/mapping/AliMpSubZonePainter.cxx
MUON/mapping/AliMpSubZonePainter.h
MUON/mapping/AliMpTransformPadIterator.cxx
MUON/mapping/AliMpTransformPadIterator.h
MUON/mapping/AliMpVMotif.cxx
MUON/mapping/AliMpVMotif.h
MUON/mapping/AliMpVPainter.cxx
MUON/mapping/AliMpVPainter.h
MUON/mapping/AliMpVSegmentation.h
MUON/mapping/AliMpZone.cxx
MUON/mapping/AliMpZone.h
MUON/mapping/AliMpZonePainter.cxx
MUON/mapping/AliMpZonePainter.h

index 504f349..0a5adea 100755 (executable)
@@ -7,6 +7,8 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
+#include <TError.h>
+
 #include "AliMpConnection.h"
 
 ClassImp(AliMpConnection)
@@ -25,6 +27,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(),
     fPadNum(-1),
@@ -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;  
+}    
+
index c3d933e..fee94dd 100755 (executable)
@@ -11,6 +11,7 @@
 #define ALI_MP_CONNECTION_H
 
 #include <TObject.h>
+#include <TString.h>
 
 #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
index d4c4c37..32ff67f 100755 (executable)
@@ -8,6 +8,7 @@
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include <TMath.h>
+#include <TVector2.h>
 
 #include "AliMpConstants.h"
 
index 50ba66e..819793b 100755 (executable)
@@ -11,7 +11,8 @@
 #define ALI_MP_CONSTANTS_H
 
 #include <TObject.h>
-#include <TVector2.h>
+
+class TVector2;
 
 class AliMpConstants : public TObject
 {
index 0fef553..cb1ed58 100755 (executable)
@@ -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 <TObject.h>
 #include <TVector2.h>
@@ -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
 
 
index 88830e6..244a806 100755 (executable)
@@ -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
index ef2ac53..1c5a22e 100755 (executable)
@@ -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 <TObject.h>
-#include <TString.h>
 #include <TVector2.h>
 
 #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
index 48ad555..5280955 100755 (executable)
@@ -7,7 +7,8 @@
 //
 // Authors: David Guez, IPN Orsay
 
-#include <Riostream.h>
+#include <TVirtualX.h>
+#include <TPad.h>
  
 #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
index 5f3cb8f..73f5c3d 100755 (executable)
@@ -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;
index ab0d793..aa5d019 100755 (executable)
@@ -11,7 +11,6 @@
 #define ALI_MP_MOTIF_POSITION_PAD_ITERATOR_H
 
 #include "AliMpVPadIterator.h"
-#include "AliMpIntPair.h"
 #include "AliMpMotifTypePadIterator.h"
 
 class AliMpMotifPosition;
index 216c3c0..2e3f88e 100755 (executable)
@@ -8,6 +8,8 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
+#include <TString.h>
+
 #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(),
@@ -51,6 +53,13 @@ AliMpMotifSpecial::AliMpMotifSpecial(const TString &id,
 }
 
 //______________________________________________________________________________
+AliMpMotifSpecial::~AliMpMotifSpecial()
+{
+  //destructor
+}
+
+
+//______________________________________________________________________________
 TVector2 
 AliMpMotifSpecial::GetPadDimensions(const AliMpIntPair& localIndices) const
 {
index c759d7b..8b86c81 100755 (executable)
 #ifndef ALI_MP_MOTIF_SPECIAL_H
 #define ALI_MP_MOTIF_SPECIAL_H
 
-#include <TObject.h>
-#include <TString.h>
 #include <TVector2.h>
 
 #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;
index 5fe9ae1..270f3e3 100755 (executable)
 #ifndef ALI_MP_NEIGHBOURS_PAD_ITERATOR_H
 #define ALI_MP_NEIGHBOURS_PAD_ITERATOR_H
 
-#include <TObject.h>
-#include <TVector2.h>
-
 #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;
index 81cf2fb..1edc3dd 100755 (executable)
@@ -144,7 +144,7 @@ return left.GetIndices()<right.GetIndices();
 }
 
 //_____________________________________________________________________________
-void AliMpPad::Print() const
+void AliMpPad::Print(const char* /*option*/) const
 {
 // Prints all pad data.
 // ---
index 4016b7f..3edcb83 100755 (executable)
@@ -31,7 +31,7 @@ class AliMpPad : public TObject
   AliMpPad& operator = (const AliMpPad& src) ;
   
   // methods
-  void Print() const;
+  virtual void Print(const char* /*option*/ = "") const;
 
   // static get methods
   static AliMpPad Invalid() {return AliMpPad();}
@@ -45,7 +45,7 @@ class AliMpPad : public TObject
 
  private:
   // unused derived functions
-  virtual void Print(const char* option) const {}
+  // virtual void Print(const char* /*option*/) const;
 
   // data members
   AliMpIntPair  fLocation;  //pad location
index 155302e..ca23f16 100755 (executable)
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include "AliMpPadIteratorPtr.h"
+#include "AliMpVPadIterator.h"
 
 ClassImp(AliMpPadIteratorPtr)
 
+//_____________________________________________________________________________
 AliMpPadIteratorPtr::AliMpPadIteratorPtr(AliMpVPadIterator* it)
   : fIterator(it)
 {}
 
+//_____________________________________________________________________________
+AliMpPadIteratorPtr::AliMpPadIteratorPtr(const AliMpPadIteratorPtr& right) 
+  : TObject(right) {
+// 
+  Fatal("AliMpPadIteratorPtr", "Copy constructor not provided.");
+}
+
+//_____________________________________________________________________________
 AliMpPadIteratorPtr::~AliMpPadIteratorPtr() {
 //
   delete fIterator;
 }
 
+// operators
+
+//_____________________________________________________________________________
+AliMpPadIteratorPtr& 
+AliMpPadIteratorPtr::operator=(const AliMpPadIteratorPtr& right)
+{
+  // check assignement to self
+  if (this == &right) return *this;
+
+  Fatal("operator =", "Assignement operator not provided.");
+    
+  return *this;  
+}    
+
index d83fbf8..59c03d2 100755 (executable)
@@ -16,7 +16,7 @@
 
 #include <TObject.h>
 
-#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
      
index bdcaa95..abd7b1d 100644 (file)
@@ -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
 };
index 7cf40e4..198b1f0 100755 (executable)
@@ -11,8 +11,6 @@
 #ifndef ALI_MP_PLANE_AREA_PAD_ITERATOR_H
 #define ALI_MP_PLANE_AREA_PAD_ITERATOR_H
 
-#include <TObject.h>
-
 #include "AliMpPlaneTypes.h"
 #include "AliMpVPadIterator.h"
 #include "AliMpTransformPadIterator.h"
index 0b0cb06..2d9e427 100644 (file)
@@ -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;
index f92fcfc..b83b256 100755 (executable)
@@ -10,7 +10,6 @@
 #ifndef ALI_MP_ROW_H
 #define ALI_MP_ROW_H
 
-#include <TString.h>
 #include <TVector2.h>
 
 #include "AliMpSectorTypes.h"
index ea10092..f1f953d 100755 (executable)
@@ -7,6 +7,9 @@
 //
 // Authors: David Guez, IPN Orsay
   
+#include <TVirtualX.h>
+#include <TPad.h>
 #include "AliMpRowPainter.h"
 #include "AliMpGraphContext.h"
 #include "AliMpRow.h"
@@ -31,6 +34,12 @@ AliMpRowPainter::AliMpRowPainter(AliMpRow *row)
 }
 
 //_______________________________________________________________________
+AliMpRowPainter::~AliMpRowPainter()
+{
+  // destructor
+}
+
+//_______________________________________________________________________
 void AliMpRowPainter::DumpObject()
 {
 // Draw the owned object
index 7b5fed3..285ca1e 100755 (executable)
@@ -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
index af6de87..f12f4a6 100755 (executable)
@@ -7,6 +7,9 @@
 //
 // Authors: David Guez, IPN Orsay
  
+#include <TVirtualX.h>
+#include <TPad.h>
+
 #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();
index 7ee3151..f75bcfb 100755 (executable)
@@ -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
index b966795..a772cd7 100755 (executable)
@@ -11,8 +11,6 @@
 #ifndef ALI_MP_SECTOR_AREA_H_PAD_ITERATOR_H
 #define ALI_MP_SECTOR_AREA_H_PAD_ITERATOR_H
 
-#include <TObject.h>
-
 #include "AliMpVPadIterator.h"
 #include "AliMpArea.h"
 #include "AliMpPad.h"
index eface74..16a4ed8 100755 (executable)
@@ -7,11 +7,10 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#ifndef M_SECTOR_PAD_ITERATOR_H
-#define M_SECTOR_PAD_ITERATOR_H
-
-#include <TObject.h>
+#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
index 5390b90..c058995 100755 (executable)
@@ -2,6 +2,9 @@
 //
 // Authors: David Guez, IPN Orsay
   
+#include <TVirtualX.h>
+#include <TPad.h>
+
 #include "AliMpSectorPainter.h"
 #include "AliMpGraphContext.h"
 #include "AliMpSector.h"
 #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();
index f523e79..8f2d82b 100755 (executable)
@@ -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
index 8e20cce..d13d351 100644 (file)
@@ -9,6 +9,8 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
+#include <TError.h>
+
 #include "AliMpSectorPosition.h"
 
 ClassImp(AliMpSectorPosition)
@@ -26,6 +28,13 @@ AliMpSectorPosition::AliMpSectorPosition(const AliMpSector* sector,
 }
 
 //_____________________________________________________________________________
+AliMpSectorPosition::AliMpSectorPosition(const AliMpSectorPosition& right) 
+  : TObject(right) {
+// 
+  Fatal("AliMpSectorPosition", "Copy constructor not provided.");
+}
+
+//_____________________________________________________________________________
 AliMpSectorPosition::AliMpSectorPosition() 
   : TObject(),
     fkSector(),
@@ -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;  
+}    
+
index 05e713e..f7a3522 100644 (file)
@@ -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
index dd5b9bf..7ba6a99 100755 (executable)
@@ -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");
index b50952b..3b75b79 100755 (executable)
 
 #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
 {
index a3171b2..776a07f 100755 (executable)
@@ -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.
 // --
index 5ea811f..361e0cb 100755 (executable)
@@ -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
 };
index 88653a2..f540905 100755 (executable)
@@ -7,6 +7,9 @@
 //
 // Authors: David Guez, IPN Orsay
   
+#include <TVirtualX.h>
+#include <TPad.h>
+
 #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
index 9e03f08..ed422f6 100755 (executable)
@@ -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
 };
index 796beb1..c689b0f 100755 (executable)
@@ -9,6 +9,7 @@
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include "AliMpTransformPadIterator.h"
+#include "AliMpTransformer.h"
 
 ClassImp(AliMpTransformPadIterator)
 
index 8aebe30..bb1c658 100755 (executable)
 #define ALI_MP_TRANSFORM_PAD_ITERATOR_H
 
 #include "AliMpVPadIterator.h"
-#include "AliMpTransformer.h"
 #include "AliMpPad.h"
 
+class AliMpTransformer;
+
 class AliMpTransformPadIterator : public AliMpVPadIterator
 {
   public:
index c8c6d4f..2d6d479 100755 (executable)
@@ -40,6 +40,12 @@ AliMpVMotif::AliMpVMotif(const TString &id, AliMpMotifType *motifType):
 }
 
 //_____________________________________________________________________________
+AliMpVMotif::~AliMpVMotif()
+{
+  // destructor
+}
+
+//_____________________________________________________________________________
 AliMpConnection* 
 AliMpVMotif::FindConnectionByLocalPos(const TVector2& localPos) const
 {
index 7932085..131de0b 100755 (executable)
@@ -24,6 +24,7 @@ class AliMpVMotif : public TObject
  public:
   AliMpVMotif(const TString &id, AliMpMotifType *motifType);
   AliMpVMotif();
+  virtual ~AliMpVMotif();
 
   // Access methods
   AliMpMotifType  *GetMotifType() const;
index 923da66..95a44f4 100755 (executable)
@@ -8,6 +8,9 @@
 // Authors: David Guez, IPN Orsay
   
 #include <TROOT.h>
+#include <TList.h>
+#include <TVirtualX.h>
+#include <TPad.h>
 
 #include "AliMpVPainter.h"
 #include "AliMpGraphContext.h"
index 7015e60..905b61c 100755 (executable)
 #define ALI_MP_V_PAINTER_H
 
 #include <TObject.h>
-#include <TClass.h>
 #include <TVector2.h>
-#include <TVirtualX.h>
-#include <TPad.h>
-#include <TList.h>
+
+class TList;
 
 class AliMpVPainter : public TObject
 {
index 1c868a3..46d5bd7 100644 (file)
 #define ALI_MP_V_SEGMENTATION_H
 
 #include <TObject.h>
-#include <TVector2.h>
 
-#include "AliMpIntPair.h"
 #include "AliMpPadPair.h"
 #include "AliMpPad.h"
-#include "AliMpArea.h"
+
+class TVector2;
 
 class AliMpVPadIterator;
+class AliMpIntPair;
+class AliMpArea;
 
 class AliMpVSegmentation : public TObject
 {
index aaf03a9..2642d04 100755 (executable)
@@ -9,6 +9,7 @@
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include "AliMpZone.h"
+#include "AliMpSubZone.h"
 
 ClassImp(AliMpZone)
 
index 9e55c45..de0289b 100755 (executable)
 #define ALI_MP_ZONE_H
 
 #include <TObject.h>
-#include <TString.h>
 #include <TVector2.h>
 
 #include "AliMpSectorTypes.h"
-#include "AliMpSubZone.h"
+
+class AliMpSubZone;
 
 class AliMpZone : public TObject
 {
index 7bf51cc..9811737 100755 (executable)
@@ -7,12 +7,14 @@
 //
 // Authors: David Guez, IPN Orsay
  
+#include <TVirtualX.h>
+#include <TPad.h>
+
 #include "AliMpZonePainter.h"
 #include "AliMpGraphContext.h"
 #include "AliMpZone.h"
 #include "AliMpSubZone.h"
 #include "AliMpVRowSegment.h"
-//#include "AliMpSubZonePainter.h"
 
 ClassImp(AliMpZonePainter)
 
@@ -34,6 +36,13 @@ AliMpZonePainter::AliMpZonePainter(AliMpZone *zone)
 }
 
 //_______________________________________________________________________
+AliMpZonePainter::~AliMpZonePainter()
+{
+  // destructor 
+
+}
+
+//_______________________________________________________________________
 Int_t AliMpZonePainter::DistancetoPrimitive(Int_t x, Int_t y)
 {
   // dist to the nearest segment center if (x,y) is inside the zone
index c125f78..66875c3 100755 (executable)
@@ -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