Changes due to a new class AliComplexCluster. Forward declarations.

diff --git a/TPC/AliTPCClusterFinder.cxx b/TPC/AliTPCClusterFinder.cxx
index 4f8af57d3333f44fae1409e17582a640d690beb2..a72e95360608320ac84b368624e5f0b83c35c828 100644 (file)
--- a/TPC/AliTPCClusterFinder.cxx
+++ b/TPC/AliTPCClusterFinder.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  2000/07/10 20:57:39  hristov
+Update of TPC code and macros by M.Kowalski
+
 Revision 1.2  2000/06/30 12:07:49  kowal2
 Updated from the TPC-PreRelease branch
 
@@ -25,7 +28,7 @@ replacing AliClusterFinder
 
 //-----------------------------------------------------------------------------
 //
-//  Implementation of class ALICLUSTERFINDER
+//  Implementation of class ALITPCCLUSTERFINDER
 // 
 //Class for cluster finding in two dimension.
 //In the present there are implemented two algorithm
@@ -49,7 +52,7 @@ replacing AliClusterFinder
 #include "TRandom.h"
 #include "AliH2F.h"
 #include "TMarker.h"
-#include "AliCluster.h"
+#include "AliComplexCluster.h"
 #include "AliTPCClusterFinder.h"
 #include <fstream.h>
 
@@ -782,7 +785,7 @@ TClonesArray * AliTPCClusterFinder::FindPeaks3(TClonesArray *arr)
           for ( Int_t dd =1;((dd<=dmax) && (naccepted>0));dd++){
              naccepted=0; 
             for (Int_t di = -dd;di<=dd;di++){
-              Int_t ddj = dd-abs(di);
+              Int_t ddj = dd-TMath::Abs(di);
               Int_t sigstart = (ddj>0) ?  -1 : 0;
               for (Int_t sig = sigstart;sig<=1;sig+=2){
                 Int_t dj= sig*ddj; 
@@ -916,7 +919,7 @@ void AliTPCClusterFinder::DrawCluster(
   //draw marker for each of cluster
   Int_t ncl=fClustersArray->GetEntriesFast();
   for (Int_t i=0;i<ncl;i++){
-    AliCluster *cl = (AliCluster*)fClustersArray->UncheckedAt(i);
+    AliComplexCluster *cl = (AliComplexCluster*)fClustersArray->UncheckedAt(i);
     TMarker * marker = new TMarker;
     marker->SetX(cl->fX);
     marker->SetY(cl->fY);

diff --git a/TPC/AliTPCClusterFinder.h b/TPC/AliTPCClusterFinder.h
index d3094791a4a332d520e845738bab186f5592a954..166ea38040b272defe953755b322e66a131cee20 100644 (file)
--- a/TPC/AliTPCClusterFinder.h
+++ b/TPC/AliTPCClusterFinder.h
@@ -5,15 +5,16 @@
 // include files and class forward declarations
 #include "TObject.h"
 #include "TH2.h"
-#include "AliCluster.h"
+//#include "AliComplexCluster.h"
 
 class TClonesArray;
-class AliCluster;
+class AliComplexCluster;
 class AliCell;
 class AliArrayI;
 class AliDetectorParam;
 class TMinuit;
 class AliH2F;
+class AliDigitCluster;
 
 class  AliTPCClusterFinder : public TObject {
  
@@ -140,7 +141,7 @@ private:
   TClonesArray * fClustersArray; //array with current clusters
   Bool_t     rOK;       
   //signalize that all fields were initialised 
-  ClassDef(AliTPCClusterFinder,2)
+  ClassDef(AliTPCClusterFinder,2) // Cluster finder
 };