X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RALICE%2FAliCalcluster.h;h=22aaf731ede4d41dcf1c6d546e31391f3261e170;hb=906009b9e54081d578c37f6d6443d0fae6187726;hp=2d9e026dfc427b6785cf8627ee18250bbe6d0a10;hpb=f531a546a9974bd7865e20843d21d2a63848b886;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RALICE/AliCalcluster.h b/RALICE/AliCalcluster.h
index 2d9e026dfc4..22aaf731ede 100644
--- a/RALICE/AliCalcluster.h
+++ b/RALICE/AliCalcluster.h
@@ -5,47 +5,44 @@
 
 // $Id$
 
-#include <iostream.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
-  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
-  void Start(AliCalmodule& m);       // Reset cluster data to start with module m
-  void Add(AliCalmodule& m);         // Add module data to cluster
-  void AddVetoSignal(Float_t* r,TString f,Float_t s=0); // Associate (extrapolated) signal
-  AliSignal* GetVetoSignal(Int_t j); // Access to veto signal number j
-  Int_t GetNvetos();                 // Provide the number of veto signals
-  Float_t GetVetoLevel();            // Provide confidence level of best associated veto hit
-  Int_t HasVetoHit(Double_t cl);     // Check for ass. veto hit with conf. level > cl
+  AliCalcluster();                         // Default constructor, all data initialised to 0
+  virtual ~AliCalcluster();                // Default destructor
+  AliCalcluster(const AliCalcluster& c);   // Copy constructor
+  AliCalcluster(AliCalmodule& m);          // Create new cluster starting at module m
+  Int_t GetRow() const;                    // Return row number of cluster center
+  Int_t GetColumn() const;                 // Return column number of cluster center
+  Int_t GetNmodules() const;               // Return number of modules in cluster
+  Float_t GetRowDispersion() const;        // Return normalised row dispersion of cluster
+  Float_t GetColumnDispersion() const;     // Return normalised column dispersion of cluster
+  void Start(AliCalmodule& m);             // Reset cluster data to start with module m
+  void Add(AliCalmodule& m);               // Add module data to cluster
+  void AddVetoSignal(AliSignal& s,Int_t extr=1); // Associate (extrapolated) signal
+  void AddVetoSignal(AliSignal* s,Int_t extr=1) { AddVetoSignal(*s,extr); }
+  AliSignal* GetVetoSignal(Int_t j) const; // Access to veto signal number j
+  Int_t GetNvetos() const;                 // Provide the number of veto signals
+  Float_t GetVetoLevel() const;            // Provide confidence level of best associated veto hit
+  Int_t HasVetoHit(Double_t cl) const;     // 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,1) // Description of a cluster of calorimeter modules.
+ ClassDef(AliCalcluster,5) // Description of a cluster of calorimeter modules.
 };
 #endif