New data members: distance to bad channels from the center of a reconstructed cluster...

diff --git a/STEER/AliESDCaloCluster.cxx b/STEER/AliESDCaloCluster.cxx
index 3c491c75e97607544b1f0316a24c26121a03b177..c03d3b28e2c753edc3ddc22ba03d7d7b9057cecf 100644 (file)
--- a/STEER/AliESDCaloCluster.cxx
+++ b/STEER/AliESDCaloCluster.cxx
@@ -35,6 +35,7 @@ AliESDCaloCluster::AliESDCaloCluster() :
   fClusterType(-1),
   fEMCALCluster(kFALSE),
   fPHOSCluster(kFALSE),
+  fTrackMatched(kFALSE),
   fEnergy(-1),
   fDispersion(-1),
   fChi2(-1),
@@ -44,6 +45,7 @@ AliESDCaloCluster::AliESDCaloCluster() :
   fM11(0),
   fNExMax(0),
   fEmcCpvDistance(9999),
+  fDistToBadChannel(9999),
   fNumberOfPrimaries(-1),
   fListOfPrimaries(0x0),
   fNumberOfDigits(0),
@@ -65,6 +67,7 @@ AliESDCaloCluster::AliESDCaloCluster(const AliESDCaloCluster& clus) :
   fClusterType(clus.fClusterType),
   fEMCALCluster(clus.fEMCALCluster),
   fPHOSCluster(clus.fPHOSCluster),
+  fTrackMatched(clus.fTrackMatched),
   fEnergy(clus.fEnergy),
   fDispersion(clus.fDispersion),
   fChi2(clus.fChi2),
@@ -74,6 +77,7 @@ AliESDCaloCluster::AliESDCaloCluster(const AliESDCaloCluster& clus) :
   fM11(clus.fM11),
   fNExMax(clus.fNExMax),
   fEmcCpvDistance(clus.fEmcCpvDistance),
+  fDistToBadChannel(clus.fDistToBadChannel),
   fNumberOfPrimaries(clus.fNumberOfPrimaries),
   fListOfPrimaries(0x0),
   fNumberOfDigits(clus.fNumberOfDigits),
@@ -125,6 +129,7 @@ AliESDCaloCluster &AliESDCaloCluster::operator=(const AliESDCaloCluster& source)
   fClusterType = source.fClusterType;
   fEMCALCluster = source.fEMCALCluster;
   fPHOSCluster = source.fPHOSCluster;
+  fTrackMatched = source.fTrackMatched;
   fEnergy = source.fEnergy;
   fDispersion = source.fDispersion;
   fChi2 = source.fChi2;
@@ -134,7 +139,7 @@ AliESDCaloCluster &AliESDCaloCluster::operator=(const AliESDCaloCluster& source)
   fM11 = source.fM11;
   fNExMax = source.fNExMax;
   fEmcCpvDistance = source.fEmcCpvDistance;
-
+  fDistToBadChannel = source.fDistToBadChannel ;
   fNumberOfPrimaries = source.fNumberOfPrimaries;
   delete fListOfPrimaries; fListOfPrimaries=0x0;
 

diff --git a/STEER/AliESDCaloCluster.h b/STEER/AliESDCaloCluster.h
index 787253cb883777300aa87d2cb8d473e41bc82090..771c987350d491fd9c48556b11355c916b5f6613 100644 (file)
--- a/STEER/AliESDCaloCluster.h
+++ b/STEER/AliESDCaloCluster.h
@@ -44,6 +44,9 @@ public:
   void SetPHOS(Bool_t phos) { fPHOSCluster = phos;}
   Bool_t IsPHOS() const {return fPHOSCluster;}
 
+  void SetTrackMatchedIndex(Int_t match) { fTrackMatched = match;}
+  Int_t GetTrackMatchedIndex() const {return fTrackMatched;}
+
   void SetGlobalPosition(const Float_t *pos) {
     fGlobalPos[0] = pos[0]; fGlobalPos[1] = pos[1]; fGlobalPos[2] = pos[2];
   }
@@ -81,6 +84,9 @@ public:
   void SetEmcCpvDistance(Float_t dEmcCpv) { fEmcCpvDistance = dEmcCpv; }
   Float_t GetEmcCpvDistance() const       { return fEmcCpvDistance; }
 
+  void SetDistanceToBadChannel(Float_t dist) {fDistToBadChannel=dist;}
+  Float_t GetDistanceToBadChannel() const {return fDistToBadChannel;}
+
   void SetNumberOfPrimaries(Int_t nprim)      { fNumberOfPrimaries = nprim; }
   Int_t GetNumberOfPrimaries() const         { return fNumberOfPrimaries; }
   
@@ -107,6 +113,7 @@ protected:
   Int_t     fClusterType;      // Flag for different clustering versions
   Bool_t    fEMCALCluster;     // Is this is an EMCAL cluster?
   Bool_t    fPHOSCluster;      // Is this is a PHOS cluster?
+  Int_t       fTrackMatched;      // Index of track to which the cluster belongs
   Float_t   fGlobalPos[3];     // position in global coordinate system
   Float_t   fEnergy;           // energy measured by calorimeter
   Float_t   fDispersion;       // cluster dispersion, for shape analysis
@@ -118,9 +125,10 @@ protected:
   Float_t   fM11;              // 2-nd mixed moment Mxy
   UShort_t  fNExMax ;          // number of (Ex-)maxima before unfolding
   Float_t   fEmcCpvDistance;   // the distance from PHOS EMC rec.point to the closest CPV rec.point
+ Float_t   fDistToBadChannel; // Distance to nearest bad channel
 
   Int_t     fNumberOfPrimaries;   // number of primaries that generated the cluster
-  UShort_t*   fListOfPrimaries;   //[ fNumberOfPrimaries] list of primaries that generated the cluster
+  UShort_t*   fListOfPrimaries;   //[fNumberOfPrimaries] list of primaries that generated the cluster
 
   Int_t     fNumberOfDigits;   // number of calorimeter digits in cluster
                                // Very important! The streamer needs to
@@ -130,7 +138,7 @@ protected:
   UShort_t* fDigitTime;        //[fNumberOfDigits] time of this digit (integer units)
   UShort_t* fDigitIndex;       //[fNumberOfDigits] calorimeter digit index
 
-  ClassDef(AliESDCaloCluster,1)  //ESDCaloCluster 
+  ClassDef(AliESDCaloCluster,2)  //ESDCaloCluster 
 };
 
 #endif