X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=TPC%2FAliClusters.cxx;h=085f14d14ebfbc5db6791794901fad32f6d9cbf3;hp=563da8770c68bf537e43d17d790a7896224457f9;hb=9f806b7f9628accdd0e221db8a43c86a62fc4b44;hpb=c9787763364b2d82b681c3ebeda9401603b9489f diff --git a/TPC/AliClusters.cxx b/TPC/AliClusters.cxx index 563da8770c6..085f14d14eb 100644 --- a/TPC/AliClusters.cxx +++ b/TPC/AliClusters.cxx @@ -13,26 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3 2000/06/30 12:07:49 kowal2 -Updated from the TPC-PreRelease branch - -Revision 1.2.4.2 2000/06/14 16:45:13 kowal2 -Improved algorithms. Compiler warnings removed. - -Revision 1.2.4.1 2000/06/09 07:09:29 kowal2 - -Clustering and tracking classes are splitted from the simulation ones - -Revision 1.2 2000/04/17 09:37:33 kowal2 -removed obsolete AliTPCDigitsDisplay.C - -Revision 1.1.4.2 2000/04/10 11:34:02 kowal2 - -Clusters handling in a new data structure - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -59,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() { @@ -86,7 +88,7 @@ Bool_t AliClusters::SetClass(const Text_t *classname) // //set class of stored object if ( fClass !=0 ) { - delete fClass; + // delete fClass; fClass = 0; } @@ -160,13 +162,13 @@ Int_t AliClusters::Find(Double_t y) const // AliComplexCluster* cl; cl=(AliComplexCluster*)fClusters->UncheckedAt(0); - if (y <= cl->fY) return 0; + if (y <= cl->GetY()) return 0; cl=(AliComplexCluster*)fClusters->UncheckedAt(fNclusters-1); - if (y > cl->fY) return fNclusters; + if (y > cl->GetY()) return fNclusters; Int_t b=0, e=fNclusters-1, m=(b+e)/2; for (; bUncheckedAt(m); - if (y > cl->fY) b=m+1; + if (y > cl->GetY()) b=m+1; else e=m; } return m; @@ -185,8 +187,8 @@ void AliClusters::DrawClusters(Float_t shiftx, Float_t shifty, for (Int_t i=0;iUncheckedAt(i); TMarker * marker = new TMarker; - marker->SetX(cl->fX+shiftx); - marker->SetY(cl->fY+shifty); + marker->SetX(cl->GetX()+shiftx); + marker->SetY(cl->GetY()+shifty); marker->SetMarkerSize(size); marker->SetMarkerStyle(style); marker->SetMarkerColor(color);