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 504f34939799e5f649c984cc7805901b122eb549..0a5adeac289867aa6663c79bedaad725dcb58e2a 100755 (executable)
@@ -7,6 +7,8 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
+#include <TError.h>
+
 #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;  
+}    
+
index c3d933edf94c57d929bb1047c316cc2e751a488c..fee94dd9b6e441017cded2382815519cfa640121 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 d4c4c37d953c261abf84c72a2a406350d53f139c..32ff67fcc5e659827e033cd11e8a1e12842c7f54 100755 (executable)
@@ -8,6 +8,7 @@
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include <TMath.h>
+#include <TVector2.h>
 
 #include "AliMpConstants.h"
 
index 50ba66eaab5eb3cc36ebef482bec5a568110ec1a..819793b4c0350ffff1013e678c153411c9f61a75 100755 (executable)
@@ -11,7 +11,8 @@
 #define ALI_MP_CONSTANTS_H
 
 #include <TObject.h>
-#include <TVector2.h>
+
+class TVector2;
 
 class AliMpConstants : public TObject
 {
index 0fef553b5144e567d9a6521478374865d05a5137..cb1ed588d0dcfa48027a15f0efd7c58a8f59715a 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 88830e61d62731dccd56d762fe6b7a03200882d2..244a806356767224c330cb9de1491beaa4a86ed1 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 ef2ac537ba23bd114849bca60ced3a19e22b0634..1c5a22ebc15abaacd4285bc82dcf33ac28289177 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 48ad555a1b1bd2e6b702492465792941109a8c66..528095556cfebd2a1e7fbed976bbc027802c39ed 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 5f3cb8f89b72300c2ef43e8447d047b60cfda3c2..73f5c3d9462d46518281a957ed7639808d985f60 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 ab0d79331646068dc73bf7ae121b53ed86030a1d..aa5d019c572c8b3eb69129b8d5695837ff275be3 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 216c3c0514e9c834a4eb24cee570ec3a0de81234..2e3f88e97102c8158d1af1d761da1977b9e2adb6 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(),
@@ -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
index c759d7b296440dd488cfef1028fa5c1a1dddbfcf..8b86c81b44bb100fcfcb960b957ba2fc13952dd4 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 5fe9ae1ac013b3cdca7f366d2d0a81310de66815..270f3e3098223f47e3534dae54be584bdd8241af 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 81cf2fb2b0cb919626a90f39db4778dfea73ac12..1edc3ddc15b5e0de9cbded3ddd04ee4d6dc2245b 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 4016b7f9f131af3e5928da85116fad372ddb685a..3edcb83fae9c82c271468eb9dd4af53458c44ba9 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 155302ede0427ecb39c0a3b18ce6d5f6c721ebfb..ca23f16e342307286106063290b7369b30c9bccd 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 d83fbf83a46773a9b3539104ac077fd53631d917..59c03d2a23e486c5924b205429d8af93971de2ad 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 bdcaa95c6ae446638bd0e3a6b86218a382d45bc0..abd7b1d37b949f3bebed139399a96282c8655725 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 7cf40e401e733da168f4b1891b4722a5eabd1ea1..198b1f0d6ed28e05185c385baa4e5b31765e3fc0 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 0b0cb06b4647c4720d4d9107937a77c5c95b2bc3..2d9e4277993d06a5d9b28c20423183c021e89f6a 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 f92fcfcafbe33b9be48fa722a680f55ab4fb17ba..b83b2569d9cb31ee9acc64a01b2bb0f91a0d4932 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 ea100928171896444ace161f03a2d34526f46e6a..f1f953deee18b411a400bbbe7ead9797f893064d 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"
@@ -30,6 +33,12 @@ AliMpRowPainter::AliMpRowPainter(AliMpRow *row)
   // normal constructor 
 }
 
+//_______________________________________________________________________
+AliMpRowPainter::~AliMpRowPainter()
+{
+  // destructor
+}
+
 //_______________________________________________________________________
 void AliMpRowPainter::DumpObject()
 {
index 7b5fed39855980176e1aee13f83cc27dcebce7ef..285ca1ea5b5b12881d2d1ac2718e309b52d1b5a6 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 af6de87891366e0b67d5151dbd023676cae17999..f12f4a6aa833cd84e6159c449204c390f49911a5 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 7ee3151c3d844389235073689a952a80554ed442..f75bcfbdf518aa96352965319919fc4b13e75859 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 b9667956304da21998775c6667084785bb81925c..a772cd75a2bfb7012a1db8e9ef05eb472a1a4d9b 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 eface744ccb75bb9ada7a6bd23768c096cfc3796..16a4ed8edcceb8c2590800e58f74919f0fff2734 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 5390b9071f221f2deafa26e3fc0de26e6374d7bf..c058995bda6dde40e1bdb26a29fbad0a244f22ca 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 f523e799592f828c2f2e8946852340b68c8a5d39..8f2d82bd58f007a988638c78a8dfcec25dd55e03 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 8e20cce1c0fb3a85c7167ae43721ee74aa4145a9..d13d35159677d884e5c0e8d2becf886e23fef298 100644 (file)
@@ -9,6 +9,8 @@
 //
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
+#include <TError.h>
+
 #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;  
+}    
+
index 05e713e82dbba4e6daa4be4250f632c69c7adbc2..f7a352257da2e39939cc37cf1f4f4e04c4d57a77 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 dd5b9bf336e5c0456b8d38b16289e47f8959e525..7ba6a99b9d57152908c2c71fe2b9ea19e4329c65 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 b50952b1c74898368bc6f0942885763b96ca287b..3b75b79108862a0b92b7e45054bb09b000aa1d76 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 a3171b2bade256450b696167054986b81072209f..776a07f5422b477f0f61c6a095df957c7deb6668 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 5ea811ff622e9f4a7ee13a9f97c7322176bd51a4..361e0cbca7b48b7deae2c2562108f583d5194740 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 88653a2e00c137a99b55d254ebc4531ac103316b..f5409053093051bf897449bb7375ae60730544d6 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 9e03f0895bbf78a83fec5b2bb90a29fc382d180e..ed422f6fe8b184ecf19eaf0efeae70fa1cb00bf7 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 796beb17de98ba76b60d1ca3050a73e23e4950ee..c689b0f3ba058e760154b8c0a1422398d0fa9d8b 100755 (executable)
@@ -9,6 +9,7 @@
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include "AliMpTransformPadIterator.h"
+#include "AliMpTransformer.h"
 
 ClassImp(AliMpTransformPadIterator)
 
index 8aebe308bb293d47571a9dc68c3ba29d54da74a0..bb1c658179c05280da77e3ed0239591142a535ee 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 c8c6d4fb599d947cdf71e4d31de150e21e340d0d..2d6d4791d63124022c853e336719a69f5355b95e 100755 (executable)
@@ -39,6 +39,12 @@ AliMpVMotif::AliMpVMotif(const TString &id, AliMpMotifType *motifType):
 
 }
 
+//_____________________________________________________________________________
+AliMpVMotif::~AliMpVMotif()
+{
+  // destructor
+}
+
 //_____________________________________________________________________________
 AliMpConnection* 
 AliMpVMotif::FindConnectionByLocalPos(const TVector2& localPos) const
index 7932085de1034455887b26a5e52d9f829ccd183a..131de0bf142b45bba538159aa195d631a0720ae8 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 923da66090b2738f38447f539e7c57cdc9cbba88..95a44f49886276e2ba8dd6e70f5dbdc5cf8bbb69 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 7015e604f2868fe1c3a2091f4b1093c5f4387e5d..905b61c81344071a779c381715f566f1d6c79b63 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 1c868a3a78f1768628c68d35ce8bb5c473febf75..46d5bd7db70dbc24cadc040400a4720d5f3365c5 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 aaf03a9ad8d83c75bae33440297dc6402ac69ad1..2642d04a1005958375b8e22e8f7431f97dd06fd2 100755 (executable)
@@ -9,6 +9,7 @@
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
 #include "AliMpZone.h"
+#include "AliMpSubZone.h"
 
 ClassImp(AliMpZone)
 
index 9e55c4552e74271f15280ff1a6c83bd87d13b3b3..de0289bb71208f9a443c73653227d1c272e3918c 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 7bf51cc1c607cb5f6e67b3de442e4473644e891b..9811737ea6029935f2f97607aa30ce1447a81cbc 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)
 
@@ -33,6 +35,13 @@ AliMpZonePainter::AliMpZonePainter(AliMpZone *zone)
 
 }
 
+//_______________________________________________________________________
+AliMpZonePainter::~AliMpZonePainter()
+{
+  // destructor 
+
+}
+
 //_______________________________________________________________________
 Int_t AliMpZonePainter::DistancetoPrimitive(Int_t x, Int_t y)
 {
index c125f789fb5ea4465e92f5fcbad91ca6edf77480..66875c3c563f91c86cc0110bba3c2c4cf990431b 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