Changing Digit by VDigit (Laurent)

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpSectorAreaHPadIterator.cxx

diff --git a/MUON/mapping/AliMpSectorAreaHPadIterator.cxx b/MUON/mapping/AliMpSectorAreaHPadIterator.cxx
index de74d379c9015fcfd8cec71a927918b981b0aa06..b5c2dcfc2c1f5b80f72df0be55b5184fbcd42d9b 100755 (executable)
--- a/MUON/mapping/AliMpSectorAreaHPadIterator.cxx
+++ b/MUON/mapping/AliMpSectorAreaHPadIterator.cxx
@@ -1,4 +1,20 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
 // $Id$
+// $MpId: AliMpSectorAreaHPadIterator.cxx,v 1.7 2006/05/24 13:58:46 ivana Exp $
 // Category: sector
 //
 // Class AliMpSectorAreaHPadIterator
@@ -8,13 +24,15 @@
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#include <Riostream.h>
-
 #include "AliMpSectorAreaHPadIterator.h"
 #include "AliMpSectorSegmentation.h"
 #include "AliMpConstants.h"
 
+#include <Riostream.h>
+
+/// \cond CLASSIMP
 ClassImp(AliMpSectorAreaHPadIterator)
+/// \endcond
 
 //______________________________________________________________________________
 AliMpSectorAreaHPadIterator::AliMpSectorAreaHPadIterator(
@@ -26,17 +44,21 @@ AliMpSectorAreaHPadIterator::AliMpSectorAreaHPadIterator(
    fCurrentPad(AliMpPad::Invalid()),
    fCurrentRowPosition(0.)
 {
-// normal constructor, start in invalid position
+/// Standard constructor, start in invalid position
 }
 
 //______________________________________________________________________________
 AliMpSectorAreaHPadIterator::AliMpSectorAreaHPadIterator(
                                 const AliMpSectorAreaHPadIterator& right)
-  : AliMpVPadIterator(right)
+  : AliMpVPadIterator(right),
+    fkSegmentation(0),
+    fkArea(AliMpArea()),
+    fCurrentPad(AliMpPad::Invalid()),
+    fCurrentRowPosition(0.)
 {
-// copy constructor
+/// Copy constructor
  
-  Fatal("Copy constructor", "Not implemented");
+  *this = right;
 }
 
 //______________________________________________________________________________
@@ -47,13 +69,13 @@ AliMpSectorAreaHPadIterator::AliMpSectorAreaHPadIterator()
    fCurrentPad(AliMpPad::Invalid()),
    fCurrentRowPosition(0.)
 {
-// Dummy default constructor.
+/// Default constructor.
 }
 
 //______________________________________________________________________________
 AliMpSectorAreaHPadIterator::~AliMpSectorAreaHPadIterator()
 {
-// destructor
+/// Destructor
 }
 
 //
@@ -64,12 +86,12 @@ AliMpSectorAreaHPadIterator::~AliMpSectorAreaHPadIterator()
 AliMpSectorAreaHPadIterator& 
 AliMpSectorAreaHPadIterator::operator = (const AliMpSectorAreaHPadIterator& right)
 {
-// Assignement operator
+/// Assignment operator
 
-  // check assignement to self
+  // check assignment to self
   if (this == &right) return *this;
 
-  // base class assignement
+  // base class assignment
   AliMpVPadIterator::operator=(right);
 
   fkSegmentation = right.fkSegmentation;
@@ -87,8 +109,7 @@ AliMpSectorAreaHPadIterator::operator = (const AliMpSectorAreaHPadIterator& righ
 //______________________________________________________________________________
 Bool_t AliMpSectorAreaHPadIterator::IsValid() const
 {
-// Is the iterator in a valid position?
-// ---
+/// Is the iterator in a valid position?
 
   return fCurrentPad.IsValid() ;
 }
@@ -96,17 +117,14 @@ Bool_t AliMpSectorAreaHPadIterator::IsValid() const
 //______________________________________________________________________________
 void AliMpSectorAreaHPadIterator::MoveUp()
 {
-// Increase the current row position and searches the first valid pad.
-// ---
+/// Increase the current row position and searches the first valid pad.
 
-  Double_t step = 2.* fkSegmentation->GetMinPadDimensions().Y();
+  Double_t dy = fkSegmentation->GetMinPadDimensions().Y();
 
   while ( !fCurrentPad.IsValid() && 
-          fCurrentRowPosition + step < fkArea.UpBorder())
+          fCurrentRowPosition + dy < fkArea.UpBorder())
   {
-    //cout << "#########  Move up ##########" << endl;
-  
-    fCurrentRowPosition += step;
+    fCurrentRowPosition += 2.*dy;
     TVector2 position = TVector2(fkArea.LeftBorder(), fCurrentRowPosition);
     
     fCurrentPad = fkSegmentation->PadByDirection(position, fkArea.RightBorder());
@@ -120,9 +138,8 @@ void AliMpSectorAreaHPadIterator::MoveUp()
 //______________________________________________________________________________
 void AliMpSectorAreaHPadIterator::First()
 {
-// Reset the iterator, so that it points to the first available
-// pad in the area
-// ---
+/// Reset the iterator, so that it points to the first available
+/// pad in the area
 
   if (!fkSegmentation) {
     Fatal("First", "Segmentation is not defined");
@@ -133,7 +150,7 @@ void AliMpSectorAreaHPadIterator::First()
   //
   fCurrentRowPosition = fkArea.DownBorder();
   TVector2 position(fkArea.LeftDownCorner()); 
-  
+
   fCurrentPad = fkSegmentation->PadByDirection(position, fkArea.RightBorder());
 
   MoveUp();
@@ -146,8 +163,7 @@ void AliMpSectorAreaHPadIterator::First()
 //______________________________________________________________________________
 void AliMpSectorAreaHPadIterator::Next()
 {
-// Move the iterator to the next valid pad.
-// ---
+/// Move the iterator to the next valid pad.
 
   if (!IsValid()) return;
   
@@ -167,22 +183,23 @@ void AliMpSectorAreaHPadIterator::Next()
 //______________________________________________________________________________
 Bool_t AliMpSectorAreaHPadIterator::IsDone() const
 {
-// 
+/// Is the iterator in the end ?
+ 
   return !IsValid();
 }
 
 //______________________________________________________________________________
 AliMpPad AliMpSectorAreaHPadIterator::CurrentItem () const 
 {
-// Returns current pad.
-// ---
+/// Return current pad.
 
   return fCurrentPad;
 }
 //______________________________________________________________________________
 void AliMpSectorAreaHPadIterator::Invalidate()
 {
-// 
+/// Let the iterator point to the invalid position
+
   fCurrentPad = AliMpPad::Invalid();
   fCurrentRowPosition = 0;
 }