ALIROOT-5440 CoreEnegy field added to AliESDCaloCluster and AliAODCal…

…oCluster
sevdokim · Apr 18, 2014 · 02577c1 · 02577c1
1 parent 74f2291
commit 02577c1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/STEER/AOD/AliAODCaloCluster.cxx b/STEER/AOD/AliAODCaloCluster.cxx
@@ -37,6 +37,7 @@ AliAODCaloCluster::AliAODCaloCluster() :
   fTrackDz(-999),
   fNExMax(0), 
   fTOF(0.),
+  fCoreEnergy(0.),
   fTracksMatched(),
   fNCells(0),
   fCellsAbsId(0x0),
@@ -65,6 +66,7 @@ AliAODCaloCluster::AliAODCaloCluster(Int_t id,
   fTrackDz(-999),
   fNExMax(0),
   fTOF(0.),
+  fCoreEnergy(0.),
   fTracksMatched(),
   fNCells(0),
   fCellsAbsId(0x0),
@@ -93,6 +95,7 @@ AliAODCaloCluster::AliAODCaloCluster(Int_t id,
   fTrackDz(-999),
   fNExMax(0),
   fTOF(0.),
+  fCoreEnergy(0.),
   fTracksMatched(),
   fNCells(0),
   fCellsAbsId(0x0),
@@ -131,6 +134,7 @@ AliAODCaloCluster::AliAODCaloCluster(const AliAODCaloCluster& clus) :
   fTrackDz(clus.fTrackDz),
   fNExMax(clus.fNExMax),
   fTOF(clus.fTOF),
+  fCoreEnergy(clus.fCoreEnergy),
   fTracksMatched(clus.fTracksMatched),
   fNCells(clus.fNCells),
   fCellsAbsId(0x0),
@@ -173,6 +177,7 @@ AliAODCaloCluster& AliAODCaloCluster::operator=(const AliAODCaloCluster& clus)
     fTrackDz=clus.fTrackDz;
     fNExMax = clus.fNExMax;
     fTOF = clus.fTOF;
+    fCoreEnergy = clus.fCoreEnergy;
     fTracksMatched = clus.fTracksMatched;
 
     fNCells= clus. fNCells;

diff --git a/STEER/AOD/AliAODCaloCluster.h b/STEER/AOD/AliAODCaloCluster.h
@@ -56,6 +56,9 @@ class AliAODCaloCluster : public AliAODCluster {
   Double_t GetTrackDz(void)const {return fTrackDz;}
   UChar_t  GetNExMax() const { return fNExMax; }
   Double_t GetTOF() const { return fTOF; }
+  Double_t GetCoreEnergy() const           {return fCoreEnergy ; }
+
+
 
   Int_t    GetNTracksMatched() const { return fTracksMatched.GetEntriesFast(); }
   TObject *GetTrackMatched(Int_t i) const { return fTracksMatched.At(i); }
@@ -87,6 +90,7 @@ class AliAODCaloCluster : public AliAODCluster {
   void SetNExMax(UChar_t nExMax) { fNExMax = nExMax; }
   void SetTOF(Double_t tof) { fTOF = tof; }
   void SetTrackDistance(Double_t dx, Double_t dz){fTrackDx=dx; fTrackDz=dz;}
+  void SetCoreEnergy(Double_t e)         { fCoreEnergy=e; }
 
   void SetCaloCluster(Double_t dist = -999., 
 		      Double_t disp = -1., 
@@ -126,14 +130,15 @@ class AliAODCaloCluster : public AliAODCluster {
   Double32_t   fTrackDz ;         // Distance to closest track in z (eta)
   UShort_t     fNExMax;           // number of (Ex-)maxima before unfolding
   Double32_t   fTOF;              ////[0,0,12] time-of-flight
+  Double32_t   fCoreEnergy;       // energy of the core of cluster
 
   TRefArray    fTracksMatched;    // references to tracks close to cluster. First entry is the most likely match.
 
   Int_t       fNCells ;
   UShort_t   *fCellsAbsId;        //[fNCells] array of cell absId numbers
   Double32_t *fCellsAmpFraction;  //[fNCells][0.,1.,16] array with cell amplitudes fraction.
 
-  ClassDef(AliAODCaloCluster,7);
+  ClassDef(AliAODCaloCluster,8);
 };
 
 #endif
diff --git a/STEER/ESD/AliESDCaloCluster.cxx b/STEER/ESD/AliESDCaloCluster.cxx
@@ -49,7 +49,8 @@ AliESDCaloCluster::AliESDCaloCluster() :
   fNExMax(0),
   fClusterType(kUndef), 
   fTOF(0.),
-  fMCEnergyFraction(0.)
+  fMCEnergyFraction(0.),
+  fCoreEnergy(0.)
 {
   //
   // The default ESD constructor 
@@ -79,7 +80,8 @@ AliESDCaloCluster::AliESDCaloCluster(const AliESDCaloCluster& clus) :
   fNExMax(clus.fNExMax),
   fClusterType(clus.fClusterType),
   fTOF(clus.fTOF),
-  fMCEnergyFraction(clus.fMCEnergyFraction)
+  fMCEnergyFraction(clus.fMCEnergyFraction),
+  fCoreEnergy(clus.fCoreEnergy)
 {
   //
   // The copy constructor 
@@ -184,6 +186,8 @@ AliESDCaloCluster &AliESDCaloCluster::operator=(const AliESDCaloCluster& source)
   }
 
   fMCEnergyFraction = source.fMCEnergyFraction;
+
+  fCoreEnergy = source.fCoreEnergy;
 
   return *this;
 

diff --git a/STEER/ESD/AliESDCaloCluster.h b/STEER/ESD/AliESDCaloCluster.h
@@ -143,6 +143,9 @@ class AliESDCaloCluster : public AliVCluster
 
   Double_t    GetMCEnergyFraction() const           { return fMCEnergyFraction ; }
   void        SetMCEnergyFraction(Double_t e)       { fMCEnergyFraction = e    ; }
+
+  virtual Double_t    GetCoreEnergy() const           {return fCoreEnergy ; }
+  virtual void        SetCoreEnergy(Double_t e)         { fCoreEnergy=e; }
 
  protected:
 
@@ -172,8 +175,9 @@ class AliESDCaloCluster : public AliVCluster
   Double_t     fTOF;               //[0,0,12] time-of-flight
 
   Double_t     fMCEnergyFraction;          //!MC energy (embedding)
+  Double32_t   fCoreEnergy;          // energy of the core of cluster
 
-  ClassDef(AliESDCaloCluster,11)  //ESDCaloCluster 
+  ClassDef(AliESDCaloCluster,12)  //ESDCaloCluster 
 
     };
 

diff --git a/STEER/STEERBase/AliVCluster.h b/STEER/STEERBase/AliVCluster.h
@@ -122,6 +122,9 @@ class AliVCluster : public TObject
   virtual Double_t    GetMCEnergyFraction() const           {return 0 ; }
   virtual void        SetMCEnergyFraction(Double_t)         { ; }
 
+  virtual Double_t    GetCoreEnergy() const           {return 0 ; }
+  virtual void        SetCoreEnergy(Double_t)         { ; }
+
   virtual void GetMomentum(TLorentzVector &/*tl*/, Double_t * /*v*/) { ; }
 
   ClassDef(AliVCluster,0)  //VCluster