From 90e48c0cb3b95b780dbb81c14bab093854603c11 Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 25 Feb 2005 06:38:20 +0000 Subject: [PATCH] Changes suggested by Effective C++ (F.Carminati) --- STEER/AliCollisionGeometry.cxx | 15 +++ STEER/AliCollisionGeometry.h | 2 +- STEER/AliDataLoader.cxx | 28 ++++- STEER/AliDetector.cxx | 6 + STEER/AliESDHLTtrack.cxx | 37 ++++--- STEER/AliESDMuonTrack.cxx | 41 +++++-- STEER/AliESDMuonTrack.h | 2 +- STEER/AliESDPmdTrack.cxx | 29 +++-- STEER/AliESDPmdTrack.h | 2 +- STEER/AliESDV0MI.cxx | 27 +++-- STEER/AliESDVertex.cxx | 139 +++++++++++++----------- STEER/AliESDcascade.cxx | 25 ++--- STEER/AliESDkink.cxx | 17 ++- STEER/AliESDtrack.cxx | 187 +++++++++++++++++--------------- STEER/AliESDtrack.h | 3 + STEER/AliESDv0.cxx | 14 ++- STEER/AliExternalTrackParam.cxx | 30 +++-- STEER/AliGenerator.cxx | 10 +- STEER/AliKalmanTrack.cxx | 15 +-- STEER/AliLoader.cxx | 14 ++- STEER/AliLog.cxx | 14 ++- STEER/AliMC.cxx | 11 +- STEER/AliMemoryWatcher.cxx | 49 +++++---- STEER/AliPID.cxx | 69 ++++++------ STEER/AliPID.h | 4 +- STEER/AliReconstruction.cxx | 2 +- STEER/AliRun.cxx | 3 + STEER/AliStack.cxx | 6 +- STEER/AliTrackReference.cxx | 22 ++-- STEER/AliTracker.h | 7 +- STEER/AliVertexGenFile.h | 9 +- STEER/AliVertexer.cxx | 19 +++- STEER/TTreeStream.cxx | 74 ++++++++----- STEER/TTreeStream.h | 12 ++ 34 files changed, 576 insertions(+), 368 deletions(-) diff --git a/STEER/AliCollisionGeometry.cxx b/STEER/AliCollisionGeometry.cxx index cac66cff2f3..6f1a24a9da1 100644 --- a/STEER/AliCollisionGeometry.cxx +++ b/STEER/AliCollisionGeometry.cxx @@ -18,3 +18,18 @@ #include "AliCollisionGeometry.h" ClassImp(AliCollisionGeometry) + +//______________________________________________________________________ +AliCollisionGeometry::AliCollisionGeometry() : + fNHardScatters(0), + fNProjectileParticipants(0), + fNTargetParticipants(0), + fNNColl(0), + fNNwColl(0), + fNwNColl(0), + fNwNwColl(0), + fSpecn(0), + fSpecp(0), + fImpactParameter(0) +{ +} diff --git a/STEER/AliCollisionGeometry.h b/STEER/AliCollisionGeometry.h index fe4ed3454a1..3f312ba079b 100644 --- a/STEER/AliCollisionGeometry.h +++ b/STEER/AliCollisionGeometry.h @@ -10,7 +10,7 @@ class AliCollisionGeometry { public: - AliCollisionGeometry() {;} + AliCollisionGeometry(); virtual ~AliCollisionGeometry(){;} // Getters Float_t ImpactParameter() {return fImpactParameter;} diff --git a/STEER/AliDataLoader.cxx b/STEER/AliDataLoader.cxx index 60cf6749f98..a6790bd732d 100644 --- a/STEER/AliDataLoader.cxx +++ b/STEER/AliDataLoader.cxx @@ -87,7 +87,21 @@ AliDataLoader::AliDataLoader(const char* filename, const char* contname, const c } /*****************************************************************************/ -AliDataLoader::AliDataLoader(const AliDataLoader& source):TNamed(source) { +AliDataLoader::AliDataLoader(const AliDataLoader& source) : + TNamed(source), + fFileName(source.fFileName), + fFile(source.fFile), + fDirectory(source.fDirectory), + fFileOption(source.fFileOption), + fCompressionLevel(source.fCompressionLevel), + fNEventsPerFile(source.fNEventsPerFile), + fBaseLoaders(source.fBaseLoaders), + fHasTask(source.fHasTask), + fTaskName(source.fTaskName), + fParentalTask(source.fParentalTask), + fEventFolder(source.fEventFolder), + fFolder(source.fFolder) +{ // copy constructor AliFatal("Copy constructor not implemented"); } @@ -712,7 +726,13 @@ AliBaseLoader::AliBaseLoader(const TString& name, AliDataLoader* dl, Bool_t sto } /*****************************************************************************/ -AliBaseLoader::AliBaseLoader(const AliBaseLoader& source):TNamed(source) { +AliBaseLoader::AliBaseLoader(const AliBaseLoader& source) : + TNamed(source), + fIsLoaded(source.fIsLoaded), + fStoreInTopOfFile(source.fStoreInTopOfFile), + fDoNotReload(source.fDoNotReload), + fDataLoader(source.fDataLoader) +{ // copy constructor AliFatal("Copy constructor not implemented"); } @@ -1168,7 +1188,9 @@ AliTaskLoader::AliTaskLoader(const TString& name, AliDataLoader* dl, TTask* pare /*****************************************************************************/ AliTaskLoader::AliTaskLoader(const AliTaskLoader& source): - AliBaseLoader(source) { + AliBaseLoader(source), + fParentalTask(source.fParentalTask) +{ // copy constructor AliFatal("Copy constructor not implemented"); } diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx index f58011d8536..58f2fd4f633 100644 --- a/STEER/AliDetector.cxx +++ b/STEER/AliDetector.cxx @@ -56,6 +56,8 @@ AliDetector::AliDetector(): fNhits(0), fNdigits(0), fBufferSize(1600), + fMaxIterHit(0), + fCurIterHit(0), fHits(0), fDigits(0), fPoints(0), @@ -74,6 +76,8 @@ AliDetector::AliDetector(const AliDetector &det): fNhits(0), fNdigits(0), fBufferSize(1600), + fMaxIterHit(0), + fCurIterHit(0), fHits(0), fDigits(0), fPoints(0), @@ -90,6 +94,8 @@ AliDetector::AliDetector(const char* name,const char *title): fNhits(0), fNdigits(0), fBufferSize(1600), + fMaxIterHit(0), + fCurIterHit(0), fHits(0), fDigits(0), fPoints(0), diff --git a/STEER/AliESDHLTtrack.cxx b/STEER/AliESDHLTtrack.cxx index 5686199f289..9028e5ead39 100644 --- a/STEER/AliESDHLTtrack.cxx +++ b/STEER/AliESDHLTtrack.cxx @@ -26,28 +26,29 @@ ClassImp(AliESDHLTtrack) -AliESDHLTtrack::AliESDHLTtrack() : TObject() +AliESDHLTtrack::AliESDHLTtrack() : + TObject(), + fNHits(0), + fMCid(0), + fWeight(0), + fFromMainVertex(kFALSE), + fSector(0), + fQ(0), + fTanl(0), + fPsi(0), + fPt(0), + fPterr(0), + fPsierr(0), + fTanlerr(0), + fBinX(0), + fBinY(0), + fSizeX(0), + fSizeY(0), + fPID(0) { - fNHits = 0; - fMCid = 0; - fWeight = 0; - fFromMainVertex = kFALSE; fRowRange[0] = fRowRange[1] = 0; - fSector = 0; fFirstPoint[0] = fFirstPoint[1] = fFirstPoint[2] = 0; fLastPoint[0] = fLastPoint[1] = fLastPoint[2] = 0; - fQ = 0; - fTanl = 0; - fPsi = 0; - fPt = 0; - fPterr = 0; - fPsierr = 0; - fTanlerr = 0; - fBinX = 0; - fBinY = 0; - fSizeX = 0; - fSizeY = 0; - fPID = 0; } Double_t AliESDHLTtrack::GetP() const diff --git a/STEER/AliESDMuonTrack.cxx b/STEER/AliESDMuonTrack.cxx index 5cc5064f739..d4ec2d620f0 100644 --- a/STEER/AliESDMuonTrack.cxx +++ b/STEER/AliESDMuonTrack.cxx @@ -30,25 +30,42 @@ ClassImp(AliESDMuonTrack) +//_____________________________________________________________________________ +AliESDMuonTrack::AliESDMuonTrack (): + TObject(), + fInverseBendingMomentum(0), + fThetaX(0), + fThetaY(0), + fZ(0), + fBendingCoor(0), + fNonBendingCoor(0), + fChi2(0), + fNHit(0), + fMatchTrigger(0), + fChi2MatchTrigger(0) +{ + // Default constructor +} + + //_____________________________________________________________________________ AliESDMuonTrack::AliESDMuonTrack (const AliESDMuonTrack& MUONTrack): - TObject(MUONTrack) + TObject(MUONTrack), + fInverseBendingMomentum(MUONTrack.fInverseBendingMomentum), + fThetaX(MUONTrack.fThetaX), + fThetaY(MUONTrack.fThetaY), + fZ(MUONTrack.fZ), + fBendingCoor(MUONTrack.fBendingCoor), + fNonBendingCoor(MUONTrack.fNonBendingCoor), + fChi2(MUONTrack.fChi2), + fNHit(MUONTrack.fNHit), + fMatchTrigger(MUONTrack.fMatchTrigger), + fChi2MatchTrigger(MUONTrack.fChi2MatchTrigger) { // // Copy constructor // Deep copy implemented // - fInverseBendingMomentum = MUONTrack.fInverseBendingMomentum; - fThetaX = MUONTrack.fThetaX; - fThetaY = MUONTrack.fThetaY ; - fZ = MUONTrack.fZ; - fBendingCoor = MUONTrack.fBendingCoor; - fNonBendingCoor = MUONTrack.fNonBendingCoor; - fChi2 = MUONTrack.fChi2; - fNHit = MUONTrack.fNHit ; - - fMatchTrigger = MUONTrack.fMatchTrigger; - fChi2MatchTrigger = MUONTrack.fChi2MatchTrigger; } //_____________________________________________________________________________ diff --git a/STEER/AliESDMuonTrack.h b/STEER/AliESDMuonTrack.h index 0df4264336c..f57956ba2d1 100644 --- a/STEER/AliESDMuonTrack.h +++ b/STEER/AliESDMuonTrack.h @@ -15,7 +15,7 @@ class AliESDMuonTrack : public TObject { public: - AliESDMuonTrack(){} //Constructor + AliESDMuonTrack(); //Constructor virtual ~AliESDMuonTrack(){} // Destructor AliESDMuonTrack(const AliESDMuonTrack& esdm); AliESDMuonTrack& operator=(const AliESDMuonTrack& esdm); diff --git a/STEER/AliESDPmdTrack.cxx b/STEER/AliESDPmdTrack.cxx index 45dadc8ff14..6921c248299 100644 --- a/STEER/AliESDPmdTrack.cxx +++ b/STEER/AliESDPmdTrack.cxx @@ -25,15 +25,30 @@ ClassImp(AliESDPmdTrack) -AliESDPmdTrack::AliESDPmdTrack (const AliESDPmdTrack& PMDTrack):TObject(PMDTrack) +//--------------------------------------------------------------------------// +AliESDPmdTrack::AliESDPmdTrack () : + TObject(), + fDet(0), + fTheta(0), + fPhi(0), + fCluADC(0), + fCluPID(0) { - // Constructor - fDet = PMDTrack.fDet; - fTheta = PMDTrack.fTheta; - fPhi = PMDTrack.fPhi; - fCluADC = PMDTrack.fCluADC; - fCluPID = PMDTrack.fCluPID; + // Default Constructor } + +//--------------------------------------------------------------------------// +AliESDPmdTrack::AliESDPmdTrack (const AliESDPmdTrack& PMDTrack) : + TObject(PMDTrack), + fDet(PMDTrack.fDet), + fTheta(PMDTrack.fTheta), + fPhi(PMDTrack.fPhi), + fCluADC(PMDTrack.fCluADC), + fCluPID(PMDTrack.fCluPID) +{ + // Copy Constructor +} + //--------------------------------------------------------------------------// AliESDPmdTrack &AliESDPmdTrack::operator=(const AliESDPmdTrack& PMDTrack) { diff --git a/STEER/AliESDPmdTrack.h b/STEER/AliESDPmdTrack.h index e2b7b84b11e..4df0d9f4fce 100644 --- a/STEER/AliESDPmdTrack.h +++ b/STEER/AliESDPmdTrack.h @@ -14,7 +14,7 @@ class AliESDPmdTrack : public TObject { public: - AliESDPmdTrack(){} + AliESDPmdTrack(); virtual ~AliESDPmdTrack(){} AliESDPmdTrack (const AliESDPmdTrack &PMDTrack); // copy constructor AliESDPmdTrack &operator=(const AliESDPmdTrack &PMDTrack); // assignment op diff --git a/STEER/AliESDV0MI.cxx b/STEER/AliESDV0MI.cxx index df825985608..0fad89192bd 100644 --- a/STEER/AliESDV0MI.cxx +++ b/STEER/AliESDV0MI.cxx @@ -28,16 +28,29 @@ ClassImp(AliESDV0MI) -AliESDV0MI::AliESDV0MI(){ +AliESDV0MI::AliESDV0MI() : + AliESDv0(), + fParamP(), + fParamM(), + fID(0), + fDist1(-1), + fDist2(-1), + fRr(-1), + fStatus(0), + fRow0(-1), + fDistNorm(0), + fDistSigma(0), + fChi2Before(0), + fNBefore(0), + fChi2After(0), + fNAfter(0), + fPointAngleFi(0), + fPointAngleTh(0), + fPointAngle(0) +{ // //Dafault constructor // - fID =0; - fDist1 =-1; - fDist2 =-1; - fRr =-1; - fStatus = 0; - fRow0 =-1; } void AliESDV0MI::SetP(const AliExternalTrackParam & paramp) { diff --git a/STEER/AliESDVertex.cxx b/STEER/AliESDVertex.cxx index 731ff261226..92459852315 100644 --- a/STEER/AliESDVertex.cxx +++ b/STEER/AliESDVertex.cxx @@ -33,15 +33,36 @@ ClassImp(AliESDVertex) //-------------------------------------------------------------------------- -AliESDVertex::AliESDVertex() { -// -// Default Constructor, set everything to 0 -// +AliESDVertex::AliESDVertex() : + TNamed(), + fCovXX(0.005*0.005), + fCovXY(0), + fCovYY(0.005*0.005), + fCovXZ(0), + fCovYZ(0), + fCovZZ(5.3*5.3), + fChi2(0), + fNContributors(0) +{ + // + // Default Constructor, set everything to 0 + // SetToZero(); } + //-------------------------------------------------------------------------- AliESDVertex::AliESDVertex(Double_t positionZ,Double_t sigmaZ, - Int_t nContributors,const Char_t *vtxName) { + Int_t nContributors,const Char_t *vtxName) : + TNamed(vtxName,""), + fCovXX(0.005*0.005), + fCovXY(0), + fCovYY(0.005*0.005), + fCovXZ(0), + fCovYZ(0), + fCovZZ(sigmaZ*sigmaZ), + fChi2(0), + fNContributors(nContributors) +{ // // Constructor for vertex Z from pixels // @@ -49,61 +70,69 @@ AliESDVertex::AliESDVertex(Double_t positionZ,Double_t sigmaZ, SetToZero(); fPosition[2] = positionZ; - fCovZZ = sigmaZ*sigmaZ; - fNContributors = nContributors; - SetName(vtxName); } + //------------------------------------------------------------------------- AliESDVertex::AliESDVertex(Double_t position[3],Double_t covmatrix[6], - Double_t chi2,Int_t nContributors, const Char_t *vtxName) { -// -// Constructor for vertex in 3D from tracks -// + Double_t chi2,Int_t nContributors, + const Char_t *vtxName) : + TNamed(vtxName,""), + fCovXX(covmatrix[0]), + fCovXY(covmatrix[1]), + fCovYY(covmatrix[2]), + fCovXZ(covmatrix[3]), + fCovYZ(covmatrix[4]), + fCovZZ(covmatrix[5]), + fChi2(chi2), + fNContributors(nContributors) +{ + // + // Constructor for vertex in 3D from tracks + // SetToZero(); - fPosition[0] = position[0]; - fPosition[1] = position[1]; - fPosition[2] = position[2]; - fCovXX = covmatrix[0]; - fCovXY = covmatrix[1]; - fCovYY = covmatrix[2]; - fCovXZ = covmatrix[3]; - fCovYZ = covmatrix[4]; - fCovZZ = covmatrix[5]; - - - fChi2 = chi2; - fNContributors = nContributors; - - SetName(vtxName); + fPosition[0] = position[0]; + fPosition[1] = position[1]; + fPosition[2] = position[2]; } //-------------------------------------------------------------------------- AliESDVertex::AliESDVertex(Double_t position[3],Double_t sigma[3], - const Char_t *vtxName) { -// -// Constructor for smearing of true position -// + const Char_t *vtxName) : + TNamed(vtxName,""), + fCovXX(sigma[0]*sigma[0]), + fCovXY(0), + fCovYY(sigma[1]*sigma[1]), + fCovXZ(0), + fCovYZ(0), + fCovZZ(sigma[2]*sigma[2]), + fChi2(0), + fNContributors(0) +{ + // + // Constructor for smearing of true position + // SetToZero(); - fPosition[0] = position[0]; - fPosition[1] = position[1]; - fPosition[2] = position[2]; - fCovXX = sigma[0]*sigma[0]; - fCovXY = 0; - fCovYY = sigma[1]*sigma[1]; - fCovXZ = 0; - fCovYZ = 0; - fCovZZ = sigma[2]*sigma[2]; - - - SetName(vtxName); + fPosition[0] = position[0]; + fPosition[1] = position[1]; + fPosition[2] = position[2]; } //-------------------------------------------------------------------------- AliESDVertex::AliESDVertex(Double_t position[3],Double_t sigma[3], - Double_t snr[3], const Char_t *vtxName) { + Double_t snr[3], const Char_t *vtxName) : + TNamed(vtxName,""), + fCovXX(sigma[0]*sigma[0]), + fCovXY(0), + fCovYY(sigma[1]*sigma[1]), + fCovXZ(0), + fCovYZ(0), + fCovZZ(sigma[2]*sigma[2]), + fChi2(0), + fNContributors(0) +{ // // Constructor for Pb-Pb // @@ -112,44 +141,28 @@ AliESDVertex::AliESDVertex(Double_t position[3],Double_t sigma[3], fPosition[0] = position[0]; fPosition[1] = position[1]; fPosition[2] = position[2]; - fCovXX = sigma[0]*sigma[0]; - fCovXY = 0; - fCovYY = sigma[1]*sigma[1]; - fCovXZ = 0; - fCovYZ = 0; - fCovZZ = sigma[2]*sigma[2]; fSNR[0] = snr[0]; fSNR[1] = snr[1]; fSNR[2] = snr[2]; - SetName(vtxName); - } + //-------------------------------------------------------------------------- void AliESDVertex::SetToZero() { // - // Set some data members to 0. Used by constructors + // Set the content of arrays to 0. Used by constructors // for(Int_t i=0; i<3; i++){ fPosition[i] = 0.; fTruePos[i] = 0; fSNR[i] = 0.; } - fCovXX = 0.005*0.005; - fCovXY = 0; - fCovYY = 0.005*0.005; - fCovXZ = 0; - fCovYZ = 0; - fCovZZ = 5.3*5.3; - - fChi2 = 0; - fNContributors = 0; } //-------------------------------------------------------------------------- AliESDVertex::~AliESDVertex() { // -// Default Destructor +// Destructor // } diff --git a/STEER/AliESDcascade.cxx b/STEER/AliESDcascade.cxx index 17d3dfda0e4..578beeaba68 100644 --- a/STEER/AliESDcascade.cxx +++ b/STEER/AliESDcascade.cxx @@ -23,6 +23,7 @@ // Origin: Christian Kuhn, IReS, Strasbourg, christian.kuhn@ires.in2p3.fr //------------------------------------------------------------------------- +#include #include #include "AliLog.h" @@ -30,30 +31,20 @@ ClassImp(AliESDcascade) -AliESDcascade::AliESDcascade() : TObject() { +AliESDcascade::AliESDcascade() : + TObject(), + fPdgCode(kXiMinus), + fEffMass(TDatabasePDG::Instance()->GetParticle(kXiMinus)->Mass()), + fChi2(1.e+33), + fBachIdx(0) +{ //-------------------------------------------------------------------- // Default constructor (Xi-) //-------------------------------------------------------------------- - fPdgCode=kXiMinus; - fEffMass=1.32131; - fChi2=1.e+33; fPos[0]=fPos[1]=fPos[2]=0.; fPosCov[0]=fPosCov[1]=fPosCov[2]=fPosCov[3]=fPosCov[4]=fPosCov[5]=0.; } -inline Double_t det(Double_t a00, Double_t a01, Double_t a10, Double_t a11){ - // determinant 2x2 - return a00*a11 - a01*a10; -} - -inline Double_t det (Double_t a00,Double_t a01,Double_t a02, - Double_t a10,Double_t a11,Double_t a12, - Double_t a20,Double_t a21,Double_t a22) { - // determinant 3x3 - return - a00*det(a11,a12,a21,a22)-a01*det(a10,a12,a20,a22)+a02*det(a10,a11,a20,a21); -} - Double_t AliESDcascade::ChangeMassHypothesis(Double_t &v0q, Int_t code) { //-------------------------------------------------------------------- // This function changes the mass hypothesis for this cascade diff --git a/STEER/AliESDkink.cxx b/STEER/AliESDkink.cxx index 7272275897d..dd0208fb91d 100644 --- a/STEER/AliESDkink.cxx +++ b/STEER/AliESDkink.cxx @@ -28,15 +28,22 @@ ClassImp(AliESDkink) -AliESDkink::AliESDkink(){ +//____________________________________________________________________ +AliESDkink::AliESDkink() : + TObject(), + fID(0), + fParamDaughter(), + fParamMother(), + fDist1(-1), + fDist2(-1), + fRr(-1), + fShapeFactor(0), + fRow0(-1) +{ // //Dafault constructor // - fDist1 =-1; - fDist2 =-1; - fRr =-1; for (Int_t i=0;i<12;i++) fStatus[i]=0; - fRow0 =-1; for (Int_t i=0;i<2;i++) for (Int_t j=0;j<2;j++){ fTPCdensity[i][j]=-1; diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx index 4531e34ac7d..86262cbf460 100644 --- a/STEER/AliESDtrack.cxx +++ b/STEER/AliESDtrack.cxx @@ -30,47 +30,54 @@ ClassImp(AliESDtrack) //_______________________________________________________________________ AliESDtrack::AliESDtrack() : -fFlags(0), -fLabel(0), -fID(0), -fTrackLength(0), -fD(0), -fZ(0), -fStopVertex(0), -fRalpha(0), -fRx(0), -fCalpha(0), -fCx(0), -fCchi2(1e10), -fIalpha(0), -fIx(0), -fTalpha(0), -fTx(0), -fITSchi2(0), -fITSncls(0), -fITSsignal(0), -fTPCchi2(0), -fTPCncls(0), -fTPCClusterMap(159),//number of padrows -fTPCsignal(0), -fTRDchi2(0), -fTRDncls(0), -fTRDncls0(0), -fTRDsignal(0), -fTRDQuality(0), -fTOFchi2(0), -fTOFindex(0), -fTOFsignal(-1), -fPHOSsignal(-1), -fEMCALsignal(-1), -fRICHchi2(1e10), -fRICHncls(0), -fRICHindex(0), -fRICHsignal(-1), -fRICHtheta(0), -fRICHphi(0), -fRICHdx(0), -fRICHdy(0) + TObject(), + fFlags(0), + fLabel(0), + fID(0), + fTrackLength(0), + fD(0), + fZ(0), + fStopVertex(0), + fRalpha(0), + fRx(0), + fCalpha(0), + fCx(0), + fCchi2(1e10), + fIalpha(0), + fIx(0), + fTalpha(0), + fTx(0), + fITSchi2(0), + fITSncls(0), + fITSsignal(0), + fITSLabel(0), + fITSFakeRatio(0), + fITStrack(0), + fTPCchi2(0), + fTPCncls(0), + fTPCClusterMap(159),//number of padrows + fTPCsignal(0), + fTPCLabel(0), + fTRDchi2(0), + fTRDncls(0), + fTRDncls0(0), + fTRDsignal(0), + fTRDLabel(0), + fTRDQuality(0), + fTRDtrack(0), + fTOFchi2(0), + fTOFindex(0), + fTOFsignal(-1), + fPHOSsignal(-1), + fEMCALsignal(-1), + fRICHchi2(1e10), + fRICHncls(0), + fRICHindex(0), + fRICHsignal(-1), + fRICHtheta(0), + fRICHphi(0), + fRICHdx(0), + fRICHdy(0) { // // The default ESD constructor @@ -118,100 +125,102 @@ fRICHdy(0) } //_______________________________________________________________________ - -AliESDtrack::AliESDtrack(const AliESDtrack& track):TObject(track){ +AliESDtrack::AliESDtrack(const AliESDtrack& track): + TObject(track), + fFlags(track.fFlags), + fLabel(track.fLabel), + fID(track.fID), + fTrackLength(track.fTrackLength), + fD(track.fD), + fZ(track.fZ), + fStopVertex(track.fStopVertex), + fRalpha(track.fRalpha), + fRx(track.fRx), + fCalpha(track.fCalpha), + fCx(track.fCx), + fCchi2(track.fCchi2), + fIalpha(track.fIalpha), + fIx(track.fIx), + fTalpha(track.fTalpha), + fTx(track.fTx), + fITSchi2(track.fITSchi2), + fITSncls(track.fITSncls), + fITSsignal(track.fITSsignal), + fITSLabel(track.fITSLabel), + fITSFakeRatio(track.fITSFakeRatio), + fITStrack(0), //coping separatelly - in user code + fTPCchi2(track.fTPCchi2), + fTPCncls(track.fTPCncls), + fTPCClusterMap(track.fTPCClusterMap), + fTPCsignal(track.fTPCsignal), + fTPCLabel(track.fTPCLabel), + fTRDchi2(track.fTRDchi2), + fTRDncls(track.fTRDncls), + fTRDncls0(track.fTRDncls0), + fTRDsignal(track.fTRDsignal), + fTRDLabel(track.fTRDLabel), + fTRDQuality(track.fTRDQuality), + fTRDtrack(0), + fTOFchi2(track.fTOFchi2), + fTOFindex(track.fTOFindex), + fTOFsignal(track.fTOFsignal), + fPHOSsignal(track.fPHOSsignal), + fEMCALsignal(track.fEMCALsignal), + fRICHchi2(track.fRICHchi2), + fRICHncls(track.fRICHncls), + fRICHindex(track.fRICHindex), + fRICHsignal(track.fRICHsignal), + fRICHtheta(track.fRICHtheta), + fRICHphi(track.fRICHphi), + fRICHdx(track.fRICHdx), + fRICHdy(track.fRICHdy) +{ // //copy constructor // - fFlags = track.fFlags; - fLabel =track.fLabel; - fID = track.fID; - fTrackLength =track.fTrackLength; - fD=track.fD; fZ=track.fZ; for (Int_t i=0;i #include +#include #include +#include #include "AliLog.h" #include "AliESDv0.h" ClassImp(AliESDv0) -AliESDv0::AliESDv0() : TObject() { +AliESDv0::AliESDv0() : + TObject(), + fPdgCode(kK0Short), + fEffMass(TDatabasePDG::Instance()->GetParticle(kK0Short)->Mass()), + fChi2(1.e+33), + fNidx(0), + fPidx(0) +{ //-------------------------------------------------------------------- // Default constructor (K0s) //-------------------------------------------------------------------- - fPdgCode=kK0Short; - fEffMass=0.497672; - fChi2=1.e+33; fPos[0]=fPos[1]=fPos[2]=0.; fPosCov[0]=fPosCov[1]=fPosCov[2]=fPosCov[3]=fPosCov[4]=fPosCov[5]=0.; } diff --git a/STEER/AliExternalTrackParam.cxx b/STEER/AliExternalTrackParam.cxx index 3c7c73f8b6b..ed02c3a39a2 100644 --- a/STEER/AliExternalTrackParam.cxx +++ b/STEER/AliExternalTrackParam.cxx @@ -41,11 +41,14 @@ ClassImp(AliExternalTrackParam) //_____________________________________________________________________________ -AliExternalTrackParam::AliExternalTrackParam() +AliExternalTrackParam::AliExternalTrackParam() : + AliTrackParam(), + fX(0), + fAlpha(0) { -// default constructor - - fX = fAlpha = 0.; + // + // default constructor + // for (Int_t i = 0; i < 5; i++) fParam[i] = 0; for (Int_t i = 0; i < 15; i++) fCovar[i] = 0; } @@ -53,26 +56,29 @@ AliExternalTrackParam::AliExternalTrackParam() //_____________________________________________________________________________ AliExternalTrackParam::AliExternalTrackParam(Double_t x, Double_t alpha, const Double_t param[5], - const Double_t covar[15]) + const Double_t covar[15]) : + AliTrackParam(), + fX(x), + fAlpha(alpha) { -// create external track parameters from given arguments - - fX = x; - fAlpha = alpha; + // + // create external track parameters from given arguments + // for (Int_t i = 0; i < 5; i++) fParam[i] = param[i]; for (Int_t i = 0; i < 15; i++) fCovar[i] = covar[i]; } -AliExternalTrackParam::AliExternalTrackParam(const AliKalmanTrack& track) +//_____________________________________________________________________________ +AliExternalTrackParam::AliExternalTrackParam(const AliKalmanTrack& track) : + fX(0), + fAlpha(track.GetAlpha()) { // // track.GetExternalParameters(fX,fParam); track.GetExternalCovariance(fCovar); - fAlpha = track.GetAlpha(); } - //_____________________________________________________________________________ const Double_t* AliExternalTrackParam::GetParameter() const { diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 5cfca738935..f08162882ae 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -51,6 +51,8 @@ ClassImp(AliGenerator) //_______________________________________________________________________ AliGenerator::AliGenerator(): + TNamed(), + AliRndm(), fMCEvGen(0), fThetaMin(0), fThetaMax(0), @@ -72,6 +74,7 @@ AliGenerator::AliGenerator(): fVertexSource(kInternal), fCutVertexZ(0), fTrackIt(0), + fVertexGenerator(0), fOrigin(3), fOsigma(3), fVertex(3), @@ -108,6 +111,8 @@ AliGenerator::AliGenerator(): //_______________________________________________________________________ AliGenerator::AliGenerator(Int_t npart): + TNamed(), + AliRndm(), fMCEvGen(0), fThetaMin(0), fThetaMax(0), @@ -129,6 +134,7 @@ AliGenerator::AliGenerator(Int_t npart): fVertexSource(kInternal), fCutVertexZ(0), fTrackIt(0), + fVertexGenerator(0), fOrigin(3), fOsigma(3), fVertex(3), @@ -190,11 +196,13 @@ AliGenerator::AliGenerator(const AliGenerator &gen): fVertexSource(kInternal), fCutVertexZ(0), fTrackIt(0), + fVertexGenerator(0), fOrigin(3), fOsigma(3), fVertex(3), fStack(0), - fContainer(0) + fContainer(0), + fCollisionGeometry(0) { // // Copy constructor diff --git a/STEER/AliKalmanTrack.cxx b/STEER/AliKalmanTrack.cxx index 0e52d2ce4fa..8bc4e045ac8 100644 --- a/STEER/AliKalmanTrack.cxx +++ b/STEER/AliKalmanTrack.cxx @@ -26,15 +26,18 @@ ClassImp(AliKalmanTrack) -Double_t AliKalmanTrack::fgConvConst; +Double_t AliKalmanTrack::fgConvConst = 0; //_______________________________________________________________________ AliKalmanTrack::AliKalmanTrack(): + TObject(), fLab(-3141593), fFakeRatio(0), fChi2(0), fMass(AliPID::ParticleMass(AliPID::kPion)), - fN(0) + fN(0), + fStartTimeIntegral(kFALSE), + fIntegratedLength(0) { // // Default constructor @@ -43,8 +46,6 @@ AliKalmanTrack::AliKalmanTrack(): AliFatal("The magnetic field has not been set!"); } - fStartTimeIntegral = kFALSE; - fIntegratedLength = 0; for(Int_t i=0; i<5; i++) fIntegratedTime[i] = 0; } @@ -55,7 +56,9 @@ AliKalmanTrack::AliKalmanTrack(const AliKalmanTrack &t): fFakeRatio(t.fFakeRatio), fChi2(t.fChi2), fMass(t.fMass), - fN(t.fN) + fN(t.fN), + fStartTimeIntegral(t.fStartTimeIntegral), + fIntegratedLength(t.fIntegratedLength) { // // Copy constructor @@ -64,8 +67,6 @@ AliKalmanTrack::AliKalmanTrack(const AliKalmanTrack &t): AliFatal("The magnetic field has not been set!"); } - fStartTimeIntegral = t.fStartTimeIntegral; - fIntegratedLength = t.fIntegratedLength; for (Int_t i=0; i<5; i++) fIntegratedTime[i] = t.fIntegratedTime[i]; diff --git a/STEER/AliLoader.cxx b/STEER/AliLoader.cxx index a2f1213bc1f..47925c54100 100644 --- a/STEER/AliLoader.cxx +++ b/STEER/AliLoader.cxx @@ -59,7 +59,7 @@ AliLoader::AliLoader(): fModuleFolder(0x0), fTasksFolder(0x0), fQAFolder(0x0) - { +{ //default constructor } @@ -110,7 +110,17 @@ AliLoader::AliLoader(const Char_t * detname,TFolder* eventfolder): //fileoption's don't need to initialized because default TString ctor does it correctly } /*****************************************************************************/ -AliLoader::AliLoader(const AliLoader& source):TNamed(source) { +AliLoader::AliLoader(const AliLoader& source) : + TNamed(source), + fDataLoaders(source.fDataLoaders), + fDetectorName(source.fDetectorName), + fEventFolder(source.fEventFolder), + fDataFolder(source.fDataFolder), + fDetectorDataFolder(source.fDetectorDataFolder), + fModuleFolder(source.fModuleFolder), + fTasksFolder(source.fTasksFolder), + fQAFolder(source.fQAFolder) +{ // dummy copy constructor if(&source==this)return; diff --git a/STEER/AliLog.cxx b/STEER/AliLog.cxx index fad662ba8e4..59d54800b22 100644 --- a/STEER/AliLog.cxx +++ b/STEER/AliLog.cxx @@ -115,7 +115,19 @@ AliLog::~AliLog() //_____________________________________________________________________________ AliLog::AliLog(const AliLog& log) : - TObject(log) + TObject(log), + fGlobalLogLevel(log.fGlobalLogLevel), + fModuleDebugLevels(log.fModuleDebugLevels), + fClassDebugLevels(log.fClassDebugLevels), + fPrintRepetitions(log.fPrintRepetitions), + fRepetitions(log.fRepetitions), + fLastType(log.fLastType), + fLastMessage(log.fLastMessage), + fLastModule(log.fLastModule), + fLastClassName(log.fLastClassName), + fLastFunction(log.fLastFunction), + fLastFile(log.fLastFile), + fLastLine(log.fLastLine) { // copy constructor diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx index 6a8bb1d484b..e1bde47e016 100644 --- a/STEER/AliMC.cxx +++ b/STEER/AliMC.cxx @@ -52,6 +52,9 @@ AliMC::AliMC() : fSum2Energy(0), fTrRmax(1.e10), fTrZmax(1.e10), + fRDecayMax(1.e10), + fRDecayMin(0), + fDecayPdg(0), fImedia(0), fTransParName("\0"), fMCQA(0), @@ -72,6 +75,9 @@ AliMC::AliMC(const char *name, const char *title) : fSum2Energy(0), fTrRmax(1.e10), fTrZmax(1.e10), + fRDecayMax(1.e10), + fRDecayMin(0), + fDecayPdg(0), fImedia(new TArrayI(1000)), fTransParName("\0"), fMCQA(0), @@ -95,6 +101,9 @@ AliMC::AliMC(const AliMC &mc) : fSum2Energy(0), fTrRmax(1.e10), fTrZmax(1.e10), + fRDecayMax(1.e10), + fRDecayMin(0), + fDecayPdg(0), fImedia(0), fTransParName("\0"), fMCQA(0), @@ -102,7 +111,7 @@ AliMC::AliMC(const AliMC &mc) : fTrackReferences(0) { // - // Copy constructor for AliRun + // Copy constructor for AliMC // mc.Copy(*this); } diff --git a/STEER/AliMemoryWatcher.cxx b/STEER/AliMemoryWatcher.cxx index c172e71b02a..e94afee0dd6 100644 --- a/STEER/AliMemoryWatcher.cxx +++ b/STEER/AliMemoryWatcher.cxx @@ -62,38 +62,43 @@ class assert ; ClassImp(AliMemoryWatcher) //_____________________________________________________________________________ -AliMemoryWatcher::AliMemoryWatcher(UInt_t maxsize) +AliMemoryWatcher::AliMemoryWatcher(UInt_t maxsize) : + TObject(), + fUseMallinfo(kTRUE), + fPID(gSystem->GetPid()), + fMAXSIZE(maxsize), + fSize(0), + fX(new Int_t[fMAXSIZE]), + fVSIZE(new Int_t[fMAXSIZE]), + fRSSIZE(new Int_t[fMAXSIZE]), + fTIME(new Double_t[fMAXSIZE]), + fTimer(0), + fDisabled(kFALSE) { + // //ctor - fMAXSIZE=maxsize; - fUseMallinfo = true; - fPID = gSystem->GetPid(); + // sprintf(fCmd,"ps -h -p %d -o vsize,rssize",fPID); - fX = new Int_t[fMAXSIZE]; - fVSIZE = new Int_t[fMAXSIZE]; - fRSSIZE = new Int_t[fMAXSIZE]; - fTIME = new Double_t[fMAXSIZE]; - fSize=0; - fDisabled=false; - fTimer=0; } + //_____________________________________________________________________________ AliMemoryWatcher::AliMemoryWatcher(const AliMemoryWatcher& mw): - TObject(mw) + TObject(mw), + fUseMallinfo(mw.fUseMallinfo), + fPID(mw.fPID), + fMAXSIZE(mw.fMAXSIZE), + fSize(0), + fX(new Int_t[fMAXSIZE]), + fVSIZE(new Int_t[fMAXSIZE]), + fRSSIZE(new Int_t[fMAXSIZE]), + fTIME(new Double_t[fMAXSIZE]), + fTimer(0), + fDisabled(kFALSE) { //copy ctor - fMAXSIZE = mw.fMAXSIZE ; - fUseMallinfo = mw.fUseMallinfo; - fPID = mw.fPID ; strcpy(fCmd, mw.fCmd) ; - fX = new Int_t[fMAXSIZE]; - fVSIZE = new Int_t[fMAXSIZE]; - fRSSIZE = new Int_t[fMAXSIZE]; - fTIME = new Double_t[fMAXSIZE]; - fSize=0; - fDisabled=false; - fTimer=0; } + //_____________________________________________________________________________ AliMemoryWatcher::~AliMemoryWatcher() { diff --git a/STEER/AliPID.cxx b/STEER/AliPID.cxx index 95306b24189..1f34a86334c 100644 --- a/STEER/AliPID.cxx +++ b/STEER/AliPID.cxx @@ -45,24 +45,11 @@ #include #include +#define M(PID) TDatabasePDG::Instance()->GetParticle(fgkParticleCode[(PID)])->Mass() ClassImp(AliPID) -Float_t AliPID::fgkParticleMass[AliPID::kSPECIESN+1] = { - 0.00051, // electron - 0.10566, // muon - 0.13957, // pion - 0.49360, // kaon - 0.93827, // proton - 0.00000, // photon - 0.13498, // pi0 - 0.93957, // neutron - 0.49767, // kaon0 - 0.00000, // electron conversion - 0.00000 // unknown -}; - const char* AliPID::fgkParticleName[AliPID::kSPECIESN+1] = { "electron", "muon", @@ -91,12 +78,27 @@ const Int_t AliPID::fgkParticleCode[AliPID::kSPECIESN+1] = { 0 }; +const Float_t AliPID::fgkParticleMass[AliPID::kSPECIESN+1] = { + M(kElectron), // electron + M(kMuon), // muon + M(kPion), // pion + M(kKaon), // kaon + M(kProton), // proton + M(kPhoton), // photon + M(kPi0), // pi0 + M(kNeutron), // neutron + M(kKaon0), // kaon0 + M(kEleCon), // electron conversion + 0.00000 // unknown +}; Double_t AliPID::fgPrior[kSPECIESN] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; //_______________________________________________________________________ -AliPID::AliPID() +AliPID::AliPID() : + TObject(), + fCharged(0) { // set default values (= equal probabilities) @@ -106,11 +108,13 @@ AliPID::AliPID() } //_______________________________________________________________________ -AliPID::AliPID(const Double_t* probDensity, Bool_t charged) +AliPID::AliPID(const Double_t* probDensity, Bool_t charged) : + TObject(), + fCharged(charged) { -// set given probability densities - - fCharged = charged; + // + // set given probability densities + // for (Int_t i = 0; i < kSPECIES; i++) { fProbDensity[i] = probDensity[i]; } @@ -120,11 +124,13 @@ AliPID::AliPID(const Double_t* probDensity, Bool_t charged) } //_______________________________________________________________________ -AliPID::AliPID(const Float_t* probDensity, Bool_t charged) +AliPID::AliPID(const Float_t* probDensity, Bool_t charged) : + TObject(), + fCharged(charged) { -// set given probability densities - - fCharged = charged; + // + // set given probability densities + // for (Int_t i = 0; i < kSPECIES; i++) { fProbDensity[i] = probDensity[i]; } @@ -138,8 +144,9 @@ AliPID::AliPID(const AliPID& pid) : TObject(pid), fCharged(pid.fCharged) { -// copy constructor - + // + // copy constructor + // for (Int_t i = 0; i < kSPECIESN; i++) { fProbDensity[i] = pid.fProbDensity[i]; } @@ -290,18 +297,6 @@ void AliPID::SetPrior(EParticleType iType, Double_t prior) } -//_____________________________________________________________________________ -void AliPID::Init() -{ -// initialize the mass values from the PDG database - - for (Int_t i = 0; i < kSPECIESN; i++) { - fgkParticleMass[i] = - TDatabasePDG::Instance()->GetParticle(fgkParticleCode[i])->Mass(); - } -} - - //_____________________________________________________________________________ AliPID& AliPID::operator *= (const AliPID& pid) { diff --git a/STEER/AliPID.h b/STEER/AliPID.h index 82d84959804..7c2f5169703 100644 --- a/STEER/AliPID.h +++ b/STEER/AliPID.h @@ -61,8 +61,6 @@ class AliPID : public TObject { Bool_t charged = kTRUE); static void SetPrior(EParticleType iType, Double_t prior); - static void Init(); - AliPID& operator *= (const AliPID& pid); private: @@ -70,7 +68,7 @@ class AliPID : public TObject { Double_t fProbDensity[kSPECIESN]; // probability densities static Double_t fgPrior[kSPECIESN]; // a priori probabilities - static Float_t fgkParticleMass[kSPECIESN+1]; // particle masses + static const Float_t fgkParticleMass[kSPECIESN+1]; // particle masses static const char* fgkParticleName[kSPECIESN+1]; // particle names static const Int_t fgkParticleCode[kSPECIESN+1]; // particle codes diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx index 9b2ee6bd82d..556c72ab402 100644 --- a/STEER/AliReconstruction.cxx +++ b/STEER/AliReconstruction.cxx @@ -161,7 +161,7 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, fLoader[iDet] = NULL; fTracker[iDet] = NULL; } - AliPID::Init(); + // AliPID::Init(); } //_____________________________________________________________________________ diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx index 8b3bb4e850a..41e420148e0 100644 --- a/STEER/AliRun.cxx +++ b/STEER/AliRun.cxx @@ -89,6 +89,7 @@ AliRun::AliRun(): fPDGDB(0), //Particle factory object fConfigFunction("\0"), fRandom(0), + fBaseFileName(), fRunLoader(0x0) { // @@ -117,6 +118,7 @@ AliRun::AliRun(const AliRun& arun): fPDGDB(0), //Particle factory object fConfigFunction("\0"), fRandom(0), + fBaseFileName(), fRunLoader(0x0) { // @@ -144,6 +146,7 @@ AliRun::AliRun(const char *name, const char *title): fPDGDB(TDatabasePDG::Instance()), //Particle factory object! fConfigFunction("Config();"), fRandom(new TRandom3()), + fBaseFileName(), fRunLoader(0x0) { // diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx index fbf97c7e118..0295cba5b00 100644 --- a/STEER/AliStack.cxx +++ b/STEER/AliStack.cxx @@ -47,6 +47,7 @@ AliStack::AliStack(): fParticleMap(0), fParticleFileMap(0), fParticleBuffer(0), + fCurrentTrack(0), fTreeK(0), fNtrack(0), fNprimary(0), @@ -67,6 +68,7 @@ AliStack::AliStack(Int_t size, const char* evfoldname): fParticleMap(new TObjArray(size)), fParticleFileMap(0), fParticleBuffer(0), + fCurrentTrack(0), fTreeK(0), fNtrack(0), fNprimary(0), @@ -88,13 +90,15 @@ AliStack::AliStack(const AliStack& st): fParticleMap(0), fParticleFileMap(0), fParticleBuffer(0), + fCurrentTrack(0), fTreeK(0), fNtrack(0), fNprimary(0), fCurrent(-1), fCurrentPrimary(-1), fHgwmk(0), - fLoadPoint(0) + fLoadPoint(0), + fEventFolderName() { // // Copy constructor diff --git a/STEER/AliTrackReference.cxx b/STEER/AliTrackReference.cxx index 8dad2b9bbc4..3c8c3342028 100644 --- a/STEER/AliTrackReference.cxx +++ b/STEER/AliTrackReference.cxx @@ -15,7 +15,6 @@ /* $Id$ */ -#include "TLorentzVector.h" #include "TVirtualMC.h" #include "AliRun.h" @@ -58,7 +57,16 @@ ClassImp(AliTrackReference) //_______________________________________________________________________ AliTrackReference::AliTrackReference(Int_t label) : - TObject() + TObject(), + fTrack(label), + fX(0), + fY(0), + fZ(0), + fPx(0), + fPy(0), + fPz(0), + fLength(gMC->TrackLength()), + fTime(gMC->TrackTime()) { // // Create Reference object out of label and @@ -71,19 +79,15 @@ AliTrackReference::AliTrackReference(Int_t label) : // GSI, Jan 31, 2003 // - TLorentzVector vec; + Double_t vec[4]; - fTrack = label; - fLength = gMC->TrackLength(); - fTime = gMC->TrackTime(); - - gMC->TrackPosition(vec); + gMC->TrackPosition(vec[0],vec[1],vec[2]); fX = vec[0]; fY = vec[1]; fZ = vec[2]; - gMC->TrackMomentum(vec); + gMC->TrackMomentum(vec[0],vec[1],vec[2],vec[3]); fPx = vec[0]; fPy = vec[1]; diff --git a/STEER/AliTracker.h b/STEER/AliTracker.h index 29400f8f7e2..cd35f9a8a58 100644 --- a/STEER/AliTracker.h +++ b/STEER/AliTracker.h @@ -27,8 +27,8 @@ public: AliTracker(); AliTracker(const AliTracker &atr): TObject(atr) {Fatal("Copy ctor","Not Implemented!\n");} - AliTracker & operator=(const AliTracker &) - {Fatal("= op","Not Implemented\n");return *this;} + // AliTracker & operator=(const AliTracker &) + // {Fatal("= op","Not Implemented\n");return *this;} virtual ~AliTracker(){} virtual Int_t Clusters2Tracks(AliESD *event)=0; virtual Int_t PropagateBack(AliESD *event)=0; @@ -60,6 +60,9 @@ public: void SetStoreBarrel(Int_t s) {fStoreBarrel = s;} private: + + AliTracker & operator=(const AliTracker & atr); + static const AliMagF *fgkFieldMap; //field map Int_t fEventN;//event number diff --git a/STEER/AliVertexGenFile.h b/STEER/AliVertexGenFile.h index 6ac8539998f..71d28d90637 100644 --- a/STEER/AliVertexGenFile.h +++ b/STEER/AliVertexGenFile.h @@ -25,11 +25,10 @@ class AliVertexGenFile: public AliVertexGenerator { virtual TVector3 GetVertex(); private: - AliVertexGenFile(const AliVertexGenFile &vgf): - AliVertexGenerator(vgf) - {Fatal("copy ctor","Not implemented\n");} - AliVertexGenFile & operator=(const AliVertexGenFile &) - {Fatal("= operator","Not implemented\n"); return *this;} + AliVertexGenFile(const AliVertexGenFile &vgf); + //: AliVertexGenerator(vgf) {Fatal("copy ctor","Not implemented\n");} + AliVertexGenFile & operator=(const AliVertexGenFile &); + // {Fatal("= operator","Not implemented\n"); return *this;} TFile* fFile; //! galice file with vertices TTree* fTree; //! tree with headers AliHeader* fHeader; //! event header diff --git a/STEER/AliVertexer.cxx b/STEER/AliVertexer.cxx index 0888440e61f..545883dc64e 100644 --- a/STEER/AliVertexer.cxx +++ b/STEER/AliVertexer.cxx @@ -28,17 +28,24 @@ ClassImp(AliVertexer) ////////////////////////////////////////////////////////////////////// //______________________________________________________________________ -AliVertexer::AliVertexer() { +AliVertexer::AliVertexer() : + fCurrentVertex(0), + fFirstEvent(0), + fLastEvent(0) +{ + // // Default Constructor - - fCurrentVertex = 0; - SetFirstEvent(0); - SetLastEvent(0); + // } //______________________________________________________________________ -AliVertexer::AliVertexer(const AliVertexer &vtxr) : TObject(vtxr) { +AliVertexer::AliVertexer(const AliVertexer &vtxr) : + TObject(vtxr), + fCurrentVertex(vtxr.fCurrentVertex), + fFirstEvent(vtxr.fFirstEvent), + fLastEvent(vtxr.fLastEvent) +{ // Copy constructor // Copies are not allowed. The method is protected to avoid misuse. AliFatal("Copy constructor not allowed"); diff --git a/STEER/TTreeStream.cxx b/STEER/TTreeStream.cxx index 690164465ed..7904ef5ab49 100644 --- a/STEER/TTreeStream.cxx +++ b/STEER/TTreeStream.cxx @@ -122,22 +122,22 @@ void TTreeSRedirector::Test() } - - - - -TTreeSRedirector::TTreeSRedirector(const char *fname){ +TTreeSRedirector::TTreeSRedirector(const char *fname) : + fFile(new TFile(fname,"recreate")), + fDataLayouts(0) +{ // + // Constructor // - fFile = new TFile(fname,"recreate"); if (!fFile){ fFile = new TFile(fname,"new"); } - fDataLayouts =0; } -TTreeSRedirector::~TTreeSRedirector(){ +TTreeSRedirector::~TTreeSRedirector() +{ // + // Destructor // Close(); //write the tree to the selected file fFile->Close(); @@ -216,39 +216,53 @@ void TTreeSRedirector::Close(){ //------------------------------------------------------------- -TTreeDataElement:: TTreeDataElement(Char_t type){ +TTreeDataElement:: TTreeDataElement(Char_t type) : + fName(), + fType(type), + fDType(0), + fClass(0), + fPointer(0) +{ + // // // - fType = type; - fDType = 0; - fClass = 0; - fPointer= 0; } -TTreeDataElement:: TTreeDataElement(TDataType* type){ + +TTreeDataElement:: TTreeDataElement(TDataType* type) : + fName(), + fType(' '), + fDType(type), + fClass(0), + fPointer(0) +{ + // // // - fType = 0; - fDType = type; - fClass = 0; - fPointer= 0; } -TTreeDataElement:: TTreeDataElement(TClass* cl){ + +TTreeDataElement:: TTreeDataElement(TClass* cl) : + fName(), + fType(' '), + fDType(0), + fClass(cl), + fPointer(0) +{ + // // // - fType = 0; - fDType = 0; - fClass = cl; - fPointer= 0; } //------------------------------------------------------------------- -TTreeStream::TTreeStream(const char *treename):TNamed(treename,treename){ - fElements =0; - fTree =0; - fCurrentIndex =0; - fNextName=""; - fNextNameCounter=0; - fTree = new TTree(treename, treename); +TTreeStream::TTreeStream(const char *treename): + TNamed(treename,treename), + fElements(0), + fBranches(0), + fTree(new TTree(treename, treename)), + fCurrentIndex(0), + fNextName(), + fNextNameCounter(), + fStatus(0) +{ } TTreeStream::~TTreeStream() diff --git a/STEER/TTreeStream.h b/STEER/TTreeStream.h index c5c301ff0ed..c09d48ad8dc 100644 --- a/STEER/TTreeStream.h +++ b/STEER/TTreeStream.h @@ -20,6 +20,10 @@ class TTreeDataElement: public TNamed { void SetPointer(void* pointer) {fPointer=pointer;} Char_t GetType() const {return fType;} protected: + + TTreeDataElement(const TTreeDataElement & tde); + TTreeDataElement & operator=(const TTreeDataElement & tde); + TString fName; // name of the data element Char_t fType; // type of data element TDataType *fDType; //data type pointer @@ -59,6 +63,10 @@ public: TTreeStream &operator<<(Char_t *name); protected: // + + TTreeStream(const TTreeStream & ts); + TTreeStream & operator=(const TTreeStream & ts); + TObjArray *fElements; //array of elements TObjArray *fBranches; //pointers to branches TTree *fTree; //data storage @@ -81,6 +89,10 @@ public: virtual TTreeStream &operator<<(Int_t id); virtual TTreeStream &operator<<(const char *name); private: + + TTreeSRedirector(const TTreeSRedirector & tsr); + TTreeSRedirector & operator=(const TTreeSRedirector & tsr); + TFile* fFile; //file TObjArray *fDataLayouts; //array of data layouts ClassDef(TTreeSRedirector,1) -- 2.39.3