From 75e3794b7dc1d57df57450c120a9f8b50eef6121 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 4 Sep 2006 20:20:24 +0000 Subject: [PATCH] Changes required by Effective C++ --- STEER/AliAlignmentTracks.cxx | 27 ++------ STEER/AliAlignmentTracks.h | 7 ++- STEER/AliCentralTrigger.cxx | 12 +++- STEER/AliExpression.cxx | 27 +++++--- STEER/AliRieman.cxx | 100 ++++++++++++++++-------------- STEER/AliTrackFitter.cxx | 51 ++++++++------- STEER/AliTrackFitterRieman.cxx | 43 +++++++------ STEER/AliTrackFitterStraight.cxx | 36 +++++------ STEER/AliTrackResiduals.cxx | 5 ++ STEER/AliTrackResidualsFast.cxx | 13 ++-- STEER/AliTrackResidualsLinear.cxx | 24 +++---- STEER/AliTriggerDescriptor.cxx | 12 +++- STEER/AliTriggerDetector.cxx | 6 +- STEER/AliTriggerInput.h | 4 +- 14 files changed, 204 insertions(+), 163 deletions(-) diff --git a/STEER/AliAlignmentTracks.cxx b/STEER/AliAlignmentTracks.cxx index 2763f1b9ee5..33b1d2d42ec 100644 --- a/STEER/AliAlignmentTracks.cxx +++ b/STEER/AliAlignmentTracks.cxx @@ -44,6 +44,7 @@ AliAlignmentTracks::AliAlignmentTracks(): fLastIndex(0), fArrayIndex(0), fIsIndexBuilt(kFALSE), + fAlignObjs(0), fMisalignObjs(0), fTrackFitter(0), fMinimizer(0), @@ -63,6 +64,7 @@ AliAlignmentTracks::AliAlignmentTracks(TChain *esdchain): fLastIndex(0), fArrayIndex(0), fIsIndexBuilt(kFALSE), + fAlignObjs(0), fMisalignObjs(0), fTrackFitter(0), fMinimizer(0), @@ -78,12 +80,14 @@ AliAlignmentTracks::AliAlignmentTracks(TChain *esdchain): //______________________________________________________________________________ AliAlignmentTracks::AliAlignmentTracks(const char *esdfilename, const char *esdtreename): + fESDChain(new TChain(esdtreename)), fPointsFilename("AliTrackPoints.root"), fPointsFile(0), fPointsTree(0), fLastIndex(0), fArrayIndex(0), fIsIndexBuilt(kFALSE), + fAlignObjs(0), fMisalignObjs(0), fTrackFitter(0), fMinimizer(0), @@ -92,35 +96,12 @@ AliAlignmentTracks::AliAlignmentTracks(const char *esdfilename, const char *esdt // Constructor in the case // the user provides a single ESD file // or a directory containing ESD files - fESDChain = new TChain(esdtreename); fESDChain->Add(esdfilename); InitIndex(); InitAlignObjs(); } -//______________________________________________________________________________ -AliAlignmentTracks::AliAlignmentTracks(const AliAlignmentTracks &alignment): - TObject(alignment) -{ - // Copy constructor - // not implemented - AliWarning("Copy constructor not implemented!"); -} - -//______________________________________________________________________________ -AliAlignmentTracks& AliAlignmentTracks::operator= (const AliAlignmentTracks& alignment) -{ - // Asignment operator - // not implemented - if(this==&alignment) return *this; - - AliWarning("Asignment operator not implemented!"); - - ((TObject *)this)->operator=(alignment); - - return *this; -} //______________________________________________________________________________ AliAlignmentTracks::~AliAlignmentTracks() diff --git a/STEER/AliAlignmentTracks.h b/STEER/AliAlignmentTracks.h index 7d0f653e1a5..c03dbd10dfb 100644 --- a/STEER/AliAlignmentTracks.h +++ b/STEER/AliAlignmentTracks.h @@ -25,8 +25,6 @@ class AliAlignmentTracks : public TObject { AliAlignmentTracks(); AliAlignmentTracks(TChain *esdchain); AliAlignmentTracks(const char *esdfilename, const char *esdtreename = "esdTree"); - AliAlignmentTracks(const AliAlignmentTracks & alignment); - AliAlignmentTracks& operator= (const AliAlignmentTracks& alignment); virtual ~AliAlignmentTracks(); void AddESD(TChain *esdchain); @@ -96,6 +94,11 @@ class AliAlignmentTracks : public TObject { AliTrackFitter *fTrackFitter; // Pointer to the track fitter AliTrackResiduals*fMinimizer; // Pointer to track residuals minimizer Bool_t fDoUpdate; // Indicator - update Alignment object after minimization + + private: + AliAlignmentTracks(const AliAlignmentTracks & alignment); + AliAlignmentTracks& operator= (const AliAlignmentTracks& alignment); + ClassDef(AliAlignmentTracks,2) }; diff --git a/STEER/AliCentralTrigger.cxx b/STEER/AliCentralTrigger.cxx index 7fa3bbbad01..fc620b60b2d 100644 --- a/STEER/AliCentralTrigger.cxx +++ b/STEER/AliCentralTrigger.cxx @@ -58,7 +58,9 @@ ClassImp( AliCentralTrigger ) //_____________________________________________________________________________ AliCentralTrigger::AliCentralTrigger() : TObject(), - fClassMask(0) + fClassMask(0), + fDescriptors(), + fInputs() { // Default constructor // LoadDescriptor("Pb-Pb"); @@ -67,7 +69,9 @@ AliCentralTrigger::AliCentralTrigger() : //_____________________________________________________________________________ AliCentralTrigger::AliCentralTrigger( TString & descriptor ) : TObject(), - fClassMask(0) + fClassMask(0), + fDescriptors(), + fInputs() { // Default constructor LoadDescriptor( descriptor ); @@ -76,7 +80,9 @@ AliCentralTrigger::AliCentralTrigger( TString & descriptor ) : //_____________________________________________________________________________ AliCentralTrigger::AliCentralTrigger( const AliCentralTrigger& ctp ): TObject( ctp ), - fClassMask( ctp.fClassMask ) + fClassMask( ctp.fClassMask ), + fDescriptors(), + fInputs() { // Copy constructor diff --git a/STEER/AliExpression.cxx b/STEER/AliExpression.cxx index 7092a980ee1..86637ee68c0 100644 --- a/STEER/AliExpression.cxx +++ b/STEER/AliExpression.cxx @@ -37,7 +37,12 @@ ClassImp( AliExpression ) //______________________________________________________________________________ -AliExpression::AliExpression( TString exp ) +AliExpression::AliExpression( TString exp ) : + TObject(), + fVname(""), + fArg1(0x0), + fArg2(0x0), + fOperator(0) { // Default constructor TObjArray* tokens = Tokenize( exp ); @@ -76,21 +81,25 @@ AliExpression& AliExpression::operator=(const AliExpression& e) } //______________________________________________________________________________ -AliExpression::AliExpression( int op, AliExpression* a, AliExpression* b ) +AliExpression::AliExpression( int op, AliExpression* a, AliExpression* b ) : + TObject(), + fVname(""), + fArg1(a), + fArg2(b), + fOperator(op) { // Create a new expression - fArg1 = a; - fArg2 = b; - fOperator = op; } //______________________________________________________________________________ -AliExpression::AliExpression( int op, AliExpression* a ) +AliExpression::AliExpression( int op, AliExpression* a ) : + TObject(), + fVname(""), + fArg1(0), + fArg2(a), + fOperator(op) { // Create a unary expression. - fArg1 = 0; - fArg2 = a; - fOperator = op; } //______________________________________________________________________________ diff --git a/STEER/AliRieman.cxx b/STEER/AliRieman.cxx index 31ae25337b6..fc9feacc0ec 100755 --- a/STEER/AliRieman.cxx +++ b/STEER/AliRieman.cxx @@ -50,7 +50,24 @@ ClassImp(AliRieman) -AliRieman::AliRieman(){ +AliRieman::AliRieman() : + TObject(), + fCapacity(0), + fN(0), + fX(0), + fY(0), + fZ(0), + fSy(0), + fSz(0), + fCovar(0), + fCovarPolY(0), + fCovarPolZ(0), + fSumZZ(0), + fChi2(0), + fChi2Y(0), + fChi2Z(0), + fConv(kFALSE) +{ // // default constructor // @@ -61,25 +78,27 @@ AliRieman::AliRieman(){ fSumPolY[i]=0; fSumPolZ[i]=0; } - fSumZZ = 0; - fCapacity = 0; - fN =0; - fX = 0; - fY = 0; - fZ = 0; - fSy = 0; - fSz = 0; - fChi2 = 0; - fChi2Y = 0; - fChi2Z = 0; - fCovar = 0; - fCovarPolY = 0; - fCovarPolZ = 0; - fConv = kFALSE; } -AliRieman::AliRieman(Int_t capacity){ +AliRieman::AliRieman(Int_t capacity) : + TObject(), + fCapacity(capacity), + fN(0), + fX(new Double_t[fCapacity]), + fY(new Double_t[fCapacity]), + fZ(new Double_t[fCapacity]), + fSy(new Double_t[fCapacity]), + fSz(new Double_t[fCapacity]), + fCovar(new TMatrixDSym(6)), + fCovarPolY(new TMatrixDSym(3)), + fCovarPolZ(new TMatrixDSym(2)), + fSumZZ(0), + fChi2(0), + fChi2Y(0), + fChi2Z(0), + fConv(kFALSE) +{ // // default constructor // @@ -90,24 +109,27 @@ AliRieman::AliRieman(Int_t capacity){ fSumPolY[i]=0; fSumPolZ[i]=0; } - fSumZZ =0; - fCapacity = capacity; - fN =0; - fX = new Double_t[fCapacity]; - fY = new Double_t[fCapacity]; - fZ = new Double_t[fCapacity]; - fSy = new Double_t[fCapacity]; - fSz = new Double_t[fCapacity]; - fCovar = new TMatrixDSym(6); - fCovarPolY = new TMatrixDSym(3); - fCovarPolZ = new TMatrixDSym(2); - fChi2 = 0; - fChi2Y = 0; - fChi2Z = 0; - fConv = kFALSE; } -AliRieman::AliRieman(const AliRieman &rieman):TObject(rieman){ +AliRieman::AliRieman(const AliRieman &rieman): + TObject(rieman), + fCapacity(rieman.fN), + fN(rieman.fN), + fX(new Double_t[fN]), + fY(new Double_t[fN]), + fZ(new Double_t[fN]), + fSy(new Double_t[fN]), + fSz(new Double_t[fN]), + fCovar(new TMatrixDSym(*(rieman.fCovar))), + fCovarPolY(new TMatrixDSym(*(rieman.fCovarPolY))), + fCovarPolZ(new TMatrixDSym(*(rieman.fCovarPolZ))), + fSumZZ(rieman.fSumZZ), + fChi2(rieman.fChi2), + fChi2Y(rieman.fChi2Y), + fChi2Z(rieman.fChi2Z), + fConv(rieman.fConv) + +{ // // copy constructor // @@ -118,18 +140,6 @@ AliRieman::AliRieman(const AliRieman &rieman):TObject(rieman){ fSumPolY[i]=rieman.fSumPolY[i]; fSumPolZ[i]=rieman.fSumPolZ[i]; } - fSumZZ = rieman.fSumZZ; - fCapacity = rieman.fN; - fN =rieman.fN; - fCovar = new TMatrixDSym(*(rieman.fCovar)); - fCovarPolY = new TMatrixDSym(*(rieman.fCovarPolY)); - fCovarPolZ = new TMatrixDSym(*(rieman.fCovarPolZ)); - fConv = rieman.fConv; - fX = new Double_t[fN]; - fY = new Double_t[fN]; - fZ = new Double_t[fN]; - fSy = new Double_t[fN]; - fSz = new Double_t[fN]; for (Int_t i=0;i