Changes needed for the global track matching with PHOS (D. Peressounko)

diff --git a/STEER/AliESDCaloCluster.cxx b/STEER/AliESDCaloCluster.cxx
index 4c411ae4947a966844e701aaa118c195f622d97c..4554b97fbe8f1ba1aa136af3752f4590597fa49b 100644 (file)
--- a/STEER/AliESDCaloCluster.cxx
+++ b/STEER/AliESDCaloCluster.cxx
@@ -46,6 +46,7 @@ AliESDCaloCluster::AliESDCaloCluster() :
   fM20(0),
   fM02(0),
   fEmcCpvDistance(1024),
+  fTrackDx(1024),fTrackDz(1024),
   fDistToBadChannel(1024),
   fID(0),
   fNExMax(0),
@@ -75,6 +76,8 @@ AliESDCaloCluster::AliESDCaloCluster(const AliESDCaloCluster& clus) :
   fM20(clus.fM20),
   fM02(clus.fM02),
   fEmcCpvDistance(clus.fEmcCpvDistance),
+  fTrackDx(clus.fTrackDx),
+  fTrackDz(clus.fTrackDz),
   fDistToBadChannel(clus.fDistToBadChannel),
   fID(clus.fID),
   fNExMax(clus.fNExMax),
@@ -125,6 +128,8 @@ AliESDCaloCluster &AliESDCaloCluster::operator=(const AliESDCaloCluster& source)
   fM20 = source.fM20;
   fM02 = source.fM02;
   fEmcCpvDistance = source.fEmcCpvDistance;
+  fTrackDx= source.fTrackDx ;
+  fTrackDz= source.fTrackDz ;
   fDistToBadChannel = source.fDistToBadChannel ;
   for(Int_t i=0; i<AliPID::kSPECIESN; i++) fPID[i] = source.fPID[i];
   fID = source.fID;

diff --git a/STEER/AliESDCaloCluster.h b/STEER/AliESDCaloCluster.h
index 3fd4e5d75c8089567649143f4f6ebaf6ff816811..91e3522f8bb4e5b7d0585ba5766c421395ca412c 100644 (file)
--- a/STEER/AliESDCaloCluster.h
+++ b/STEER/AliESDCaloCluster.h
@@ -80,6 +80,9 @@ public:
 
   void SetEmcCpvDistance(Float_t dEmcCpv) { fEmcCpvDistance = dEmcCpv; }
   Double_t GetEmcCpvDistance() const       { return fEmcCpvDistance; }
+  void SetTrackDistance(Double_t dx, Double_t dz){fTrackDx=dx; fTrackDz=dz;}
+  Double_t GetTrackDx(void)const {return fTrackDx;}
+  Double_t GetTrackDz(void)const {return fTrackDz;}
 
   void SetDistanceToBadChannel(Float_t dist) {fDistToBadChannel=dist;}
   Double_t GetDistanceToBadChannel() const {return fDistToBadChannel;}
@@ -167,6 +170,9 @@ protected:
   Double32_t   fM02;              // 2-nd moment along the second eigen axis
 
   Double32_t   fEmcCpvDistance;   // the distance from PHOS EMC rec.point to the closest CPV rec.point
+  Double32_t   fTrackDx ;         // Distance to closest track in phi
+  Double32_t   fTrackDz ;         // Distance to closest track in z
+
   Double32_t   fDistToBadChannel; // Distance to nearest bad channel
   Double32_t   fPID[AliPID::kSPECIESN]; //[0,1,8]"detector response  probabilities" (for the PID)
   Int_t       fID;               // Unique Id of the cluster
@@ -174,7 +180,7 @@ protected:
   Char_t  fClusterType;      // Flag for different cluster type/versions
   Double32_t fTOF; //[0,0,12] time-of-flight
 
-  ClassDef(AliESDCaloCluster,8)  //ESDCaloCluster 
+  ClassDef(AliESDCaloCluster,9)  //ESDCaloCluster 
 };
 
 #endif 

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index 7c6b510678206680e866e0904bfd4ce0ff6c4c67..c99baee9a1eb975d1fb4371aafb9ffe3900e8d5d 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -176,7 +176,7 @@ AliESDtrack::AliESDtrack() :
   fTOFindex(-1),
   fHMPIDqn(0),
   fHMPIDcluIdx(-1),
-  fEMCALindex(kEMCALNoMatch),
+  fCaloIndex(kEMCALNoMatch),
   fHMPIDtrkTheta(0),
   fHMPIDtrkPhi(0),
   fHMPIDsignal(0),
@@ -205,6 +205,8 @@ AliESDtrack::AliESDtrack() :
   fTOFsignalRaw(0),
   fTOFsignalDz(0),
   fTOFsignalDx(0),
+  fCaloDx(0),
+  fCaloDz(0),
   fHMPIDtrkX(0),
   fHMPIDtrkY(0),
   fHMPIDmipX(0),
@@ -271,7 +273,7 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   fTOFindex(track.fTOFindex),
   fHMPIDqn(track.fHMPIDqn),
   fHMPIDcluIdx(track.fHMPIDcluIdx),
-  fEMCALindex(track.fEMCALindex),
+  fCaloIndex(track.fCaloIndex),
   fHMPIDtrkTheta(track.fHMPIDtrkTheta),
   fHMPIDtrkPhi(track.fHMPIDtrkPhi),
   fHMPIDsignal(track.fHMPIDsignal),
@@ -300,6 +302,8 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   fTOFsignalRaw(track.fTOFsignalRaw),
   fTOFsignalDz(track.fTOFsignalDz),
   fTOFsignalDx(track.fTOFsignalDx),
+  fCaloDx(track.fCaloDx),
+  fCaloDz(track.fCaloDz),
   fHMPIDtrkX(track.fHMPIDtrkX),
   fHMPIDtrkY(track.fHMPIDtrkY),
   fHMPIDmipX(track.fHMPIDmipX),
@@ -379,7 +383,7 @@ AliESDtrack::AliESDtrack(const AliVTrack *track) :
   fTOFindex(-1),
   fHMPIDqn(0),
   fHMPIDcluIdx(-1),
-  fEMCALindex(kEMCALNoMatch),
+  fCaloIndex(kEMCALNoMatch),
   fHMPIDtrkTheta(0),
   fHMPIDtrkPhi(0),
   fHMPIDsignal(0),
@@ -408,6 +412,8 @@ AliESDtrack::AliESDtrack(const AliVTrack *track) :
   fTOFsignalRaw(0),
   fTOFsignalDz(0),
   fTOFsignalDx(0),
+  fCaloDx(0),
+  fCaloDz(0),
   fHMPIDtrkX(0),
   fHMPIDtrkY(0),
   fHMPIDmipX(0),
@@ -505,7 +511,7 @@ AliESDtrack::AliESDtrack(TParticle * part) :
   fTOFindex(-1),
   fHMPIDqn(0),
   fHMPIDcluIdx(-1),
-  fEMCALindex(kEMCALNoMatch),
+  fCaloIndex(kEMCALNoMatch),
   fHMPIDtrkTheta(0),
   fHMPIDtrkPhi(0),
   fHMPIDsignal(0),
@@ -534,6 +540,8 @@ AliESDtrack::AliESDtrack(TParticle * part) :
   fTOFsignalRaw(0),
   fTOFsignalDz(0),
   fTOFsignalDx(0),
+  fCaloDx(0),
+  fCaloDz(0),
   fHMPIDtrkX(0),
   fHMPIDtrkY(0),
   fHMPIDmipX(0),
@@ -781,7 +789,7 @@ AliESDtrack &AliESDtrack::operator=(const AliESDtrack &source){
   fTOFindex      = source.fTOFindex;
   fHMPIDqn       = source.fHMPIDqn;
   fHMPIDcluIdx   = source.fHMPIDcluIdx; 
-  fEMCALindex    = source.fEMCALindex;
+  fCaloIndex    = source.fCaloIndex;
 
   for(int i = 0; i< 3;++i){
     fKinkIndexes[i] = source.fKinkIndexes[i]; 
@@ -1089,7 +1097,7 @@ void AliESDtrack::MakeMiniESDtrack(){
   fHMPIDtrkY = 0;      
   fHMPIDmipX = 0;
   fHMPIDmipY = 0;
-  fEMCALindex = kEMCALNoMatch;
+  fCaloIndex = kEMCALNoMatch;
 
   // reset global track chi2
   fGlobalChi2 = 0;

diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h
index c94bd6a920b3d9d686039dedafbddc2ed05123ff..75336db72b1b38d7a3cf1c10154e08fcf6446a2b 100644 (file)
--- a/STEER/AliESDtrack.h
+++ b/STEER/AliESDtrack.h
@@ -49,7 +49,8 @@ public:
     kTOFin=0x1000,kTOFout=0x2000,kTOFrefit=0x4000,kTOFpid=0x8000,
     kHMPIDout=0x10000,kHMPIDpid=0x20000,
     kEMCALmatch=0x40000,
-    kTRDbackup=0x80000,
+    kPHOSmatch=0x200000,
+    kTRDbackup =0x80000,
     kTRDStop=0x20000000,
     kESDpid=0x40000000,
     kTIME=0x80000000,
@@ -325,10 +326,18 @@ public:
   Bool_t  IsPureITSStandalone() const {return fFlags&kITSpureSA;}
 
 
-  Int_t GetEMCALcluster() {return fEMCALindex;}
-  void SetEMCALcluster(Int_t index) {fEMCALindex=index;}
+  Int_t GetEMCALcluster() {return fCaloIndex;}
+  void SetEMCALcluster(Int_t index) {fCaloIndex=index;}
   Bool_t IsEMCAL() const {return fFlags&kEMCALmatch;}
 
+  Int_t GetPHOScluster() {return fCaloIndex;}
+  void SetPHOScluster(Int_t index) {fCaloIndex=index;}
+  Bool_t IsPHOS() const {return fFlags&kPHOSmatch;}
+  Double_t GetPHOSdx()const{return fCaloDx ;}
+  Double_t GetPHOSdz()const{return fCaloDz ;}
+  void SetPHOSdxdz(Double_t dx, Double_t dz){fCaloDx=dx,fCaloDz=dz;}
+
+
   void SetTrackPointArray(AliTrackPointArray *points) {
     fFriendTrack->SetTrackPointArray(points);
   }
@@ -389,7 +398,7 @@ protected:
   Int_t     fTOFindex;       // index of the assigned TOF cluster
   Int_t     fHMPIDqn;         // 1000000*number of photon clusters + QDC
   Int_t     fHMPIDcluIdx;     // 1000000*chamber id + cluster idx of the assigned MIP cluster
-  Int_t     fEMCALindex;     // index of associated EMCAL cluster (AliESDCaloCluster)
+  Int_t     fCaloIndex;       // index of associated EMCAL/PHOS cluster (AliESDCaloCluster)
 
 
   Int_t     fKinkIndexes[3]; // array of indexes of posible kink candidates 
@@ -447,6 +456,9 @@ protected:
   Double32_t fTOFsignalDx;    // local x  of track's impact on the TOF pad 
   Double32_t fTOFInfo[10];    //! TOF informations
 
+  Double32_t fCaloDx ;        // [0.,0.,8] distance to calorimeter cluster in calo plain (phi direction)
+  Double32_t fCaloDz ;        // [0.,0.,8] distance to calorimeter cluster in calo plain (z direction)
+
   Double32_t fHMPIDtrkX;       // x of the track impact, LORS 
   Double32_t fHMPIDtrkY;       // y of the track impact, LORS 
   Double32_t fHMPIDmipX;       // x of the MIP in LORS
@@ -475,7 +487,7 @@ protected:
  private:
 
   AliESDtrack & operator=(const AliESDtrack & );
-  ClassDef(AliESDtrack,55)  //ESDtrack 
+  ClassDef(AliESDtrack,56)  //ESDtrack 
 };