From 73a68ccb741814fc465cacbfb03fe1bb54de629e Mon Sep 17 00:00:00 2001 From: schutz Date: Wed, 5 Dec 2001 14:19:24 +0000 Subject: [PATCH] Added the ctor with opt argument following Peter's suggestion --- PHOS/AliPHOSClusterizerv1.cxx | 8 ++++---- PHOS/AliPHOSCpvRecPoint.cxx | 10 +++++++++- PHOS/AliPHOSCpvRecPoint.h | 1 + PHOS/AliPHOSEmcRecPoint.cxx | 14 ++++++++++++++ PHOS/AliPHOSEmcRecPoint.h | 1 + PHOS/AliPHOSRecPoint.cxx | 10 ++++++++++ PHOS/AliPHOSRecPoint.h | 1 + 7 files changed, 40 insertions(+), 5 deletions(-) diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx index 75a4420c623..4e96b566286 100644 --- a/PHOS/AliPHOSClusterizerv1.cxx +++ b/PHOS/AliPHOSClusterizerv1.cxx @@ -594,7 +594,7 @@ void AliPHOSClusterizerv1::MakeClusters() if(fNumberOfEmcClusters >= emcRecPoints->GetSize()) emcRecPoints->Expand(2*fNumberOfEmcClusters+1) ; - emcRecPoints->AddAt(new AliPHOSEmcRecPoint(), fNumberOfEmcClusters) ; + emcRecPoints->AddAt(new AliPHOSEmcRecPoint(""), fNumberOfEmcClusters) ; clu = (AliPHOSEmcRecPoint *) emcRecPoints->At(fNumberOfEmcClusters) ; fNumberOfEmcClusters++ ; clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->GetId())) ; @@ -608,7 +608,7 @@ void AliPHOSClusterizerv1::MakeClusters() if(fNumberOfCpvClusters >= cpvRecPoints->GetSize()) cpvRecPoints->Expand(2*fNumberOfCpvClusters+1); - cpvRecPoints->AddAt(new AliPHOSCpvRecPoint(), fNumberOfCpvClusters) ; + cpvRecPoints->AddAt(new AliPHOSCpvRecPoint(""), fNumberOfCpvClusters) ; clu = (AliPHOSCpvRecPoint *) cpvRecPoints->At(fNumberOfCpvClusters) ; fNumberOfCpvClusters++ ; @@ -845,7 +845,7 @@ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, if(fNumberOfEmcClusters >= emcRecPoints->GetSize()) emcRecPoints->Expand(2*fNumberOfEmcClusters) ; - (*emcRecPoints)[fNumberOfEmcClusters] = new AliPHOSEmcRecPoint() ; + (*emcRecPoints)[fNumberOfEmcClusters] = new AliPHOSEmcRecPoint("") ; emcRP = (AliPHOSEmcRecPoint *) emcRecPoints->At(fNumberOfEmcClusters); fNumberOfEmcClusters++ ; } @@ -853,7 +853,7 @@ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, if(fNumberOfCpvClusters >= cpvRecPoints->GetSize()) cpvRecPoints->Expand(2*fNumberOfCpvClusters) ; - (*cpvRecPoints)[fNumberOfCpvClusters] = new AliPHOSCpvRecPoint() ; + (*cpvRecPoints)[fNumberOfCpvClusters] = new AliPHOSCpvRecPoint("") ; emcRP = (AliPHOSEmcRecPoint *) cpvRecPoints->At(fNumberOfCpvClusters); fNumberOfCpvClusters++ ; } diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx index a985e94bdfc..f93f91b4efb 100644 --- a/PHOS/AliPHOSCpvRecPoint.cxx +++ b/PHOS/AliPHOSCpvRecPoint.cxx @@ -48,13 +48,21 @@ AliPHOSCpvRecPoint::AliPHOSCpvRecPoint() : AliPHOSEmcRecPoint() fLengZ = -1; } +//____________________________________________________________________________ +AliPHOSCpvRecPoint::AliPHOSCpvRecPoint(const char * opt) : AliPHOSEmcRecPoint(opt) +{ + // ctor + + fLengX = -1; + fLengZ = -1; + } + //____________________________________________________________________________ AliPHOSCpvRecPoint::~AliPHOSCpvRecPoint() { // dtor } - //____________________________________________________________________________ Bool_t AliPHOSCpvRecPoint::AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * digit2 ) const { diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h index 0e14b3bada9..2b14c918283 100644 --- a/PHOS/AliPHOSCpvRecPoint.h +++ b/PHOS/AliPHOSCpvRecPoint.h @@ -29,6 +29,7 @@ class AliPHOSCpvRecPoint : public AliPHOSEmcRecPoint { public: AliPHOSCpvRecPoint() ; + AliPHOSCpvRecPoint(const char * opt) ; AliPHOSCpvRecPoint(const AliPHOSCpvRecPoint & rp) { // cpy ctor requested by Coding Convention // but not yet needed diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx index f62f019f43e..b3fc5b2c38a 100644 --- a/PHOS/AliPHOSEmcRecPoint.cxx +++ b/PHOS/AliPHOSEmcRecPoint.cxx @@ -56,6 +56,20 @@ AliPHOSEmcRecPoint::AliPHOSEmcRecPoint() : AliPHOSRecPoint() } +//____________________________________________________________________________ +AliPHOSEmcRecPoint::AliPHOSEmcRecPoint(const char * opt) : AliPHOSRecPoint(opt) +{ + // ctor + + fMulDigit = 0 ; + fAmp = 0. ; + fCoreEnergy = 0 ; + fEnergyList = 0 ; + fTime = -1. ; + fLocPos.SetX(1000000.) ; //Local position should be evaluated + +} + //____________________________________________________________________________ AliPHOSEmcRecPoint::~AliPHOSEmcRecPoint() { diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h index 32b9dc8e3bf..c681d7a4f96 100644 --- a/PHOS/AliPHOSEmcRecPoint.h +++ b/PHOS/AliPHOSEmcRecPoint.h @@ -28,6 +28,7 @@ class AliPHOSEmcRecPoint : public AliPHOSRecPoint { public: AliPHOSEmcRecPoint() ; + AliPHOSEmcRecPoint(const char * opt) ; AliPHOSEmcRecPoint(const AliPHOSEmcRecPoint & rp) { // cpy ctor requested by Coding Convention // but not yet needed diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx index be3435e01f0..7d870c655ec 100644 --- a/PHOS/AliPHOSRecPoint.cxx +++ b/PHOS/AliPHOSRecPoint.cxx @@ -49,6 +49,16 @@ AliPHOSRecPoint::AliPHOSRecPoint() } +//____________________________________________________________________________ +AliPHOSRecPoint::AliPHOSRecPoint(const char * opt) : AliRecPoint(opt) +{ + // ctor + + fMaxTrack = 200 ; + fPHOSMod = 0; + +} + //____________________________________________________________________________ Int_t AliPHOSRecPoint::DistancetoPrimitive(Int_t px, Int_t py) { diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h index 7287e0ba4d3..d8fb01fe8f0 100644 --- a/PHOS/AliPHOSRecPoint.h +++ b/PHOS/AliPHOSRecPoint.h @@ -29,6 +29,7 @@ class AliPHOSRecPoint : public AliRecPoint { typedef TObjArray RecPointsList ; AliPHOSRecPoint() ; // ctor + AliPHOSRecPoint(const char * opt) ; // ctor AliPHOSRecPoint(const AliPHOSRecPoint & rp) { // cpy ctor requested by Coding Convention // but not yet needed -- 2.39.3