removed obsolete refeference to ppsd

diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx
index a2cf6ce00bc17e7eda349e2b7a2eb1057154c7bf..3319bd4826860bb0c2b89a039c5e880f375b25cd 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.cxx
+++ b/PHOS/AliPHOSTrackSegment.cxx
@@ -16,8 +16,8 @@
 //_________________________________________________________________________
 //  Track segment in PHOS
 //  Can be : 1 EmcRecPoint
-//           1 EmcRecPoint + 1 PPSD
-//           1 EmcRecPoint + 1 PPSD + 1 PPSD     
+//           1 EmcRecPoint + 1 CPV
+//           1 EmcRecPoint + 1 CPV + 1 charged track
 //                  
 //*-- Author:  Dmitri Peressounko (RRC KI & SUBATECH)
 
@@ -29,12 +29,13 @@
 // --- AliRoot header files ---
 #include "AliPHOSEmcRecPoint.h" 
 #include "AliPHOSTrackSegment.h" 
+#include "AliESDtrack.h" 
 
 ClassImp(AliPHOSTrackSegment)
 
 //____________________________________________________________________________
 AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , 
-                                         AliPHOSRecPoint * ppsdrp1)
+                                         AliPHOSRecPoint * cpvrp1)
 {
   // ctor
 
@@ -43,11 +44,34 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc ,
   else 
     fEmcRecPoint = -1 ;
 
-  if( ppsdrp1 )  
-    fPpsdUpRecPoint = ppsdrp1->GetIndexInList() ;
+  if( cpvrp1 )  
+    fCpvRecPoint = cpvrp1->GetIndexInList() ;
  else 
-    fPpsdUpRecPoint = -1 ;
+    fCpvRecPoint = -1 ;
 
+  fTrack = -1 ; 
+
+  fIndexInList = -1 ;
+}
+
+//____________________________________________________________________________
+AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , 
+                                         AliPHOSRecPoint * cpvrp1, 
+                                         Int_t track)
+{
+  // ctor
+
+  if( emc )   
+    fEmcRecPoint =  emc->GetIndexInList() ;
+  else 
+    fEmcRecPoint = -1 ;
+
+  if( cpvrp1 )  
+    fCpvRecPoint = cpvrp1->GetIndexInList() ;
+ else 
+    fCpvRecPoint = -1 ;
+  
+  fTrack = track ; 
 
   fIndexInList = -1 ;
 }
@@ -69,9 +93,11 @@ void AliPHOSTrackSegment::Copy(TObject & obj)
 
    TObject::Copy(obj) ;
    ( (AliPHOSTrackSegment &)obj ).fEmcRecPoint     = fEmcRecPoint ; 
-   ( (AliPHOSTrackSegment &)obj ).fPpsdUpRecPoint  = fPpsdUpRecPoint ; 
+   ( (AliPHOSTrackSegment &)obj ).fCpvRecPoint     = fCpvRecPoint ; 
    ( (AliPHOSTrackSegment &)obj ).fIndexInList     = fIndexInList ; 
-}
+   ( (AliPHOSTrackSegment &)obj ).fTrack           = fTrack ;
+} 
+
 
 //____________________________________________________________________________
 void AliPHOSTrackSegment::Print() const
@@ -79,25 +105,26 @@ void AliPHOSTrackSegment::Print() const
   // Print all information on this track Segment
   
 
-  Info("Print", "--------AliPHOSTrackSegment-------- ");
-  Info("Print", "Stored at position %d", fIndexInList) ;
-  Info("Print", "Emc RecPoint #     %d", fEmcRecPoint) ;
-  if(fPpsdUpRecPoint >= 0)
-    Info("Print", "CPV RecPoint #     %d", fPpsdUpRecPoint) ;
+  Info("Print", "");
+  printf("Stored at position %d\n", fIndexInList) ;
+  printf(" Emc RecPoint #     %d\n", fEmcRecPoint) ;
+  if(fCpvRecPoint >= 0)
+    printf(" CPV RecPoint #     %d\n", fCpvRecPoint) ;
   else
-    Info("Print", "No CPV RecPoint ");
-
-  
-  Info("Print", "------------------------------------ ") ; 
-  
+    printf(" No CPV RecPoint\n");
+  if (fTrack >= 0) 
+    printf(" Charged track #     %d\n", fTrack) ;
+  else
+    printf(" No Charged track\n");
 }
+
 //____________________________________________________________________________
-void AliPHOSTrackSegment::SetCpvRecPoint(AliPHOSRecPoint * PpsdUpRecPoint) 
+void AliPHOSTrackSegment::SetCpvRecPoint(AliPHOSRecPoint * cpvRecPoint) 
 {
   // gives an id from its position in the list
-  if( PpsdUpRecPoint )  
-    fPpsdUpRecPoint = PpsdUpRecPoint->GetIndexInList() ;
+  if( cpvRecPoint )  
+    fCpvRecPoint = cpvRecPoint->GetIndexInList() ;
  else 
-    fPpsdUpRecPoint = -1 ;
+    fCpvRecPoint = -1 ;
 }
 

diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h
index 8b691e76783eace3a60a9cc875708ae8ad306920..5ca84e5588a20fbec5901e30caf389f32ef67048 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.h
+++ b/PHOS/AliPHOSTrackSegment.h
@@ -8,8 +8,7 @@
 //_________________________________________________________________________
 //  Track segment in PHOS
 //  Can be : 1 EmcRecPoint
-//           1 EmcRecPoint + 1 PPSD
-//           1 EmcRecPoint + 1 PPSD + 1 PPSD     
+//           1 EmcRecPoint + 1 CPV
 //                  
 //*-- Author:  Dmitri Peressounko (RRC KI & SUBATECH)
 
@@ -24,6 +23,7 @@ class TClonesArray ;
 class AliPHOSRecPoint ; 
 class AliPHOSEmcRecPoint ; 
 class AliPHOSCpvRecPoint ; 
+class AliESDtrack ; 
 
 class AliPHOSTrackSegment : public TObject  {
 
@@ -31,7 +31,9 @@ public:
 
   AliPHOSTrackSegment() {} 
   AliPHOSTrackSegment(AliPHOSEmcRecPoint * EmcRecPoint , 
-                     AliPHOSRecPoint * PpsdUp) ;
+                     AliPHOSRecPoint * Cpv) ;
+  AliPHOSTrackSegment(AliPHOSEmcRecPoint * EmcRecPoint , 
+                     AliPHOSRecPoint * Cpv, Int_t track) ;
   AliPHOSTrackSegment(const AliPHOSTrackSegment & ts) ;  // ctor                   
   virtual ~AliPHOSTrackSegment() {  } 
 
@@ -39,11 +41,12 @@ public:
 
   Int_t   GetIndexInList() const {  return fIndexInList ;   } 
   Int_t   GetEmcIndex()    const {  return fEmcRecPoint ;   }
-  Int_t   GetCpvIndex()    const {  return fPpsdUpRecPoint; }
+  Int_t   GetCpvIndex()    const {  return fCpvRecPoint; }
+  Int_t   GetTrackIndex()  const {  return fTrack; }
 
   virtual void  Print() const;
   void    SetIndexInList(Int_t val){ fIndexInList = val ;     } 
-  void    SetCpvRecPoint(AliPHOSRecPoint * PpsdUpRecPoint ); //sets PPSD up Rec Point
+  void    SetCpvRecPoint(AliPHOSRecPoint * CpvRecPoint ); //sets CPV Rec Point
 
   typedef TClonesArray TrackSegmentsList ; 
  
@@ -51,8 +54,9 @@ public:
   
   Int_t fEmcRecPoint ;     // The EMC reconstructed point index in array stored in TreeR/PHOSEmcRP
   Int_t fIndexInList ;     // the index of this TrackSegment in the list stored in TreeR (to be set by analysis)
-  Int_t fPpsdUpRecPoint ;  // The CPV reconstructed point from the upper layer index in array stored in TreeR/PHOSPpsdRP
-  
+  Int_t fCpvRecPoint ;     // The CPV reconstructed point in array stored in TreeR/PHOSCpvRP
+  Int_t fTrack ;           // The charged track index (from global tracking) in ESD file 
+
   ClassDef(AliPHOSTrackSegment,1)  // Track segment in PHOS
 
 };

diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h
index f4d06c1d28dc0153d24e068a73bfaa7e8870ae4f..fb40764ad7bf6d2d850e6d7f74958feb2806a686 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.h
+++ b/PHOS/AliPHOSTrackSegmentMaker.h
@@ -7,7 +7,7 @@
 
 //_________________________________________________________________________
 // Algorithm Base class to construct PHOS track segments
-// Associates EMC and PPSD clusters
+// Associates EMC and CPV clusters
 // Unfolds the EMC cluster   
 //                  
 //*-- Author: Dmitri Peressounko (RRC Kurchatov Institute  & SUBATECH)