method Ranmar is removed

[u/mrichter/AliRoot.git] / PMD / AliPMDClusteringV1.h

diff --git a/PMD/AliPMDClusteringV1.h b/PMD/AliPMDClusteringV1.h
index 00a3c50dd359a790f439a2a5e35d97fc7f80eb36..d48ec65f578a3e0ed6cf3f6b29e536eecd2a40cf 100644 (file)
--- a/PMD/AliPMDClusteringV1.h
+++ b/PMD/AliPMDClusteringV1.h
@@ -4,7 +4,7 @@
  * See cxx source for full Copyright notice                               */
 //-----------------------------------------------------//
 //                                                     //
-//  Header File : PMDClustering.h, Version 00          //
+//  Header File : PMDClusteringV1.h, Version 00        //
 //                                                     //
 //  Date   : September 26 2002                         //
 //                                                     //
@@ -31,10 +31,9 @@
 class TNtuple;
 class TObjArray;
 class AliPMDcluster;
-
+class AliPMDcludata;
 class AliPMDClusteringV1: public AliPMDClustering
 {
-
  public:
   AliPMDClusteringV1();
   virtual ~AliPMDClusteringV1();
@@ -50,58 +49,33 @@ class AliPMDClusteringV1: public AliPMDClustering
                    Double_t &yc, Double_t &zc, Double_t &rc);
   Double_t Distance(Double_t x1, Double_t y1,
                    Double_t x2, Double_t y2);
-  Double_t Ranmar() const;
   void     SetEdepCut(Float_t decut);
   
  protected:
-
+  
+  TObjArray *pmdclucont;
+  AliPMDcludata *pmdcludata;
+  
   static const Double_t fgkSqroot3by2;  // fgkSqroot3by2 = sqrt(3.)/2.
-  /*enum {
-    kNMX   = 4608,
-    kNDIMX = 48,
-    kNDIMY = 96
-  };*/
-  /*
-    Proposed changes inNMX, kNDIMX and kNDIMY by S. C. Phatak to account
-    for rectangular ( vs rhomboid ) geometry.
-    To keep the clustering functional, we define a rhomboid which
-    superscribes the rectangle. So we need to pad up dummy cells in x
-    direction. The number of these cells is 96/2-1=47 in each row ( value
-    of x ). For first two rows, all dummy cells are to the left. For
-    every two rows add one cell to right and subtract one from left.
-    So previous (i,j) values go over to ( i',j) i'=i+(96-j)/2-1
-    Note we use C++ convention so i and j run from 0 to 47 or 95.
-  */
-
+  
   enum {
-    kNMX    = 9120,
-    kNDIMX  = 95,
-    kNDIMY  = 96,
-    kNDIMXr = 48,
-    kNDIMYr = 96
+    kNMX    = 11424,     // no. of cells in a module
+    kNDIMX  = 119,       // max no. of cells along x direction
+    kNDIMY  = 96         // max no. of cells along axis at 60 deg with x axis
   };
-  /*
-    kNMX   : # of cells in a supermodule
-    kNDIMX : maximum number of cells along x direction (origin at one corner)
-    kNDIMY : maximum number of cells along axis at 60 degrees with x axis
-  */
 
-  Double_t fEdepCell[kNDIMX][kNDIMY]; //energy(ADC) in each cell of the supermodule
-  Double_t fClusters[5][5000]; // Cluster informations
-  Int_t    fClno;   // number of clusters in a supermodule
-
-  /*
-    clusters[0][i] --- x position of the cluster center
-    clusters[1][i] --- y position of the cluster center
-    clusters[2][i] --- total energy in the cluster
-    clusters[3][i] --- number of cells forming the cluster
-                       ( possibly fractional )
-    clusters[4][i] --- cluster radius
-  */
+  Double_t fEdepCell[kNDIMX][kNDIMY]; //energy(ADC) in each cell
+ 
+  //Variables for association
+  Int_t fCellTrNo[kNDIMX][kNDIMY];     // id x-y value of cells
+  Int_t fClTr[15][5000];               // 1d x-y cell info of attached cells
 
-  Int_t    fIord[2][kNMX]; // ordered list of i and j according to decreasing energy dep.
-  Int_t    fInfocl[2][kNDIMX][kNDIMY]; // cellwise information on the cluster to which the cell
-  Int_t    fInfcl[3][kNMX]; // cluster information [0][i] -- cluster number
+  Int_t    fIord[2][kNMX];             // ordered list of i and j according
+                                       // to decreasing energy dep.
+  Int_t    fInfocl[2][kNDIMX][kNDIMY]; // cellwise information on the 
+                                       // cluster to which the cell
+  Int_t    fInfcl[3][kNMX];            // cluster information [0][i]
+                                       // -- cluster number
   Double_t fCoord[2][kNDIMX][kNDIMY];
 
   /*
@@ -117,6 +91,6 @@ class AliPMDClusteringV1: public AliPMDClustering
 
   Float_t fCutoff; // Energy(ADC) cutoff per cell before clustering
 
-  ClassDef(AliPMDClusteringV1,1) // Does clustering for PMD
+  ClassDef(AliPMDClusteringV1,3) // Does clustering for PMD
 };
 #endif