bug fixed while filling the object AliPMDcluster

[u/mrichter/AliRoot.git] / RALICE / AliCalcluster.h

diff --git a/RALICE/AliCalcluster.h b/RALICE/AliCalcluster.h
index 4aa3cce43b5bea831a0c4a796495cee94b30373e..2884df3200eaf41674b61430b0c40a8449cfb4e1 100644 (file)
--- a/RALICE/AliCalcluster.h
+++ b/RALICE/AliCalcluster.h
@@ -5,25 +5,23 @@
 
 // $Id$
 
-#include "Riostream.h"
 #include <math.h>
  
-#include "TObject.h"
 #include "TObjArray.h"
 #include "TString.h"
  
 #include "AliCalmodule.h"
 #include "AliMath.h"
  
-class AliCalcluster : public TObject,public AliPosition
+class AliCalcluster : public AliSignal
 {
  public:
   AliCalcluster();                   // Default constructor, all data initialised to 0
-  ~AliCalcluster();                  // Default destructor
+  virtual ~AliCalcluster();          // Default destructor
+  AliCalcluster(AliCalcluster& c);   // Copy constructor
   AliCalcluster(AliCalmodule& m);    // Create new cluster starting at module m
   Int_t GetRow();                    // Return row number of cluster center
   Int_t GetColumn();                 // Return column number of cluster center
-  Float_t GetSignal(Int_t n=0);      // Return signal of nxn matrix around the center
   Int_t GetNmodules();               // Return number of modules in cluster
   Float_t GetRowDispersion();        // Return normalised row dispersion of cluster
   Float_t GetColumnDispersion();     // Return normalised column dispersion of cluster
@@ -37,17 +35,14 @@ class AliCalcluster : public TObject,public AliPosition
   Int_t HasVetoHit(Double_t cl);     // Check for ass. veto hit with conf. level > cl
  
  protected:
-  AliCalmodule* fCenter; // Pointer to the central module of the cluster
-  Float_t fSig;          // The total signal value of the cluster
+  Int_t fRow;            // Row index of the central module of the cluster
+  Int_t fCol;            // Column index of the central module of the cluster
   Int_t fNmods;          // The number of modules in the cluster
-  Float_t fSig11;        // Cluster signal of the central module
-  Float_t fSig33;        // Cluster signal in 3x3 matrix around the center
-  Float_t fSig55;        // Cluster signal in 5x5 matrix around the center
   Float_t fRowdisp;      // Row dispersion of cluster (not normalised)
   Float_t fColdisp;      // Column dispersion of cluster (not normalised)
   Int_t fNvetos;         // The number of associated veto signals
   TObjArray* fVetos;     // The array of associated veto signals
  
- ClassDef(AliCalcluster,2) // Description of a cluster of calorimeter modules.
+ ClassDef(AliCalcluster,4) // Description of a cluster of calorimeter modules.
 };
 #endif