From 0471c97bace625b89ce70b3c402064fb45ba465e Mon Sep 17 00:00:00 2001 From: ivana Date: Wed, 13 Sep 2006 21:07:55 +0000 Subject: [PATCH] Cleanup Effective C++ warnings: data members initialisation --- MUON/mapping/AliMpArea.cxx | 3 ++- MUON/mapping/AliMpGraphContext.cxx | 6 ++---- MUON/mapping/AliMpMotifSpecial.cxx | 4 +++- MUON/mapping/AliMpNeighboursPadIterator.cxx | 9 +++++++-- MUON/mapping/AliMpPad.cxx | 8 +++++++- MUON/mapping/AliMpPadRow.cxx | 8 ++++++-- MUON/mapping/AliMpSectorAreaHPadIterator.cxx | 10 +++++++--- MUON/mapping/AliMpSectorAreaVPadIterator.cxx | 12 ++++++++---- MUON/mapping/AliMpSectorPadIterator.cxx | 8 +++++++- MUON/mapping/AliMpZone.cxx | 2 ++ 10 files changed, 51 insertions(+), 19 deletions(-) diff --git a/MUON/mapping/AliMpArea.cxx b/MUON/mapping/AliMpArea.cxx index b17de364c97..730dd360a83 100755 --- a/MUON/mapping/AliMpArea.cxx +++ b/MUON/mapping/AliMpArea.cxx @@ -62,7 +62,8 @@ AliMpArea::AliMpArea() AliMpArea::AliMpArea(const AliMpArea& rhs): TObject(rhs), fPosition(rhs.fPosition), - fDimensions(rhs.fDimensions) + fDimensions(rhs.fDimensions), + fValidity(rhs.fValidity) { /// Copy constructor } diff --git a/MUON/mapping/AliMpGraphContext.cxx b/MUON/mapping/AliMpGraphContext.cxx index 688352a5464..c7b75e27a5e 100755 --- a/MUON/mapping/AliMpGraphContext.cxx +++ b/MUON/mapping/AliMpGraphContext.cxx @@ -40,15 +40,13 @@ Int_t AliMpGraphContext::fgStackSize = 0; //_____________________________________________________________________________ AliMpGraphContext::AliMpGraphContext(): TObject(), + fColor(20), fPadPosition(TVector2(0.5,0.5)), fPadDimensions(TVector2(0.49,0.49)), fRealPosition(TVector2(0.,0.)), fRealDimensions(TVector2(1,1)) { -/// Private constructor - - fColor = 20; - // default constructor (private) +/// Default constructor (private) } //_____________________________________________________________________________ diff --git a/MUON/mapping/AliMpMotifSpecial.cxx b/MUON/mapping/AliMpMotifSpecial.cxx index b5783cf8952..0a0bf92193a 100755 --- a/MUON/mapping/AliMpMotifSpecial.cxx +++ b/MUON/mapping/AliMpMotifSpecial.cxx @@ -39,6 +39,7 @@ ClassImp(AliMpMotifSpecial) //______________________________________________________________________________ AliMpMotifSpecial::AliMpMotifSpecial(): AliMpVMotif(), + fDimensions(), fPadDimensionsVector(), fPadDimensionsVector2() { @@ -50,6 +51,7 @@ AliMpMotifSpecial::AliMpMotifSpecial(): AliMpMotifSpecial::AliMpMotifSpecial(const TString &id, AliMpMotifType *motifType) : AliMpVMotif(id,motifType), + fDimensions(), #ifdef WITH_STL fPadDimensionsVector(), #endif @@ -136,7 +138,7 @@ TVector2 AliMpMotifSpecial::GetPadDimensions(Int_t i) const /// Returns the i-th different pad dimensions if (i<0 || i>GetNofPadDimensions()) { - Fatal("GetPadDimensions(i)", "Index outside limits."); + AliFatal("Index outside limits."); return TVector2(); } diff --git a/MUON/mapping/AliMpNeighboursPadIterator.cxx b/MUON/mapping/AliMpNeighboursPadIterator.cxx index a4fb86be662..e9c09211282 100755 --- a/MUON/mapping/AliMpNeighboursPadIterator.cxx +++ b/MUON/mapping/AliMpNeighboursPadIterator.cxx @@ -57,6 +57,7 @@ AliMpNeighboursPadIterator::AliMpNeighboursPadIterator( : AliMpVPadIterator(), fkSegmentation(segmentation), fCenterPad(centerPad), + fPads(), fIndex(fgkInvalidIndex) { /// Standard constructor, set *this to invalid position @@ -67,7 +68,11 @@ AliMpNeighboursPadIterator::AliMpNeighboursPadIterator( //______________________________________________________________________________ AliMpNeighboursPadIterator::AliMpNeighboursPadIterator( const AliMpNeighboursPadIterator& right) - : AliMpVPadIterator(right) + : AliMpVPadIterator(right), + fkSegmentation(0), + fCenterPad(AliMpPad::Invalid()), + fPads(), + fIndex(fgkInvalidIndex) { /// Copy constructor @@ -108,7 +113,7 @@ AliMpNeighboursPadIterator::operator = (const AliMpNeighboursPadIterator& right) fIndex = right.fIndex; #endif #ifdef WITH_ROOT - Fatal("operator=", "Not allowed assignment for TObjArray"); + AliFatal("Not allowed assignment for TObjArray"); #endif return *this; diff --git a/MUON/mapping/AliMpPad.cxx b/MUON/mapping/AliMpPad.cxx index 00c86d1c5bc..7ffe4e23e06 100755 --- a/MUON/mapping/AliMpPad.cxx +++ b/MUON/mapping/AliMpPad.cxx @@ -92,7 +92,13 @@ AliMpPad::AliMpPad() //_____________________________________________________________________________ AliMpPad::AliMpPad(const AliMpPad& rhs) - : TObject(rhs) + : TObject(rhs), + fLocations(0), + fLocation(AliMpIntPair::Invalid()), + fIndices(AliMpIntPair::Invalid()), + fPosition(-1.,-1.), + fDimensions(0.,0.), + fValidity(false) { /// Copy constructor diff --git a/MUON/mapping/AliMpPadRow.cxx b/MUON/mapping/AliMpPadRow.cxx index 43c79f7b35e..3ed934d0966 100755 --- a/MUON/mapping/AliMpPadRow.cxx +++ b/MUON/mapping/AliMpPadRow.cxx @@ -39,7 +39,9 @@ ClassImp(AliMpPadRow) AliMpPadRow::AliMpPadRow(AliMpXDirection direction) : TObject(), fDirection(direction), - fID(0) + fID(0), + fOffsetX(0), + fSegments() { /// Standard constructor } @@ -48,7 +50,9 @@ AliMpPadRow::AliMpPadRow(AliMpXDirection direction) AliMpPadRow::AliMpPadRow() : TObject(), fDirection(kLeft), - fID(0) + fID(0), + fOffsetX(0), + fSegments() { /// Default constructor } diff --git a/MUON/mapping/AliMpSectorAreaHPadIterator.cxx b/MUON/mapping/AliMpSectorAreaHPadIterator.cxx index 8ff6f6aec27..365e5b01346 100755 --- a/MUON/mapping/AliMpSectorAreaHPadIterator.cxx +++ b/MUON/mapping/AliMpSectorAreaHPadIterator.cxx @@ -50,11 +50,15 @@ AliMpSectorAreaHPadIterator::AliMpSectorAreaHPadIterator( //______________________________________________________________________________ AliMpSectorAreaHPadIterator::AliMpSectorAreaHPadIterator( const AliMpSectorAreaHPadIterator& right) - : AliMpVPadIterator(right) + : AliMpVPadIterator(right), + fkSegmentation(0), + fkArea(AliMpArea()), + fCurrentPad(AliMpPad::Invalid()), + fCurrentRowPosition(0.) { -/// Protected copy constructor (not provided) +/// Copy constructor - Fatal("Copy constructor", "Not implemented"); + *this = right; } //______________________________________________________________________________ diff --git a/MUON/mapping/AliMpSectorAreaVPadIterator.cxx b/MUON/mapping/AliMpSectorAreaVPadIterator.cxx index c7dabdd10ab..e93f4ae4ee4 100644 --- a/MUON/mapping/AliMpSectorAreaVPadIterator.cxx +++ b/MUON/mapping/AliMpSectorAreaVPadIterator.cxx @@ -50,11 +50,15 @@ AliMpSectorAreaVPadIterator::AliMpSectorAreaVPadIterator( //______________________________________________________________________________ AliMpSectorAreaVPadIterator::AliMpSectorAreaVPadIterator( const AliMpSectorAreaVPadIterator& right) - : AliMpVPadIterator(right) + : AliMpVPadIterator(right), + fkSegmentation(0), + fkArea(AliMpArea()), + fCurrentPad(AliMpPad::Invalid()), + fCurrentColumnPosition(0.) { -/// Protected copy constructor (not provided) +/// Copy constructor - Fatal("Copy constructor", "Not implemented"); + *this = right; } //______________________________________________________________________________ @@ -138,7 +142,7 @@ void AliMpSectorAreaVPadIterator::First() /// pad in the area if (!fkSegmentation) { - Fatal("First", "Segmentation is not defined"); + AliFatal("Segmentation is not defined"); return; } diff --git a/MUON/mapping/AliMpSectorPadIterator.cxx b/MUON/mapping/AliMpSectorPadIterator.cxx index 618e4d93eec..115ea576efe 100755 --- a/MUON/mapping/AliMpSectorPadIterator.cxx +++ b/MUON/mapping/AliMpSectorPadIterator.cxx @@ -65,7 +65,13 @@ AliMpSectorPadIterator::AliMpSectorPadIterator(const AliMpSector* const sector) //______________________________________________________________________________ AliMpSectorPadIterator::AliMpSectorPadIterator(const AliMpSectorPadIterator& right) - : AliMpVPadIterator(right) + : AliMpVPadIterator(right), + fkSector(0), + fCurrentRow(0), + fCurrentSeg(0), + fCurrentMotif(0), + fMotifPos(0), + fIterator() { /// Copy constructor diff --git a/MUON/mapping/AliMpZone.cxx b/MUON/mapping/AliMpZone.cxx index 53953149656..35fd3f758dd 100755 --- a/MUON/mapping/AliMpZone.cxx +++ b/MUON/mapping/AliMpZone.cxx @@ -35,6 +35,7 @@ ClassImp(AliMpZone) AliMpZone::AliMpZone(Int_t id) : TObject(), fID(id), + fSubZones(), fPadDimensions(TVector2()) { /// Standard constructor @@ -44,6 +45,7 @@ AliMpZone::AliMpZone(Int_t id) AliMpZone::AliMpZone() : TObject(), fID(0), + fSubZones(), fPadDimensions(TVector2()) { /// Default constructor -- 2.43.0