From 179c6296933f765a926e55ebbf1188a75d495c62 Mon Sep 17 00:00:00 2001 From: kowal2 Date: Mon, 6 Nov 2006 16:07:16 +0000 Subject: [PATCH] Eff C++ --- TPC/AliClusters.cxx | 31 +++++++++-- TPC/AliClusters.h | 4 +- TPC/AliClustersArray.cxx | 9 +-- TPC/AliComplexCluster.cxx | 22 +++++++- TPC/AliComplexCluster.h | 46 ++++++++++++--- TPC/AliDetectorParam.cxx | 11 +++- TPC/AliDetectorParam.h | 2 +- TPC/AliDigits.cxx | 32 +++++++++-- TPC/AliDigitsArray.cxx | 26 ++++++++- TPC/AliDigitsArray.h | 2 + TPC/AliSegmentArray.cxx | 49 +++++++++------- TPC/AliSegmentID.cxx | 4 +- TPC/AliSegmentID.h | 4 +- TPC/AliSimDigits.cxx | 31 ++++++++++- TPC/AliSimDigits.h | 2 + TPC/AliTPC.cxx | 103 ++++++++++++++++++++++++++-------- TPC/AliTPC.h | 3 +- TPC/AliTPCBuffer.cxx | 26 +++++++-- TPC/AliTPCBuffer.h | 9 +-- TPC/AliTPCCalROC.cxx | 39 ++++++++++--- TPC/AliTPCCalROC.h | 1 + TPC/AliTPCDDLRawData.cxx | 3 +- TPC/AliTPCDDLRawData.h | 3 +- TPC/AliTPCDigitizer.cxx | 11 ++-- TPC/AliTPCDigitsArray.cxx | 4 ++ TPC/AliTPCFast.cxx | 17 ++++++ TPC/AliTPCFast.h | 3 + TPC/AliTPCPRF2D.cxx | 48 +++++++++++----- TPC/AliTPCParam.cxx | 87 +++++++++++++++++++++++++++-- TPC/AliTPCParamCR.cxx | 33 +++++++++-- TPC/AliTPCParamCR.h | 2 + TPC/AliTPCParamSR.cxx | 37 +++++++++++-- TPC/AliTPCParamSR.h | 2 + TPC/AliTPCPid.cxx | 50 ++++++++++++++++- TPC/AliTPCPid.h | 3 +- TPC/AliTPCRF1D.cxx | 34 +++++++++--- TPC/AliTPCROC.cxx | 99 ++++++++++++++++++++++++++++++++- TPC/AliTPCROC.h | 1 + TPC/AliTPCTrackHitsV2.cxx | 51 +++++++++++++---- TPC/AliTPCTrackHitsV2.h | 31 ++++++++++- TPC/AliTPCcalibDB.h | 2 + TPC/AliTPCcluster.cxx | 12 +++- TPC/AliTPCcluster.h | 4 +- TPC/AliTPCclusterer.cxx | 26 +++++++-- TPC/AliTPCclusterer.h | 5 +- TPC/AliTPCdigit.cxx | 23 +++++++- TPC/AliTPCdigit.h | 2 +- TPC/AliTPCkineGrid.cxx | 44 +++++++++++---- TPC/AliTPCkineGrid.h | 1 + TPC/AliTPCpidESD.cxx | 5 +- TPC/AliTPCpidESD.h | 1 + TPC/AliTPCpolyTrack.cxx | 21 +++++++ TPC/AliTPCseed.cxx | 11 +++- TPC/AliTPCseed.h | 3 +- TPC/AliTPCtrackPid.cxx | 25 ++++++++- TPC/AliTPCtrackerParam.cxx | 111 ++++++++++++++++++++++++++++++++----- TPC/AliTPCtrackerParam.h | 15 ++++- TPC/AliTPCv1.cxx | 7 ++- TPC/AliTPCv3.cxx | 7 +-- 59 files changed, 1093 insertions(+), 207 deletions(-) diff --git a/TPC/AliClusters.cxx b/TPC/AliClusters.cxx index 189a8014741..085f14d14eb 100644 --- a/TPC/AliClusters.cxx +++ b/TPC/AliClusters.cxx @@ -40,16 +40,37 @@ ClassImp(AliClusters) //***************************************************************************** // //_____________________________________________________________________________ -AliClusters::AliClusters() +AliClusters::AliClusters() + :AliSegmentID(), + fClusters(0), + fNclusters(0), + fClass(0) { // //default constructor // - fNclusters=0; - fClusters =0; - fClass =0; -} +} +//________________________________________________________________________ +AliClusters::AliClusters(const AliClusters ¶m) + :AliSegmentID(), + fClusters(0), + fNclusters(0), + fClass(0) +{ + // + // copy constructor - dummy + // + fNclusters = param.fNclusters; +} +AliClusters & AliClusters::operator =(const AliClusters & param) +{ + // + // assignment operator - dummy + // + fNclusters=param.fNclusters; + return (*this); +} //________________________________________________________________________ AliClusters::~AliClusters() { diff --git a/TPC/AliClusters.h b/TPC/AliClusters.h index c3013f1f370..0aef7d40e7e 100644 --- a/TPC/AliClusters.h +++ b/TPC/AliClusters.h @@ -18,7 +18,9 @@ class TObjArray; class AliClusters : public AliSegmentID{ public: - AliClusters(); + AliClusters(); + AliClusters(const AliClusters ¶m); // copy constructor + AliClusters &operator = (const AliClusters & param); ~AliClusters(); virtual TObject* InsertCluster(const TObject* c ); //insert copy of cluster const TObject* operator[](Int_t i); diff --git a/TPC/AliClustersArray.cxx b/TPC/AliClustersArray.cxx index 253834e4814..d17c8071a3d 100644 --- a/TPC/AliClustersArray.cxx +++ b/TPC/AliClustersArray.cxx @@ -39,14 +39,15 @@ ClassImp(AliClustersArray) // -AliClustersArray::AliClustersArray() + AliClustersArray::AliClustersArray():AliSegmentArray(), + fParam(0), + fClFinder(0), + fClusterType(0) { // //Default constructor // - fParam = 0; - fClusterType = 0; - fClFinder = 0; + } Bool_t AliClustersArray::SetClusterType(const char * classname) diff --git a/TPC/AliComplexCluster.cxx b/TPC/AliComplexCluster.cxx index 24a01ca8a22..c3e0e8ed5b1 100644 --- a/TPC/AliComplexCluster.cxx +++ b/TPC/AliComplexCluster.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2004/03/30 14:09:22 kowal2 +Changes due to the coding conventions + Revision 1.7 2003/11/24 09:48:28 kowal2 Changes to obey the coding conventions @@ -61,6 +64,23 @@ New class replacing AliCluster ClassImp(AliComplexCluster) + //__________________________________________________________________ + AliComplexCluster::AliComplexCluster() + :TObject(), + fX(0.), + fY(0.), + fQ(0.), + fSigmaX2(0.), + fSigmaY2(0.), + fSigmaXY(0.), + fArea(0.), + fMax(0.) +{ + // + // default constructor + // + fTracks[0]=fTracks[1]=fTracks[2]=0; +} //_____________________________________________________________________________ Int_t AliComplexCluster::Compare(const TObject * o) const { @@ -85,5 +105,5 @@ ClassImp(AliTPCTrackerPoint) ClassImp(AliTPCTrackPoint) ClassImp(AliTPCTrackPoint2) ClassImp(AliTPCTrackPointRef) - + //_______________________________________________________________ diff --git a/TPC/AliComplexCluster.h b/TPC/AliComplexCluster.h index f062b3e24f4..28e9202208e 100644 --- a/TPC/AliComplexCluster.h +++ b/TPC/AliComplexCluster.h @@ -18,10 +18,7 @@ class AliComplexCluster : public TObject { public: - AliComplexCluster() { - fTracks[0]=fTracks[1]=fTracks[2]=0; - fX=fY=fQ=fSigmaX2=fSigmaY2=fSigmaXY=fArea=fMax=0.; - } + AliComplexCluster(); virtual ~AliComplexCluster() {;} Bool_t IsSortable() const; Int_t Compare(const TObject *o) const; @@ -110,7 +107,14 @@ class AliTPCTrackerPoint { class AliTPCClusterPoint { public: - AliTPCClusterPoint(){fCZ=fCY=fSigmaZ=fSigmaY=fQ=fMax=fCType=0;} + AliTPCClusterPoint(): + fCZ(0), + fCY(0), + fSigmaZ(0), + fSigmaY(0), + fQ(0), + fMax(0), + fCType(0){} virtual ~AliTPCClusterPoint(){} Float_t GetZ() const {return (fCZ*0.01);} Float_t GetY() const {return (fCY*0.01);} @@ -144,7 +148,17 @@ class AliTPCClusterPoint { class AliTPCExactPoint : public TObject{ public: - AliTPCExactPoint(){fEZ=fEY=fEAngleZ=fEAngleY=fEAmp=fEPrim=fTrackID=0;} + AliTPCExactPoint():TObject(), + fEZ(0.), + fEY(0.), + fEX(0.), + fEAngleZ(0.), + fEAngleY(0.), + fEAmp(0.), + fEPrim(0.), + fTrackID(0), + fRow(0), + fSec(0){} private: Float_t fEZ; // current "exact" position according simulation Float_t fEY; // current "exact" position according simulation @@ -162,7 +176,10 @@ class AliTPCExactPoint : public TObject{ class AliTPCTrackPoint: public TObject{ public: - AliTPCTrackPoint(){} + AliTPCTrackPoint():TObject(), + fTPoint(), + fCPoint(){} + // AliTPCClusterPoint & GetCPoint(){return fCPoint;} AliTPCTrackerPoint & GetTPoint(){return fTPoint;} AliTPCclusterMI & GetCPoint(){return fCPoint;} @@ -176,7 +193,20 @@ class AliTPCTrackPoint: public TObject{ class AliTPCTrackPoint2: public AliTPCTrackPoint{ public: - AliTPCTrackPoint2(){} + AliTPCTrackPoint2():AliTPCTrackPoint(), + fGX(0.), + fGY(0.), + fGZ(0.), + fDY(0.), + fDZ(0.), + fDYU(0.), + fDYD(0), + fDZU(0.), + fDZD(0.), + fDDY(0), + fDDZ(0.), + fID(0), + fLab(0){} private: Float_t fGX; //global poition of the point Float_t fGY; //global poition of the point diff --git a/TPC/AliDetectorParam.cxx b/TPC/AliDetectorParam.cxx index a4a66ff93b3..e78ac8d2ba8 100644 --- a/TPC/AliDetectorParam.cxx +++ b/TPC/AliDetectorParam.cxx @@ -26,7 +26,16 @@ #include "AliDetectorParam.h" - +AliDetectorParam::AliDetectorParam() + :TNamed(), + fBField(0.), + fNPrimLoss(0.), + fNTotalLoss(0.) +{ + // + // default constructor + // +} Float_t * AliDetectorParam::GetAnglesAccMomentum(Float_t *x, Int_t * /*index*/, Float_t *momentum, Float_t *angle) { diff --git a/TPC/AliDetectorParam.h b/TPC/AliDetectorParam.h index 577888c76d4..11e61fe35dd 100644 --- a/TPC/AliDetectorParam.h +++ b/TPC/AliDetectorParam.h @@ -12,7 +12,7 @@ #include class AliDetectorParam : public TNamed { public: - AliDetectorParam(){;} + AliDetectorParam(); virtual Int_t GetNSegmentsTotal() const {return 0;} //get total nuber of segments virtual Bool_t Get1DIndex(Int_t */*index*/, const Int_t * /*arrindex*/) {return kFALSE;} //transform multidimensional index to one dimesional diff --git a/TPC/AliDigits.cxx b/TPC/AliDigits.cxx index bcb170a474d..9dc17623a2c 100644 --- a/TPC/AliDigits.cxx +++ b/TPC/AliDigits.cxx @@ -49,21 +49,41 @@ ClassImp(AliDigits) -AliDigits::AliDigits() + AliDigits::AliDigits() + :AliSegmentID(), + fNrows(0), + fNcols(0), + fElements(0), + fIndex(0), + fBufType(0), + fThreshold(0), + fNelems(0), + fCurrentRow(0), + fCurrentCol(0), + fCurrentIndex(0) { // //default constructor - fIndex = 0; - fElements = 0; - fThreshold =0; + // Invalidate(); } -AliDigits::AliDigits(const AliDigits& digits): - AliSegmentID(digits) +AliDigits::AliDigits(const AliDigits& digits) + :AliSegmentID(digits), + fNrows(0), + fNcols(0), + fElements(0), + fIndex(0), + fBufType(0), + fThreshold(0), + fNelems(0), + fCurrentRow(0), + fCurrentCol(0), + fCurrentIndex(0) { // //copy constructor + // fNrows = digits.fNrows; fNcols = digits.fNcols; fElements = new TArrayS(*(digits.fElements)); diff --git a/TPC/AliDigitsArray.cxx b/TPC/AliDigitsArray.cxx index 192b3c384e6..086c1adc754 100644 --- a/TPC/AliDigitsArray.cxx +++ b/TPC/AliDigitsArray.cxx @@ -39,10 +39,32 @@ ClassImp(AliDigitsArray) // AliDigitsArray::AliDigitsArray() + :AliSegmentArray(), + fParam(0) { - fParam = 0; + // + // default constructor + // } - +AliDigitsArray::AliDigitsArray(const AliDigitsArray ¶m) + :AliSegmentArray(), + fParam(0) +{ + // + // dummy + // + fParam = param.fParam; +} +// +AliDigitsArray & AliDigitsArray::operator =(const AliDigitsArray & param) +{ + // + // dummy + // + fParam = param.fParam; + return (*this); +} +// AliDigitsArray::~AliDigitsArray() { // if (fParam != 0) delete fParam; diff --git a/TPC/AliDigitsArray.h b/TPC/AliDigitsArray.h index 44f9100c4fe..d0e69fc5a7d 100644 --- a/TPC/AliDigitsArray.h +++ b/TPC/AliDigitsArray.h @@ -15,6 +15,8 @@ class AliDetectorParam; class AliDigitsArray : public AliSegmentArray { public: AliDigitsArray(); + AliDigitsArray(const AliDigitsArray ¶m); // copy constructor + AliDigitsArray &operator = (const AliDigitsArray & param); virtual ~AliDigitsArray(); virtual Bool_t Setup(AliDetectorParam *param); //setup array according parameters const AliDetectorParam * GetParam() {return fParam;} diff --git a/TPC/AliSegmentArray.cxx b/TPC/AliSegmentArray.cxx index bf1db264695..aff63818b8d 100644 --- a/TPC/AliSegmentArray.cxx +++ b/TPC/AliSegmentArray.cxx @@ -41,21 +41,31 @@ //_____________________________________________________________________________ ClassImp(AliSegmentArray) -AliSegmentArray::AliSegmentArray() + AliSegmentArray::AliSegmentArray() + :TNamed(), + fSegment(0), + fTreeIndex(0), + fNSegment(0), + fTree(0), + fTreeOwner(kFALSE), + fBranch(0), + fClass(0) { // + // constructor // - // - fNSegment=0; - fSegment =0; - fTreeIndex = 0; - fTree = 0; - fClass = 0; - fBranch = 0; - fTreeOwner = kFALSE; + } AliSegmentArray::AliSegmentArray(const char *classname, Int_t n) + :TNamed("SegmentArray","SegmentArray"), + fSegment(0), + fTreeIndex(0), + fNSegment(0), + fTree(0), + fTreeOwner(kFALSE), + fBranch(0), + fClass(0) { // //constructor which @@ -63,14 +73,7 @@ AliSegmentArray::AliSegmentArray(const char *classname, Int_t n) // Create an array of objects of classname. The class must inherit from // AliSegmentID . The second argument adjust number of entries in // the array. - fTreeOwner = kFALSE; - fNSegment=0; - fSegment =0; - fTreeIndex = 0; - fTree = 0; - fClass = 0; - SetName("SegmentArray"); - SetTitle("SegmentArray"); + SetClass(classname); if (MakeArray(n)==kFALSE){ @@ -79,8 +82,16 @@ AliSegmentArray::AliSegmentArray(const char *classname, Int_t n) } } -AliSegmentArray::AliSegmentArray(const AliSegmentArray &segment): - TNamed(segment) +AliSegmentArray::AliSegmentArray(const AliSegmentArray &segment) + :TNamed(segment), + fSegment(0), + fTreeIndex(0), + fNSegment(0), + fTree(0), + fTreeOwner(kFALSE), + fBranch(0), + fClass(0) + { // //copy constructor diff --git a/TPC/AliSegmentID.cxx b/TPC/AliSegmentID.cxx index 9e5a4c14420..c93259b9b09 100644 --- a/TPC/AliSegmentID.cxx +++ b/TPC/AliSegmentID.cxx @@ -25,8 +25,6 @@ #include "AliSegmentID.h" -AliSegmentID::AliSegmentID() -{ -} + ClassImp(AliSegmentID) diff --git a/TPC/AliSegmentID.h b/TPC/AliSegmentID.h index 3da7ee3832f..8fd0ea81198 100644 --- a/TPC/AliSegmentID.h +++ b/TPC/AliSegmentID.h @@ -14,8 +14,8 @@ class AliSegmentID: public TObject{ public: - AliSegmentID(); - AliSegmentID(Int_t index){fSegmentID = index;} + AliSegmentID() : fSegmentID(0) {} + AliSegmentID(Int_t index) : fSegmentID(index) {} Int_t GetID() {return fSegmentID;} void SetID(Int_t index){fSegmentID = index;} protected: diff --git a/TPC/AliSimDigits.cxx b/TPC/AliSimDigits.cxx index 72ac33882b6..6340493a62d 100644 --- a/TPC/AliSimDigits.cxx +++ b/TPC/AliSimDigits.cxx @@ -44,12 +44,30 @@ ClassImp(AliSimDigits) AliSimDigits::AliSimDigits() + :AliDigits(), + fTracks(0), + fTrIndex(0), + fNlevel(0), + fTrBufType(0) { // AliDigits::Invalite(); - fTracks = 0; - fTrIndex = 0; + InvalidateTrack(); } +// +AliSimDigits::AliSimDigits(const AliSimDigits ¶m) + :AliDigits(), + fTracks(0), + fTrIndex(0), + fNlevel(0), + fTrBufType(0) +{ + // + // dummy + // + fTrIndex = param.fTrIndex; +} +// AliSimDigits::~AliSimDigits() { @@ -61,7 +79,16 @@ AliSimDigits::~AliSimDigits() } } +AliSimDigits & AliSimDigits::operator =(const AliSimDigits & param) +{ + // + // assignment operator - dummy + // + fTrIndex=param.fTrIndex; + return (*this); +} +//__________________________________________________________________ void AliSimDigits::InvalidateTrack() { // diff --git a/TPC/AliSimDigits.h b/TPC/AliSimDigits.h index 14b269a87e5..43a10917170 100644 --- a/TPC/AliSimDigits.h +++ b/TPC/AliSimDigits.h @@ -20,6 +20,8 @@ class AliH2F; class AliSimDigits : public AliDigits{ public: AliSimDigits(); + AliSimDigits(const AliSimDigits ¶m); + AliSimDigits &operator = (const AliSimDigits & digits); virtual ~AliSimDigits(); void AllocateTrack(Int_t length); //construct empty buffer fTracks with size rows x column x length (number of tracks for one digit) Int_t *GetTracks(){return fTracks->GetArray();} diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx index fd11f41d0c7..50a64d09984 100644 --- a/TPC/AliTPC.cxx +++ b/TPC/AliTPC.cxx @@ -81,34 +81,53 @@ ClassImp(AliTPC) //_____________________________________________________________________________ -AliTPC::AliTPC() + AliTPC::AliTPC():AliDetector(), + fDefaults(0), + fSens(0), + fNsectors(0), + fDigitsArray(0), + fTPCParam(0), + fTrackHits(0), + fHitType(0), + fDigitsSwitch(0), + fSide(0), + fNoiseDepth(0), + fNoiseTable(0), + fCurrentNoise(0), + fActiveSectors(0) + { // // Default constructor // fIshunt = 0; - fHits = 0; - fDigits = 0; - fNsectors = 0; - fDigitsArray = 0; - fDefaults = 0; - fTrackHits = 0; + // fTrackHitsOld = 0; #if ROOT_VERSION_CODE >= ROOT_VERSION(4,0,1) fHitType = 4; // ROOT containers #else fHitType = 2; //default CONTAINERS - based on ROOT structure #endif - fTPCParam = 0; - fNoiseTable = 0; - fActiveSectors =0; - fSens = 0; + } //_____________________________________________________________________________ AliTPC::AliTPC(const char *name, const char *title) - : AliDetector(name,title) + : AliDetector(name,title), + fDefaults(0), + fSens(0), + fNsectors(0), + fDigitsArray(0), + fTPCParam(0), + fTrackHits(0), + fHitType(0), + fDigitsSwitch(0), + fSide(0), + fNoiseDepth(0), + fNoiseTable(0), + fCurrentNoise(0), + fActiveSectors(0) { // // Standard constructor @@ -118,8 +137,6 @@ AliTPC::AliTPC(const char *name, const char *title) // Initialise arrays of hits and digits fHits = new TClonesArray("AliTPChit", 176); gAlice->GetMCApp()->AddHitList(fHits); - fDigitsArray = 0; - fDefaults = 0; // fTrackHits = new AliTPCTrackHitsV2; fTrackHits->SetHitPrecision(0.002); @@ -131,17 +148,14 @@ AliTPC::AliTPC(const char *name, const char *title) //fTrackHitsOld->SetStepPrecision(0.003); //fTrackHitsOld->SetMaxDistance(100); - fNoiseTable =0; #if ROOT_VERSION_CODE >= ROOT_VERSION(4,0,1) fHitType = 4; // ROOT containers #else fHitType = 2; #endif - fActiveSectors = 0; - // - // Initialise counters - fNsectors = 0; + + // fIshunt = 0; @@ -160,16 +174,41 @@ AliTPC::AliTPC(const char *name, const char *title) AliWarning("In Config.C you must set non-default parameters."); fTPCParam=0; } - fSens = 0; + } //_____________________________________________________________________________ -AliTPC::AliTPC(const AliTPC& t):AliDetector(t){ +AliTPC::AliTPC(const AliTPC& t):AliDetector(t), + fDefaults(0), + fSens(0), + fNsectors(0), + fDigitsArray(0), + fTPCParam(0), + fTrackHits(0), + fHitType(0), + fDigitsSwitch(0), + fSide(0), + fNoiseDepth(0), + fNoiseTable(0), + fCurrentNoise(0), + fActiveSectors(0) +{ // // dummy copy constructor // } +// +AliTPC & AliTPC::operator =(const AliTPC & param) +{ + // + // assignment operator - dummy + // + fDefaults=param.fDefaults; + return (*this); +} + +// AliTPC::~AliTPC() { // @@ -2052,10 +2091,26 @@ void AliTPC::TransportElectron(Float_t *xyz, Int_t *index) } ClassImp(AliTPChit) - + //______________________________________________________________________ + AliTPChit::AliTPChit() + :AliHit(), + fSector(0), + fPadRow(0), + fQ(0), + fTime(0) +{ + // + // default + // + +} //_____________________________________________________________________________ -AliTPChit::AliTPChit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits): -AliHit(shunt,track) +AliTPChit::AliTPChit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits) + :AliHit(shunt,track), + fSector(0), + fPadRow(0), + fQ(0), + fTime(0) { // // Creates a TPC hit object diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h index cfb1dcdf18d..ae46b868543 100644 --- a/TPC/AliTPC.h +++ b/TPC/AliTPC.h @@ -31,6 +31,7 @@ public: AliTPC(); AliTPC(const char *name, const char *title); AliTPC(const AliTPC& t); + AliTPC &operator = (const AliTPC & param); virtual AliLoader* MakeLoader(const char* topfoldername); @@ -149,7 +150,7 @@ public: Float_t fTime; //hit time public: - AliTPChit() {fTime = 0.;} + AliTPChit(); AliTPChit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits); virtual ~AliTPChit() {} void SetX(Float_t x){fX = x;} diff --git a/TPC/AliTPCBuffer.cxx b/TPC/AliTPCBuffer.cxx index 247c9d0a410..2c459b6a9f6 100644 --- a/TPC/AliTPCBuffer.cxx +++ b/TPC/AliTPCBuffer.cxx @@ -30,7 +30,22 @@ ClassImp(AliTPCBuffer) ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -AliTPCBuffer::AliTPCBuffer(const char* fileName){ +//___________________________________________________________ + AliTPCBuffer::AliTPCBuffer():TObject(), + fVerbose(0), + fNumberOfDigits(0), + f() +{ + // + // default + // +} +//____________________________________________________________ + AliTPCBuffer::AliTPCBuffer(const char* fileName):TObject(), + fVerbose(0), + fNumberOfDigits(0), + f() +{ // Constructor #ifndef __DECCXX f.open(fileName,ios::binary|ios::out); @@ -39,8 +54,7 @@ AliTPCBuffer::AliTPCBuffer(const char* fileName){ #endif // fout=new TFile(fileName,"recreate"); // tree=new TTree("tree","Values"); - fNumberOfDigits=0; - fVerbose=0; + remove("TPCdigits.txt"); } @@ -52,7 +66,11 @@ AliTPCBuffer::~AliTPCBuffer(){ //delete fout; } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// -AliTPCBuffer::AliTPCBuffer(const AliTPCBuffer &source):TObject(source){ +AliTPCBuffer::AliTPCBuffer(const AliTPCBuffer &source):TObject(source), + fVerbose(0), + fNumberOfDigits(0), + f() +{ // Copy Constructor this->fVerbose=source.fVerbose; return; diff --git a/TPC/AliTPCBuffer.h b/TPC/AliTPCBuffer.h index 8bd8ff78a24..bd110ad0eb8 100644 --- a/TPC/AliTPCBuffer.h +++ b/TPC/AliTPCBuffer.h @@ -19,9 +19,9 @@ class AliSimDigits; //class TFile; class AliTPCBuffer:public TObject{ public: - AliTPCBuffer(){ - //default constructor - } + AliTPCBuffer(); + + // AliTPCBuffer(const char* fileName);//constructor virtual ~AliTPCBuffer();//destructor AliTPCBuffer(const AliTPCBuffer &source); // copy constructor @@ -32,10 +32,11 @@ public: void SetVerbose(Int_t val){fVerbose=val;} private: Int_t fVerbose; //Verbosity level: 0-silent, 1:cout msg, 2: txt files for checking - fstream f; //The IO file name + //TFile *fout; //TTree *tree; UInt_t fNumberOfDigits; //Number of TPC digits + fstream f; //The IO file name ClassDef(AliTPCBuffer,1) }; diff --git a/TPC/AliTPCCalROC.cxx b/TPC/AliTPCCalROC.cxx index 5e53a06e020..81d43923963 100644 --- a/TPC/AliTPCCalROC.cxx +++ b/TPC/AliTPCCalROC.cxx @@ -31,19 +31,28 @@ ClassImp(AliTPCCalROC) //_____________________________________________________________________________ -AliTPCCalROC::AliTPCCalROC():TObject() +AliTPCCalROC::AliTPCCalROC() + :TObject(), + fSector(0), + fNChannels(0), + fNRows(0), + fIndexes(0), + fData(0) { // // Default constructor // - fSector = 0; - fNChannels = 0; - fNRows = 0; - fData = 0; + } //_____________________________________________________________________________ -AliTPCCalROC::AliTPCCalROC(UInt_t sector):TObject() +AliTPCCalROC::AliTPCCalROC(UInt_t sector) + :TObject(), + fSector(0), + fNChannels(0), + fNRows(0), + fIndexes(0), + fData(0) { // // Constructor that initializes a given sector @@ -57,7 +66,13 @@ AliTPCCalROC::AliTPCCalROC(UInt_t sector):TObject() } //_____________________________________________________________________________ -AliTPCCalROC::AliTPCCalROC(const AliTPCCalROC &c):TObject(c) +AliTPCCalROC::AliTPCCalROC(const AliTPCCalROC &c) + :TObject(c), + fSector(0), + fNChannels(0), + fNRows(0), + fIndexes(0), + fData(0) { // // AliTPCCalROC copy constructor @@ -70,6 +85,16 @@ AliTPCCalROC::AliTPCCalROC(const AliTPCCalROC &c):TObject(c) fData = new Float_t[fNChannels]; for (UInt_t idata = 0; idata< fNChannels; idata++) fData[idata] = c.fData[idata]; } +//____________________________________________________________________________ +AliTPCCalROC & AliTPCCalROC::operator =(const AliTPCCalROC & param) +{ + // + // assignment operator - dummy + // + fData=param.fData; + return (*this); +} + //_____________________________________________________________________________ AliTPCCalROC::~AliTPCCalROC() diff --git a/TPC/AliTPCCalROC.h b/TPC/AliTPCCalROC.h index 12e35d57a0a..2f38dcd69bf 100644 --- a/TPC/AliTPCCalROC.h +++ b/TPC/AliTPCCalROC.h @@ -22,6 +22,7 @@ class AliTPCCalROC : public TObject { AliTPCCalROC(); AliTPCCalROC(UInt_t sector); AliTPCCalROC(const AliTPCCalROC &c); + AliTPCCalROC &operator = (const AliTPCCalROC & param); virtual ~AliTPCCalROC(); UInt_t GetNrows() const { return fNRows;}; UInt_t GetNchannels() const { return fNChannels;}; diff --git a/TPC/AliTPCDDLRawData.cxx b/TPC/AliTPCDDLRawData.cxx index 5bb95a42ee3..a248730965f 100644 --- a/TPC/AliTPCDDLRawData.cxx +++ b/TPC/AliTPCDDLRawData.cxx @@ -37,7 +37,8 @@ ClassImp(AliTPCDDLRawData) //////////////////////////////////////////////////////////////////////////////////////// AliTPCDDLRawData::AliTPCDDLRawData(const AliTPCDDLRawData &source): - TObject(source) + TObject(source), + fVerbose(0) { // Copy Constructor fVerbose=source.fVerbose; diff --git a/TPC/AliTPCDDLRawData.h b/TPC/AliTPCDDLRawData.h index d2bcf6fefd3..b8a294ef2f5 100644 --- a/TPC/AliTPCDDLRawData.h +++ b/TPC/AliTPCDDLRawData.h @@ -11,7 +11,8 @@ class AliTPCDDLRawData:public TObject{ public: - AliTPCDDLRawData(){fVerbose=0;}//default constructor + AliTPCDDLRawData():TObject(), + fVerbose(0){}//default constructor virtual ~AliTPCDDLRawData(){;}//destructor AliTPCDDLRawData(const AliTPCDDLRawData &source); // copy constructor AliTPCDDLRawData& operator=(const AliTPCDDLRawData &source); // ass. op. diff --git a/TPC/AliTPCDigitizer.cxx b/TPC/AliTPCDigitizer.cxx index fb7e1bb206e..da806e16859 100644 --- a/TPC/AliTPCDigitizer.cxx +++ b/TPC/AliTPCDigitizer.cxx @@ -40,18 +40,21 @@ ClassImp(AliTPCDigitizer) //___________________________________________ -AliTPCDigitizer::AliTPCDigitizer() :AliDigitizer() + AliTPCDigitizer::AliTPCDigitizer() :AliDigitizer(),fDebug(0) { + // // Default ctor - don't use it - fDebug =0; +// + } //___________________________________________ AliTPCDigitizer::AliTPCDigitizer(AliRunDigitizer* manager) - :AliDigitizer(manager) + :AliDigitizer(manager),fDebug(0) { + // // ctor which should be used - fDebug =0; +// AliDebug(2,"(AliRunDigitizer* manager) was processed"); } diff --git a/TPC/AliTPCDigitsArray.cxx b/TPC/AliTPCDigitsArray.cxx index 65b8b758ef5..88513d455ad 100644 --- a/TPC/AliTPCDigitsArray.cxx +++ b/TPC/AliTPCDigitsArray.cxx @@ -44,6 +44,10 @@ ClassImp(AliTPCDigitsArray) AliTPCDigitsArray::AliTPCDigitsArray(Bool_t sim) + :AliDigitsArray(), + fBSim(kFALSE), + fCompression(0), + fTrackLevel(0) { // //default constructor diff --git a/TPC/AliTPCFast.cxx b/TPC/AliTPCFast.cxx index 96801e807c0..09ee1679667 100644 --- a/TPC/AliTPCFast.cxx +++ b/TPC/AliTPCFast.cxx @@ -37,7 +37,24 @@ #include "AliLog.h" ClassImp(AliTPCFast) + //____________________________________________________________________ +AliTPCFast::AliTPCFast(const AliTPCFast ¶m) + :TObject(param),fParam(0) +{ + // + // copy constructor - dummy + // + fParam = param.fParam; +} +AliTPCFast & AliTPCFast::operator =(const AliTPCFast & param) +{ + // + // assignment operator - dummy + // + fParam=param.fParam; + return (*this); +} //_____________________________________________________________________________ void AliTPCFast::Hits2Clusters(AliRunLoader* runLoader) const diff --git a/TPC/AliTPCFast.h b/TPC/AliTPCFast.h index 82a56b194b2..b20dfbd90aa 100644 --- a/TPC/AliTPCFast.h +++ b/TPC/AliTPCFast.h @@ -19,6 +19,9 @@ class AliTPCParam; class AliTPCFast : public TObject { public: + AliTPCFast():TObject(),fParam(0){} + AliTPCFast(const AliTPCFast ¶m); // copy constructor + AliTPCFast &operator = (const AliTPCFast & param); //assignment void Hits2Clusters(AliRunLoader* runLoader) const; void Hits2ExactClusters(AliRunLoader* runLoader) const; void Hits2ExactClustersSector(AliRunLoader* runLoader, diff --git a/TPC/AliTPCPRF2D.cxx b/TPC/AliTPCPRF2D.cxx index 81cee46219d..929faeebec3 100644 --- a/TPC/AliTPCPRF2D.cxx +++ b/TPC/AliTPCPRF2D.cxx @@ -96,23 +96,45 @@ static Double_t funGati2D(Double_t *x, Double_t * par) ClassImp(AliTPCPRF2D) AliTPCPRF2D::AliTPCPRF2D() + :TObject(), + fcharge(0), + fY1(0.), + fY2(0.), + fNYdiv(0), + fNChargeArray(0), + fChargeArray(0), + fHeightFull(0.), + fHeightS(0.), + fShiftY(0.), + fWidth(0.), + fK(0.), + fNPRF(0), + fNdiv(5), + fDStep(0.), + fKNorm(1.), + fInteg(0.), + fGRF(0), + fK3X(0.), + fK3Y(0.), + fPadDistance(0.), + fOrigSigmaX(0.), + fOrigSigmaY(0.), + fChargeAngle(0.), + fPadAngle(0.), + fSigmaX(0.), + fSigmaY(0.), + fMeanX(0.), + fMeanY(0.), + fInterX(0), + fInterY(0), + fCurrentY(0.), + fDYtoWire(0.), + fDStepM1(0.) { //default constructor for response function object - fcharge = 0; - fNChargeArray = 0; - fChargeArray = 0; + fNPRF =fgkNPRF ; - fSigmaX = 0; - fSigmaY = 0; - fGRF = 0; - fKNorm = 1; - fOrigSigmaY=0; - fOrigSigmaX=0; - fNdiv = 5; - //set daault angels - fChargeAngle = 0; - fPadAngle = 0; //chewron default values SetPad(0.8,0.8); SetChevron(0.2,0.0,1.0); diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx index fd82bd4dad2..cedd07c377a 100644 --- a/TPC/AliTPCParam.cxx +++ b/TPC/AliTPCParam.cxx @@ -41,15 +41,94 @@ ClassImp(AliTPCParam) //___________________________________________ AliTPCParam::AliTPCParam() + :AliDetectorParam(), + fbStatus(kFALSE), + fInnerRadiusLow(0.), + fInnerRadiusUp(0.), + fOuterRadiusUp(0.), + fOuterRadiusLow(0.), + fInnerAngle(0.), + fInnerAngleShift(0.), + fOuterAngle(0.), + fOuterAngleShift(0.), + fInnerFrameSpace(0.), + fOuterFrameSpace(0.), + fInnerWireMount(0.), + fOuterWireMount(0.), + fNInnerSector(0), + fNOuterSector(0), + fNSector(0), + fZLength(0), + fRotAngle(), + fGeometryType(0), + fTrackingMatrix(0), + fClusterMatrix(0), + fGlobalMatrix(0), + fNInnerWiresPerPad(0), + fInnerWWPitch(0), + fInnerDummyWire(0), + fInnerOffWire(0.), + fRInnerFirstWire(0.), + fRInnerLastWire(0.), + fLastWireUp1(0.), + fNOuter1WiresPerPad(0), + fNOuter2WiresPerPad(0), + fOuterWWPitch(0.), + fOuterDummyWire(0), + fOuterOffWire(0.), + fROuterFirstWire(0.), + fROuterLastWire(0.), + fInnerPadPitchLength(0.), + fInnerPadPitchWidth(0.), + fInnerPadLength(0.), + fInnerPadWidth(0.), + fOuter1PadPitchLength(0.), + fOuter2PadPitchLength(0.), + fOuterPadPitchWidth(0.), + fOuter1PadLength(0.), + fOuter2PadLength(0.), + fOuterPadWidth(0.), + fBMWPCReadout(kFALSE), + fNCrossRows(0), + fNRowLow(0), + fNRowUp1(0), + fNRowUp2(0), + fNRowUp(0), + fNtRows(0), + fDiffT(0.), + fDiffL(0.), + fGasGain(0.), + fDriftV(0.), + fOmegaTau(0.), + fAttCoef(0.), + fOxyCont(0.), + fPadCoupling(0.), + fZeroSup(0), + fNoise(0.), + fChipGain(0.), + fChipNorm(0.), + fTSample(0.), + fZWidth(0.), + fTSigma(0.), + fMaxTBin(0), + fADCSat(0), + fADCDynRange(0.), + fTotalNormFac(0.), + fNoiseNormFac(0.), + fNResponseMax(0), + fResponseThreshold(0.), + fCurrentMax(0), + fResponseBin(0), + fResponseWeight(0), + fGateDelay(0.), + fL1Delay(0.), + fNTBinsBeforeL1(0), + fNTBinsL1(0.) { // //constructor sets the default parameters // - fResponseBin = 0; - fResponseWeight = 0; - fRotAngle = 0; - fTrackingMatrix = fClusterMatrix = fGlobalMatrix = 0; SetTitle("75x40_100x60_150x60"); SetDefault(); } diff --git a/TPC/AliTPCParamCR.cxx b/TPC/AliTPCParamCR.cxx index 28b1079eece..42a4cb284cd 100644 --- a/TPC/AliTPCParamCR.cxx +++ b/TPC/AliTPCParamCR.cxx @@ -42,18 +42,41 @@ static const Int_t kMaxRows=600; static const Float_t kEdgeSectorSpace = 2.5; AliTPCParamCR::AliTPCParamCR() + :AliTPCParam(), + fInnerPRF(0), + fOuter1PRF(0), + fOuter2PRF(0), + fTimeRF(0), + fFacSigma(0.) { // //constructor set the default parameters - fInnerPRF=0; - fOuter1PRF=0; - fOuter2PRF=0; - fTimeRF = 0; + fFacSigma = Float_t(2.); SetDefault(); Update(); } - +AliTPCParamCR::AliTPCParamCR(const AliTPCParamCR ¶m) + :AliTPCParam(), + fInnerPRF(0), + fOuter1PRF(0), + fOuter2PRF(0), + fTimeRF(0), + fFacSigma(0.) +{ + // + // copy constructor - dummy + // + fFacSigma= param.fFacSigma; +} +AliTPCParamCR & AliTPCParamCR::operator =(const AliTPCParamCR & param) +{ + // + // assignment operator - dummy + // + fFacSigma= param.fFacSigma; + return (*this); +} AliTPCParamCR::~AliTPCParamCR() { // diff --git a/TPC/AliTPCParamCR.h b/TPC/AliTPCParamCR.h index f6deb3e0442..bc0ced46369 100644 --- a/TPC/AliTPCParamCR.h +++ b/TPC/AliTPCParamCR.h @@ -16,6 +16,8 @@ class AliTPCPRF2D; class AliTPCParamCR : public AliTPCParam { public: AliTPCParamCR(); + AliTPCParamCR(const AliTPCParamCR ¶m); // copy constructor + AliTPCParamCR &operator = (const AliTPCParamCR & param); //assignment operator virtual ~AliTPCParamCR(); Int_t CalcResponse(Float_t* x, Int_t * index, Int_t dummy=0); //calculate bin response as function of the input position -x diff --git a/TPC/AliTPCParamSR.cxx b/TPC/AliTPCParamSR.cxx index f3c35f87d32..77ad0cfda79 100644 --- a/TPC/AliTPCParamSR.cxx +++ b/TPC/AliTPCParamSR.cxx @@ -46,19 +46,48 @@ static const Float_t kFacSigmaTime=3.; AliTPCParamSR::AliTPCParamSR() + :AliTPCParam(), + fInnerPRF(0), + fOuter1PRF(0), + fOuter2PRF(0), + fTimeRF(0), + fFacSigmaPadRow(0), + fFacSigmaPad(0), + fFacSigmaTime(0) { // //constructor set the default parameters - fInnerPRF=0; - fOuter1PRF=0; - fOuter2PRF=0; - fTimeRF = 0; + // + fFacSigmaPadRow = Float_t(kFacSigmaPadRow); fFacSigmaPad = Float_t(kFacSigmaPad); fFacSigmaTime = Float_t(kFacSigmaTime); SetDefault(); Update(); } +AliTPCParamSR::AliTPCParamSR(const AliTPCParamSR ¶m) + :AliTPCParam(), + fInnerPRF(0), + fOuter1PRF(0), + fOuter2PRF(0), + fTimeRF(0), + fFacSigmaPadRow(0), + fFacSigmaPad(0), + fFacSigmaTime(0) +{ + // + // copy constructor - dummy + // + fFacSigmaPadRow = param.fFacSigmaPadRow; +} +AliTPCParamSR & AliTPCParamSR::operator =(const AliTPCParamSR & param) +{ + // + // assignment operator - dummy + // + fZLength=param.fZLength; + return (*this); +} AliTPCParamSR::~AliTPCParamSR() { diff --git a/TPC/AliTPCParamSR.h b/TPC/AliTPCParamSR.h index 8dac3fcc5b0..a914eb32d69 100644 --- a/TPC/AliTPCParamSR.h +++ b/TPC/AliTPCParamSR.h @@ -16,6 +16,8 @@ class AliTPCPRF2D; class AliTPCParamSR : public AliTPCParam { public: AliTPCParamSR(); + AliTPCParamSR(const AliTPCParamSR ¶m); // copy constructor + AliTPCParamSR &operator = (const AliTPCParamSR & param); //assignment operator virtual ~AliTPCParamSR(); Int_t CalcResponse(Float_t* x, Int_t * index, Int_t row); diff --git a/TPC/AliTPCPid.cxx b/TPC/AliTPCPid.cxx index e588c06e38f..5cb6ff7bbf6 100644 --- a/TPC/AliTPCPid.cxx +++ b/TPC/AliTPCPid.cxx @@ -30,8 +30,26 @@ ClassImp(AliTPCPid) // pid class by B. Batyunya // stupid corrections by M.K. // +//_______________________________________________________ //________________________________________________________ - AliTPCPid::AliTPCPid( const AliTPCPid& r):TObject(r) +AliTPCPid::AliTPCPid( const AliTPCPid& r):TObject(r), + fCutKa(0), + fCutPr(0), + fCutKaTune(0.), + fCutPrTune(0.), + fSigmin(0.), + fSilent(0), + fmxtrs(0), + trs(0), + fqtot(0.), + fWpi(0.), + fWk(0.), + fWp(0.), + fRpik(0.), + fRppi(0.), + fRpka(0.), + fRp(0.), + fPcode(0) { // dummy copy constructor } @@ -46,6 +64,15 @@ Float_t AliTPCPid::Qcorr(Float_t xc) if(fcorr<=0.1)fcorr=0.1; return fqtot/fcorr; } +//__________________________________________________________ +AliTPCPid & AliTPCPid::operator =(const AliTPCPid & param) +{ + // + // assignment operator - dummy + // + fSigmin=param.fSigmin; + return (*this); +} //----------------------------------------------------------- Float_t AliTPCPid::Qtrm(Int_t track) const { @@ -435,12 +462,29 @@ void AliTPCPid::Reset(void) } } //----------------------------------------------------------- -AliTPCPid::AliTPCPid(Int_t ntrack) +AliTPCPid::AliTPCPid(Int_t ntrack):TObject(), + fCutKa(0), + fCutPr(0), + fCutKaTune(0.), + fCutPrTune(0.), + fSigmin(0.), + fSilent(0), + fmxtrs(0), + trs(0), + fqtot(0.), + fWpi(0.), + fWk(0.), + fWp(0.), + fRpik(0.), + fRppi(0.), + fRpka(0.), + fRp(0.), + fPcode(0) { trs = new TClonesArray("TVector",ntrack); TClonesArray &arr=*trs; for(Int_t i=0;i0) fDSTEPM1=1./step; else fDSTEPM1 = 1./fgRFDSTEP; - fSigma = 0; - fGRF = 0; - fkNorm = 0.5; - fpadWidth = 3.5; - forigsigma=0.; - fOffset = 0.; } -AliTPCRF1D::AliTPCRF1D(const AliTPCRF1D &prf):TObject(prf) +AliTPCRF1D::AliTPCRF1D(const AliTPCRF1D &prf) + :TObject(prf), + fNRF(0), + fDSTEPM1(0.), + fcharge(0), + forigsigma(0.), + fpadWidth(3.5), + fkNorm(0.5), + fInteg(0.), + fGRF(0), + fSigma(0.), + fOffset(0.), + fDirect(kFALSE), + fPadDistance(0.) { // diff --git a/TPC/AliTPCROC.cxx b/TPC/AliTPCROC.cxx index 1b8c39db4a6..c4bb00ecfa4 100644 --- a/TPC/AliTPCROC.cxx +++ b/TPC/AliTPCROC.cxx @@ -203,7 +203,49 @@ void AliTPCROC::SetGeometry() //_____________________________________________________________________________ -AliTPCROC::AliTPCROC():TObject(), fNSectorsAll(0) +AliTPCROC::AliTPCROC() + :TObject(), + fNSectorsAll(0), + fInnerRadiusLow(0.), + fInnerRadiusUp(0.), + fOuterRadiusUp(0.), + fOuterRadiusLow(0.), + fInnerFrameSpace(0.), + fOuterFrameSpace(0.), + fInnerWireMount(0.), + fOuterWireMount(0.), + fZLength(0.), + fInnerAngle(0.), + fOuterAngle(0.), + fNInnerWiresPerPad(0), + fInnerWWPitch(0.), + fInnerDummyWire(0), + fInnerOffWire(0.), + fRInnerFirstWire(0.), + fRInnerLastWire(0.), + fLastWireUp1(0.), + fNOuter1WiresPerPad(0), + fNOuter2WiresPerPad(0), + fOuterWWPitch(0.), + fOuterDummyWire(0), + fOuterOffWire(0), + fROuterFirstWire(0.), + fROuterLastWire(0), + fInnerPadPitchLength(0.), + fInnerPadPitchWidth(0.), + fInnerPadLength(0.), + fInnerPadWidth(0.), + fOuter1PadPitchLength(0.), + fOuter2PadPitchLength(0), + fOuterPadPitchWidth(0), + fOuter1PadLength(0.), + fOuter2PadLength(0), + fOuterPadWidth(0), + fNRowLow(0), + fNRowUp1(0), + fNRowUp2(0), + fNRowUp(0), + fNtRows(0) { // // Default constructor @@ -218,7 +260,50 @@ AliTPCROC::AliTPCROC():TObject(), fNSectorsAll(0) //_____________________________________________________________________________ -AliTPCROC::AliTPCROC(const AliTPCROC &roc):TObject(roc) +AliTPCROC::AliTPCROC(const AliTPCROC &roc) + :TObject(roc), + fNSectorsAll(0), + fInnerRadiusLow(0.), + fInnerRadiusUp(0.), + fOuterRadiusUp(0.), + fOuterRadiusLow(0.), + fInnerFrameSpace(0.), + fOuterFrameSpace(0.), + fInnerWireMount(0.), + fOuterWireMount(0.), + fZLength(0.), + fInnerAngle(0.), + fOuterAngle(0.), + fNInnerWiresPerPad(0), + fInnerWWPitch(0.), + fInnerDummyWire(0), + fInnerOffWire(0.), + fRInnerFirstWire(0.), + fRInnerLastWire(0.), + fLastWireUp1(0.), + fNOuter1WiresPerPad(0), + fNOuter2WiresPerPad(0), + fOuterWWPitch(0.), + fOuterDummyWire(0), + fOuterOffWire(0), + fROuterFirstWire(0.), + fROuterLastWire(0), + fInnerPadPitchLength(0.), + fInnerPadPitchWidth(0.), + fInnerPadLength(0.), + fInnerPadWidth(0.), + fOuter1PadPitchLength(0.), + fOuter2PadPitchLength(0), + fOuterPadPitchWidth(0), + fOuter1PadLength(0.), + fOuter2PadLength(0), + fOuterPadWidth(0), + fNRowLow(0), + fNRowUp1(0), + fNRowUp2(0), + fNRowUp(0), + fNtRows(0) + { // // AliTPCROC copy constructor @@ -249,7 +334,15 @@ AliTPCROC::AliTPCROC(const AliTPCROC &roc):TObject(roc) fRowPosIndex[1][irow] = roc.fRowPosIndex[1][irow]; } } - +//____________________________________________________________________________ +AliTPCROC & AliTPCROC::operator =(const AliTPCROC & roc) +{ + // + // assignment operator - dummy + // + fZLength = roc.fZLength; + return (*this); +} //_____________________________________________________________________________ AliTPCROC::~AliTPCROC() { diff --git a/TPC/AliTPCROC.h b/TPC/AliTPCROC.h index 921930754a7..231dfb53ede 100644 --- a/TPC/AliTPCROC.h +++ b/TPC/AliTPCROC.h @@ -19,6 +19,7 @@ class AliTPCROC : public TObject { static AliTPCROC* Instance(); AliTPCROC(); AliTPCROC(const AliTPCROC &roc); + AliTPCROC &operator = (const AliTPCROC & roc); //assignment operator void Init(); virtual ~AliTPCROC(); diff --git a/TPC/AliTPCTrackHitsV2.cxx b/TPC/AliTPCTrackHitsV2.cxx index 6639834d930..6d3f95af905 100644 --- a/TPC/AliTPCTrackHitsV2.cxx +++ b/TPC/AliTPCTrackHitsV2.cxx @@ -130,6 +130,20 @@ protected: AliTPCTempHitInfoV2::AliTPCTempHitInfoV2() + :fSumDr(0.), + fSumDr2(0.), + fSumDr3(0.), + fSumDr4(0.), + fSumDFi(0.), + fSumDFiDr(0.), + fSumDFiDr2(0.), + fSumDZ(0.), + fSumDZDr(0.), + fSumDZDr2(0.), + fOldR(0.), + fStackIndex(0), + fParamIndex(0), + fParam(0) { // // Standard constructor @@ -290,17 +304,26 @@ void AliTPCTempHitInfoV2::Fit(AliTrackHitsParamV2 * param) } -AliTrackHitsParamV2::AliTrackHitsParamV2() +AliTrackHitsParamV2::AliTrackHitsParamV2():TObject(), + fTrackID(0), + fVolumeID(0), + fR(0.), + fZ(0.), + fFi(0.), + fAn(0.), + fAd(0.), + fTheta(0.), + fThetaD(0.), + fNHits(0), + fHitDistance(0), + fCharge(0), + fTime(0) { // // default constructor // fgCounter1++; fgCounter2++; - fHitDistance=0; - fCharge=0; - fTime=0; - fNHits=0; } AliTrackHitsParamV2::~AliTrackHitsParamV2() @@ -332,7 +355,17 @@ Float_t AliTrackHitsParamV2::Eta() const } -AliTPCTrackHitsV2::AliTPCTrackHitsV2() +AliTPCTrackHitsV2::AliTPCTrackHitsV2():TObject(), + fArray(0), + fSize(0), + fPrecision(0.), + fStep(0.), + fMaxDistance(0), + fNVolumes(0), + fVolumes(0), + fTempInfo(0), + fCurrentHit(0), + fHit(0) { // //default constructor @@ -344,16 +377,12 @@ AliTPCTrackHitsV2::AliTPCTrackHitsV2() fPrecision=kHitPrecision; //precision in cm fStep = kStep; //step size fMaxDistance = kMaxDistance; //maximum distance - fTempInfo =0; - fSize=0; + //fTrackHitsInfo = new AliObjectArray("AliTrackHitsInfo"); //fTrackHitsParam = new AliObjectArray("AliTrackHitsParamV2"); //fHitsPosAndQ = new TArrayOfArrayVStack("AliHitInfo"); fArray = new TClonesArray("AliTrackHitsParamV2"); fCurrentHit = new AliTPCCurrentHitV2; - fVolumes =0; - fNVolumes =0; - fHit =0; fgCounter1++; fgCounter2++; diff --git a/TPC/AliTPCTrackHitsV2.h b/TPC/AliTPCTrackHitsV2.h index 225bb19c3f6..d3853d11592 100644 --- a/TPC/AliTPCTrackHitsV2.h +++ b/TPC/AliTPCTrackHitsV2.h @@ -19,9 +19,24 @@ class AliHit; class AliTrackHitsParamV2 : public TObject { + public: AliTrackHitsParamV2(); - AliTrackHitsParamV2(const AliTrackHitsParamV2 &hit): TObject(hit) + + AliTrackHitsParamV2(const AliTrackHitsParamV2 &hit): TObject(hit), + fTrackID(0), + fVolumeID(0), + fR(0.), + fZ(0.), + fFi(0.), + fAn(0.), + fAd(0.), + fTheta(0.), + fThetaD(0.), + fNHits(0), + fHitDistance(0), + fCharge(0), + fTime(0) {hit.Copy(*this);} AliTrackHitsParamV2& operator = (const AliTrackHitsParamV2 &hit) {hit.Copy(*this); return (*this);} @@ -113,9 +128,19 @@ public: class AliTPCTrackHitsV2 : public TObject { public: - AliTPCTrackHitsV2(); + AliTPCTrackHitsV2(); ~AliTPCTrackHitsV2(); - AliTPCTrackHitsV2(const AliTPCTrackHitsV2 &hit): TObject(hit) + AliTPCTrackHitsV2(const AliTPCTrackHitsV2 &hit): TObject(hit), + fArray(0), + fSize(0), + fPrecision(0.), + fStep(0.), + fMaxDistance(0), + fNVolumes(0), + fVolumes(0), + fTempInfo(0), + fCurrentHit(0), + fHit(0) {hit.Copy(*this);} AliTPCTrackHitsV2& operator = (const AliTPCTrackHitsV2 &hit) {hit.Copy(*this); return (*this);} diff --git a/TPC/AliTPCcalibDB.h b/TPC/AliTPCcalibDB.h index 72da2c28099..25fa91ac4c3 100644 --- a/TPC/AliTPCcalibDB.h +++ b/TPC/AliTPCcalibDB.h @@ -21,6 +21,8 @@ class AliTPCcalibDB : public TObject public: static AliTPCcalibDB* Instance(); AliTPCcalibDB(); + AliTPCcalibDB(const AliTPCcalibDB ¶m); // copy constructor + AliTPCcalibDB &operator = (const AliTPCcalibDB & param); virtual ~AliTPCcalibDB(); static void Terminate(); void SetRun(Long64_t run); diff --git a/TPC/AliTPCcluster.cxx b/TPC/AliTPCcluster.cxx index 69296d07575..4d9a3253b60 100644 --- a/TPC/AliTPCcluster.cxx +++ b/TPC/AliTPCcluster.cxx @@ -24,7 +24,17 @@ #include "AliTPCcluster.h" ClassImp(AliTPCcluster) - +// +AliTPCcluster:: AliTPCcluster(Int_t *lab, Float_t *hit) + :AliCluster(lab,hit), + fQ(0.) +{ + // + // constructor + // + fQ=hit[4]; +} + //____________________________________________________________________________ Double_t AliTPCcluster::SigmaY2(Double_t r, Double_t tgl, Double_t pt) { diff --git a/TPC/AliTPCcluster.h b/TPC/AliTPCcluster.h index 2b83bfece3b..f3bfaaf0dcf 100644 --- a/TPC/AliTPCcluster.h +++ b/TPC/AliTPCcluster.h @@ -17,8 +17,8 @@ //_____________________________________________________________________________ class AliTPCcluster : public AliCluster { public: - AliTPCcluster():AliCluster(){fQ=0;} - AliTPCcluster(Int_t *lab, Float_t *hit) : AliCluster(lab,hit) {fQ = hit[4];} + AliTPCcluster():AliCluster(),fQ(0){} + AliTPCcluster(Int_t *lab, Float_t *hit); void Use(Int_t = 0) {fQ=-fQ;} void SetQ(Float_t q) {fQ=q;} diff --git a/TPC/AliTPCclusterer.cxx b/TPC/AliTPCclusterer.cxx index e511bdfcdee..f2e58152768 100644 --- a/TPC/AliTPCclusterer.cxx +++ b/TPC/AliTPCclusterer.cxx @@ -33,13 +33,27 @@ ClassImp(AliTPCclusterer) -AliTPCclusterer::AliTPCclusterer(const AliTPCParam *par) { -//------------------------------------------------------- -// The main constructor -//------------------------------------------------------- - fPar=par; -} +//____________________________________________________ +AliTPCclusterer::AliTPCclusterer(const AliTPCclusterer ¶m) + :TObject(), + fPar(0) +{ + // + // dummy + // + fPar = param.fPar; +} +//----------------------------------------------------- +AliTPCclusterer & AliTPCclusterer::operator =(const AliTPCclusterer & param) +{ + // + // assignment operator - dummy + // + fPar = param.fPar; + return (*this); +} +//____________________________________________________ void AliTPCclusterer::FindPeaks(Int_t k,Int_t max, AliBin *b,Int_t *idx,UInt_t *msk,Int_t& n) { //find local maxima diff --git a/TPC/AliTPCclusterer.h b/TPC/AliTPCclusterer.h index 3835d94f374..06b8d218a65 100644 --- a/TPC/AliTPCclusterer.h +++ b/TPC/AliTPCclusterer.h @@ -18,7 +18,10 @@ class AliTPCcluster; class AliTPCclusterer : public TObject { public: - AliTPCclusterer(const AliTPCParam *par); + AliTPCclusterer():TObject(),fPar(0){}; + AliTPCclusterer(const AliTPCParam *par):TObject(), fPar(par){}; + AliTPCclusterer(const AliTPCclusterer ¶m); // copy constructor + AliTPCclusterer &operator = (const AliTPCclusterer & param); Int_t Digits2Clusters(TTree *dig, TTree *clu); private: diff --git a/TPC/AliTPCdigit.cxx b/TPC/AliTPCdigit.cxx index 97ff00b088a..ab0876e41ee 100644 --- a/TPC/AliTPCdigit.cxx +++ b/TPC/AliTPCdigit.cxx @@ -25,10 +25,27 @@ ClassImp(AliTPCdigit) - + //_____________________________________________________________________ + AliTPCdigit::AliTPCdigit() + :AliDigit(), + fSector(0), + fPadRow(0), + fPad(0), + fTime(0), + fSignal(0) +{ + // + // default constructor + // +} //_____________________________________________________________________________ -AliTPCdigit::AliTPCdigit(Int_t *tracks, Int_t *digits): - AliDigit(tracks) +AliTPCdigit::AliTPCdigit(Int_t *tracks, Int_t *digits) + :AliDigit(tracks), + fSector(0), + fPadRow(0), + fPad(0), + fTime(0), + fSignal(0) { // // Creates a TPC digit object diff --git a/TPC/AliTPCdigit.h b/TPC/AliTPCdigit.h index 2ca2f4ec644..d3e9ad55a99 100644 --- a/TPC/AliTPCdigit.h +++ b/TPC/AliTPCdigit.h @@ -20,7 +20,7 @@ public: Int_t fSignal; //Signal amplitude public: - AliTPCdigit() {} + AliTPCdigit(); AliTPCdigit(Int_t *tracks, Int_t *digits); virtual ~AliTPCdigit() {} diff --git a/TPC/AliTPCkineGrid.cxx b/TPC/AliTPCkineGrid.cxx index 6ea805972b9..0ec62f7b7e9 100644 --- a/TPC/AliTPCkineGrid.cxx +++ b/TPC/AliTPCkineGrid.cxx @@ -37,24 +37,33 @@ ClassImp(AliTPCkineGrid) //------------------------------------------------------------------------ -AliTPCkineGrid::AliTPCkineGrid() { + AliTPCkineGrid::AliTPCkineGrid() + :TNamed(), + fNpt(0), + fNeta(0), + fPt(0), + fEta(0), + fParams(0) +{ //------------------------------------------------------------------------ // Default constructor //------------------------------------------------------------------------ - fNpt = 0; - fNeta = 0; - fPt = 0; - fEta = 0; - fParams = 0; + } //------------------------------------------------------------------------ AliTPCkineGrid::AliTPCkineGrid(Int_t npt,Int_t neta, - Double_t* pt,Double_t* eta) { + Double_t* pt,Double_t* eta) + :TNamed(), + fNpt(npt), + fNeta(neta), + fPt(0), + fEta(0), + fParams(0) +{ //------------------------------------------------------------------------ // Standard constructor //------------------------------------------------------------------------ - fNpt = npt; - fNeta = neta; + fPt = new TArrayD(fNpt); fEta = new TArrayD(fNeta); @@ -65,7 +74,13 @@ AliTPCkineGrid::AliTPCkineGrid(Int_t npt,Int_t neta, fParams = new TMatrixD(fNpt,fNeta); } //------------------------------------------------------------------------- -AliTPCkineGrid::AliTPCkineGrid(const AliTPCkineGrid& grid):TNamed(grid) { +AliTPCkineGrid::AliTPCkineGrid(const AliTPCkineGrid& grid):TNamed(grid), + fNpt(0), + fNeta(0), + fPt(0), + fEta(0), + fParams(0) +{ //------------------------------------------------------------------------- // Copy constructor //------------------------------------------------------------------------- @@ -90,6 +105,15 @@ AliTPCkineGrid::~AliTPCkineGrid() { delete fEta; delete fParams; } +//__________________________________________________________________________ +AliTPCkineGrid & AliTPCkineGrid::operator =(const AliTPCkineGrid & param) +{ + // + // assignment operator - dummy + // + fNpt=param.fNpt; + return (*this); +} //-------------------------------------------------------------------------- void AliTPCkineGrid::GetArrayEta(Double_t* eta) const { //-------------------------------------------------------------------------- diff --git a/TPC/AliTPCkineGrid.h b/TPC/AliTPCkineGrid.h index 72f6f233a50..aab4d1c59b8 100644 --- a/TPC/AliTPCkineGrid.h +++ b/TPC/AliTPCkineGrid.h @@ -26,6 +26,7 @@ class AliTPCkineGrid : public TNamed { AliTPCkineGrid(); AliTPCkineGrid(Int_t npt,Int_t neta,Double_t* pt,Double_t* eta); AliTPCkineGrid(const AliTPCkineGrid& grid); + AliTPCkineGrid &operator = (const AliTPCkineGrid & param); virtual ~AliTPCkineGrid(); void GetArrayEta(Double_t* eta) const; void GetArrayPt(Double_t* pt) const; diff --git a/TPC/AliTPCpidESD.cxx b/TPC/AliTPCpidESD.cxx index 1b43f43f950..460278f8501 100644 --- a/TPC/AliTPCpidESD.cxx +++ b/TPC/AliTPCpidESD.cxx @@ -26,7 +26,10 @@ ClassImp(AliTPCpidESD) //_________________________________________________________________________ -AliTPCpidESD::AliTPCpidESD(Double_t *param) + AliTPCpidESD::AliTPCpidESD(Double_t *param): + fMIP(0.), + fRes(0.), + fRange(0.) { // // The main constructor diff --git a/TPC/AliTPCpidESD.h b/TPC/AliTPCpidESD.h index 1b39af640ef..0e74ad253eb 100644 --- a/TPC/AliTPCpidESD.h +++ b/TPC/AliTPCpidESD.h @@ -14,6 +14,7 @@ class AliESD; class AliTPCpidESD { public: + AliTPCpidESD():fMIP(0.),fRes(0.),fRange(0.){} AliTPCpidESD(Double_t *param); virtual ~AliTPCpidESD() {} Int_t MakePID(AliESD *event); diff --git a/TPC/AliTPCpolyTrack.cxx b/TPC/AliTPCpolyTrack.cxx index da9d788afd7..20fc3998393 100644 --- a/TPC/AliTPCpolyTrack.cxx +++ b/TPC/AliTPCpolyTrack.cxx @@ -26,6 +26,27 @@ ClassImp(AliTPCpolyTrack) AliTPCpolyTrack::AliTPCpolyTrack() + :TObject(), + fA(0), + fB(0), + fC(0), + fD(0), + fE(0), + fF(0), + fMaxX(0), + fMinX(0), + fSumW(0), + fSumX(0), + fSumX2(0), + fSumX3(0), + fSumX4(0), + fSumY(0), + fSumYX(0), + fSumYX2(0), + fSumZ(0), + fSumZX(0), + fSumZX2(0), + fNPoints(0) { Reset(); } diff --git a/TPC/AliTPCseed.cxx b/TPC/AliTPCseed.cxx index bdfaa40f72c..536f551639f 100644 --- a/TPC/AliTPCseed.cxx +++ b/TPC/AliTPCseed.cxx @@ -223,7 +223,16 @@ AliTPCseed::~AliTPCseed(){ } } } - +//_________________________________________________ +AliTPCseed & AliTPCseed::operator =(const AliTPCseed & param) +{ + // + // assignment operator - dummy + // + fRow=param.fRow; + return (*this); +} +//____________________________________________________ AliTPCTrackerPoint * AliTPCseed::GetTrackPoint(Int_t i) { // diff --git a/TPC/AliTPCseed.h b/TPC/AliTPCseed.h index 2acec0c3e1b..a4941aacae1 100644 --- a/TPC/AliTPCseed.h +++ b/TPC/AliTPCseed.h @@ -35,7 +35,8 @@ class AliTPCseed : public AliTPCtrack { AliTPCseed(const AliTPCseed &s, Bool_t clusterOwner = kFALSE); //AliTPCseed(const AliTPCseed &t, Double_t a); AliTPCseed(Double_t xr, Double_t alpha, const Double_t xx[5], - const Double_t cc[15], Int_t i); + const Double_t cc[15], Int_t i); + AliTPCseed &operator = (const AliTPCseed & param); Int_t Compare(const TObject *o) const; void Reset(Bool_t all = kTRUE); Int_t GetProlongation(Double_t xr, Double_t &y, Double_t & z) const; diff --git a/TPC/AliTPCtrackPid.cxx b/TPC/AliTPCtrackPid.cxx index acdbfdc8418..5a01514491d 100644 --- a/TPC/AliTPCtrackPid.cxx +++ b/TPC/AliTPCtrackPid.cxx @@ -27,7 +27,28 @@ ClassImp(AliTPCtrackPid) AliTPCtrackPid::AliTPCtrackPid() + :TObject(), + fWpi(0.), + fWk(0.), + fWp(0.), + fSignal(0.), + fMom(0.), + fPhi(0.), + fLam(0.), + fPcode(0), + fLabel(0), + fGSignal(0.), + fGMom(0.), + fGpx(0.), + fGpy(0.), + fGpz(0.), + fGx(0.), + fGy(0.), + fGz(0.), + fGcode(0), + fGlab(0) { - fWpi=fWk=fWp=0.; - fPcode=0; fMom=0.; fSignal=0; + // + // default costructor + // } diff --git a/TPC/AliTPCtrackerParam.cxx b/TPC/AliTPCtrackerParam.cxx index bd4c3c72cb7..413bc5d3967 100644 --- a/TPC/AliTPCtrackerParam.cxx +++ b/TPC/AliTPCtrackerParam.cxx @@ -120,15 +120,53 @@ ClassImp(AliTPCtrackerParam) //----------------------------------------------------------------------------- AliTPCtrackerParam::AliTPCtrackerParam(Int_t kcoll, Double_t kBz, - const char* evfoldname): - fEvFolderName(evfoldname) { + const char* evfoldname):TObject(), + fEvFolderName(evfoldname), + fBz(kBz), + fColl(kcoll), + fSelAndSmear(kTRUE), + fDBfileName(""), + fTrack(), + fCovTree(0), + fDBgrid(0), + fDBgridPi(), + fDBgridKa(), + fDBgridPr(), + fDBgridEl(), + fDBgridMu(), + fEff(0), + fEffPi(), + fEffKa(), + fEffPr(), + fEffEl(), + fEffMu(), + fPulls(0), + fRegPar(0), + fRegParPi(), + fRegParKa(), + fRegParPr(), + fRegParEl(), + fRegParMu(), + fdEdxMean(0), + fdEdxMeanPi(), + fdEdxMeanKa(), + fdEdxMeanPr(), + fdEdxMeanEl(), + fdEdxMeanMu(), + fdEdxRMS(0), + fdEdxRMSPi(), + fdEdxRMSKa(), + fdEdxRMSPr(), + fdEdxRMSEl(), + fdEdxRMSMu() +{ //----------------------------------------------------------------------------- // This is the class conctructor //----------------------------------------------------------------------------- - fBz = kBz; // value of the z component of L3 field (Tesla) - fColl = kcoll; // collision code (0: PbPb6000; 1: pp) - fSelAndSmear = kTRUE; // by default selection and smearing are done + // fBz = kBz; // value of the z component of L3 field (Tesla) + // fColl = kcoll; // collision code (0: PbPb6000; 1: pp) + // fSelAndSmear = kTRUE; // by default selection and smearing are done if(fBz!=0.4 && fBz!=0.5) { Fatal("AliTPCtrackerParam","AliTPCtrackerParam::AliTPCtrackerParam: Invalid field!\n Available: 0.4 or 0.5"); @@ -149,7 +187,46 @@ AliTPCtrackerParam::AliTPCtrackerParam(Int_t kcoll, Double_t kBz, //----------------------------------------------------------------------------- AliTPCtrackerParam::~AliTPCtrackerParam() {} //____________________________________________________________________________ -AliTPCtrackerParam::AliTPCtrackerParam( const AliTPCtrackerParam& p):TObject(p) +AliTPCtrackerParam::AliTPCtrackerParam( const AliTPCtrackerParam& p) + :TObject(p), + fEvFolderName(""), + fBz(0.), + fColl(0), + fSelAndSmear(0), + fDBfileName(""), + fTrack(), + fCovTree(0), + fDBgrid(0), + fDBgridPi(), + fDBgridKa(), + fDBgridPr(), + fDBgridEl(), + fDBgridMu(), + fEff(0), + fEffPi(), + fEffKa(), + fEffPr(), + fEffEl(), + fEffMu(), + fPulls(0), + fRegPar(0), + fRegParPi(), + fRegParKa(), + fRegParPr(), + fRegParEl(), + fRegParMu(), + fdEdxMean(0), + fdEdxMeanPi(), + fdEdxMeanKa(), + fdEdxMeanPr(), + fdEdxMeanEl(), + fdEdxMeanMu(), + fdEdxRMS(0), + fdEdxRMSPi(), + fdEdxRMSKa(), + fdEdxRMSPr(), + fdEdxRMSEl(), + fdEdxRMSMu() { // dummy copy constructor } @@ -157,17 +234,23 @@ AliTPCtrackerParam::AliTPCtrackerParam( const AliTPCtrackerParam& p):TObject(p) AliTPCtrackerParam::AliTPCseedGeant::AliTPCseedGeant( Double_t x,Double_t y,Double_t z, Double_t px,Double_t py,Double_t pz, - Int_t lab) { + Int_t lab) + :TObject(), + fXg(x), + fYg(y), + fZg(z), + fPx(px), + fPy(py), + fPz(pz), + fAlpha(0.), + fLabel(lab), + fSector(0) + +{ //---------------------------------------------------------------------------- // Constructor of the geant seeds //---------------------------------------------------------------------------- - fXg = x; - fYg = y; - fZg = z; - fPx = px; - fPy = py; - fPz = pz; - fLabel = lab; + Double_t a = TMath::ATan2(y,x)*180./TMath::Pi(); if(a<0) a += 360.; fSector = (Int_t)(a/20.); diff --git a/TPC/AliTPCtrackerParam.h b/TPC/AliTPCtrackerParam.h index d790347f806..0b8be8ab34c 100644 --- a/TPC/AliTPCtrackerParam.h +++ b/TPC/AliTPCtrackerParam.h @@ -37,9 +37,9 @@ class AliTPC; class AliTPCtrackerParam: public TObject -{ - +{ public: + AliTPCtrackerParam(Int_t coll=0, Double_t Bz=0.4, const char* evfoldname = AliConfig::GetDefaultEventFolderName()); virtual ~AliTPCtrackerParam(); @@ -85,6 +85,17 @@ class AliTPCtrackerParam: //********* Internal class definition ******* class AliTPCseedGeant : public TObject { public: + AliTPCseedGeant():TObject(), + fXg(0.), + fYg(0.), + fZg(0.), + fPx(0.), + fPy(0.), + fPz(0.), + fAlpha(0.), + fLabel(0), + fSector(0){} + AliTPCseedGeant(Double_t x=0.,Double_t y=0.,Double_t z=0., Double_t px=0.,Double_t py=0.,Double_t pz=0., Int_t lab=0); diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx index d016aead72b..0209c58625a 100644 --- a/TPC/AliTPCv1.cxx +++ b/TPC/AliTPCv1.cxx @@ -61,7 +61,8 @@ ClassImp(AliTPCv1) //_____________________________________________________________________________ - AliTPCv1::AliTPCv1(){ + AliTPCv1::AliTPCv1():AliTPC(),fIdSens(0) +{ fHitType = 1; @@ -69,11 +70,11 @@ ClassImp(AliTPCv1) //_____________________________________________________________________________ AliTPCv1::AliTPCv1(const char *name, const char *title) - :AliTPC(name, title) { + :AliTPC(name, title),fIdSens(0) + { // // Standard constructor for Time Projection Chamber // - fIdSens=0; if (fTPCParam) diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx index a3deb7b2415..a6119da0fcb 100644 --- a/TPC/AliTPCv3.cxx +++ b/TPC/AliTPCv3.cxx @@ -59,7 +59,8 @@ ClassImp(AliTPCv3) //_____________________________________________________________________________ - AliTPCv3::AliTPCv3(){ + AliTPCv3::AliTPCv3():AliTPC(),fIdSens(0) +{ fHitType = 1; @@ -67,15 +68,13 @@ ClassImp(AliTPCv3) //_____________________________________________________________________________ AliTPCv3::AliTPCv3(const char *name, const char *title) : - AliTPC(name, title) + AliTPC(name, title), fIdSens(0) { // // Standard constructor for Time Projection Chamber version 3 // SetBufferSize(128000); - fIdSens=0; - if (fTPCParam) fTPCParam->Write(fTPCParam->GetTitle()); -- 2.39.3