X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSTrackSegment.cxx;h=5eef0c31f92545c2eb51c18fd5379abf6ca293ab;hb=59d1837aa8d64fc2ecf1d29771f6ad509bf8091e;hp=fa359cd08212868b176e62d3ec3b62b4e8223bfc;hpb=702ab87e845509d9379dca12e47c7e8a37eba7f6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx
index fa359cd0821..5eef0c31f92 100644
--- a/PHOS/AliPHOSTrackSegment.cxx
+++ b/PHOS/AliPHOSTrackSegment.cxx
@@ -17,6 +17,12 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.30  2006/08/28 10:01:56  kharlov
+ * Effective C++ warnings fixed (Timur Pocheptsov)
+ *
+ * Revision 1.29  2005/05/28 14:19:05  schutz
+ * Compilation warnings fixed by T.P.
+ *
  */
 
 //_________________________________________________________________________
@@ -36,12 +42,29 @@
 #include "AliPHOSEmcRecPoint.h" 
 #include "AliPHOSTrackSegment.h" 
 #include "AliESDtrack.h" 
+#include "AliLog.h" 
 
 ClassImp(AliPHOSTrackSegment)
 
+//____________________________________________________________________________
+AliPHOSTrackSegment::AliPHOSTrackSegment()
+			: fEmcRecPoint(0),
+			  fIndexInList(0),
+			  fCpvRecPoint(0),
+			  fTrack(0)
+{
+  //def ctor
+  fDcpv[0]=999. ;
+  fDcpv[1]=999. ;
+}
+
 //____________________________________________________________________________
 AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , 
 					  AliPHOSRecPoint * cpvrp1)
+			: fEmcRecPoint(0),
+			  fIndexInList(0),
+			  fCpvRecPoint(0),
+			  fTrack(0)
 {
   // ctor
 
@@ -58,12 +81,18 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc ,
   fTrack = -1 ; 
 
   fIndexInList = -1 ;
+  fDcpv[0]=999. ;
+  fDcpv[1]=999. ;
 }
 
 //____________________________________________________________________________
 AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , 
 					  AliPHOSRecPoint * cpvrp1, 
 					  Int_t track)
+			: fEmcRecPoint(0),
+			  fIndexInList(0),
+			  fCpvRecPoint(0),
+			  fTrack(0)
 {
   // ctor
 
@@ -80,11 +109,46 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc ,
   fTrack = track ; 
 
   fIndexInList = -1 ;
+  fDcpv[0]=999. ;
+  fDcpv[1]=999. ;
+}
+
+//____________________________________________________________________________
+AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , 
+					  AliPHOSRecPoint * cpvrp1, 
+					  Int_t track, Float_t dx,Float_t dz)
+			: fEmcRecPoint(0),
+			  fIndexInList(0),
+			  fCpvRecPoint(0),
+			  fTrack(0)
+{
+  // ctor
+
+  if( emc )   
+    fEmcRecPoint =  emc->GetIndexInList() ;
+  else 
+    fEmcRecPoint = -1 ;
+
+  if( cpvrp1 )  
+    fCpvRecPoint = cpvrp1->GetIndexInList() ;
+ else 
+    fCpvRecPoint = -1 ;
+  
+  fTrack = track ; 
+
+  fIndexInList = -1 ;
+
+  fDcpv[0] = dx ;
+  fDcpv[1] = dz ;
 }
 
 //____________________________________________________________________________
 AliPHOSTrackSegment::AliPHOSTrackSegment( const AliPHOSTrackSegment & ts) 
-  : TObject(ts)
+  : TObject(ts),
+    fEmcRecPoint(0),
+    fIndexInList(0),
+    fCpvRecPoint(0),
+    fTrack(0)
 {
   // Copy ctor
 
@@ -92,6 +156,13 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( const AliPHOSTrackSegment & ts)
 }
 
 
+//____________________________________________________________________________
+AliPHOSTrackSegment & AliPHOSTrackSegment::operator = (const AliPHOSTrackSegment &)
+{
+  Fatal("operator =", "not implemented");
+  return *this;
+}
+
 //____________________________________________________________________________
 void AliPHOSTrackSegment::Copy(TObject & obj) const
 {
@@ -102,6 +173,8 @@ void AliPHOSTrackSegment::Copy(TObject & obj) const
    ( (AliPHOSTrackSegment &)obj ).fCpvRecPoint     = fCpvRecPoint ; 
    ( (AliPHOSTrackSegment &)obj ).fIndexInList     = fIndexInList ; 
    ( (AliPHOSTrackSegment &)obj ).fTrack           = fTrack ;
+   ( (AliPHOSTrackSegment &)obj ).fDcpv[0]         = fDcpv[0] ;
+   ( (AliPHOSTrackSegment &)obj ).fDcpv[1]         = fDcpv[1] ;
 } 
 
 
@@ -111,7 +184,7 @@ void AliPHOSTrackSegment::Print(const Option_t *) const
   // Print all information on this track Segment
   
 
-  Info("Print", "");
+  AliInfo("Track segment");
   printf("Stored at position %d\n", fIndexInList) ;
   printf(" Emc RecPoint #     %d\n", fEmcRecPoint) ;
   if(fCpvRecPoint >= 0)
@@ -122,6 +195,7 @@ void AliPHOSTrackSegment::Print(const Option_t *) const
     printf(" Charged track #     %d\n", fTrack) ;
   else
     printf(" No Charged track\n");
+  printf(" Distance to CPV: x=%f, z=%f\n",fDcpv[0],fDcpv[1]) ;
 }
 
 //____________________________________________________________________________
@@ -133,4 +207,12 @@ void AliPHOSTrackSegment::SetCpvRecPoint(AliPHOSRecPoint * cpvRecPoint)
  else 
     fCpvRecPoint = -1 ;
 }
+//____________________________________________________________________________
+Float_t AliPHOSTrackSegment::GetCpvDistance(const Option_t* dr) const
+{
+ if(strcmp(dr,"x")==0||strcmp(dr,"X")==0) return fDcpv[0] ; 
+ if(strcmp(dr,"z")==0||strcmp(dr,"Z")==0) return fDcpv[1] ; 
+ if(strcmp(dr,"r")==0||strcmp(dr,"R")==0) return TMath::Sqrt(fDcpv[0]*fDcpv[0]+fDcpv[1]*fDcpv[1]) ; 
+ return 999. ;
 
+}