X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSHit.cxx;h=5e9376b39cc7aaa4dace0441a230c187c5ffb940;hb=4a33489cda6ee70e8a1901181cee6a789618f79e;hp=3c06402ab1a70b524f183dfdabc6f4828ca91612;hpb=a8c47ab60ad997f04fe8b6319252c3e891625397;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSHit.cxx b/PHOS/AliPHOSHit.cxx
index 3c06402ab1a..5e9376b39cc 100644
--- a/PHOS/AliPHOSHit.cxx
+++ b/PHOS/AliPHOSHit.cxx
@@ -24,36 +24,22 @@
 // --- ROOT system ---
 
 // --- Standard library ---
-#include <string.h>
-#include <stdlib.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSHit.h"
-#include "AliRun.h"
-#include "AliConst.h"
-#include "AliPHOSLoader.h"
-#include "AliPHOSGeometry.h"
-#include "AliPHOS.h"
 
 ClassImp(AliPHOSHit)
   
   //____________________________________________________________________________
-  AliPHOSHit::AliPHOSHit(const AliPHOSHit & hit) : AliHit(hit)
+AliPHOSHit::AliPHOSHit(const AliPHOSHit & hit) :
+  AliHit(hit),fId(hit.fId),fELOS(hit.fELOS),fTime(hit.fTime)
 {
   // copy ctor
-  fX       = hit.fX ; 
-  fY       = hit.fY ; 
-  fZ       = hit.fZ ; 
-  fId      = hit.fId ; 
-  fELOS    = hit.fELOS ;
-  fPrimary = hit.fPrimary ; 
-  fTrack   = hit.fTrack ; 
-  fTime    = hit.fTime  ;
-  
 } 
 
 //____________________________________________________________________________
-AliPHOSHit::AliPHOSHit(Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits): AliHit(shunt, track)
+AliPHOSHit::AliPHOSHit(Int_t shunt, Int_t track, Int_t id, Float_t *hits) : 
+  AliHit(shunt, track),fId(0),fELOS(0),fTime(0)
 {
   //
   // Create a CPV hit object
@@ -65,49 +51,6 @@ AliPHOSHit::AliPHOSHit(Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_
   fTime       = hits[3] ;
   fId         = id ;
   fELOS       = hits[4] ;
-  fPrimary    = primary ;
-}
-//____________________________________________________________________________
-Float_t AliPHOSHit::X() const
-{
-  //  if(fX < -1000.){
-    TVector3  pos ;
-    AliPHOS * phos = static_cast<AliPHOS*> (gAlice->GetDetector("PHOS")) ;
-    phos->GetGeometry() ->RelPosInAlice(GetId(),  pos) ;
-    return pos.X() ;
-    //    fX = pos.X() ;
-    //    fY = pos.Y() ;
-    //    fZ = pos.Z() ;
-    //  }
-    //  return fX;
-}
-//____________________________________________________________________________
-Float_t AliPHOSHit::Y() const
-{
-  //  if(fY < -1000.){
-    TVector3  pos ;
-    AliPHOS * phos = static_cast<AliPHOS*> (gAlice->GetDetector("PHOS")) ;
-    phos->GetGeometry() ->RelPosInAlice(GetId(),  pos) ;
-    return pos.Y(); 
-    //    fX = pos.X() ;
-    //    fY = pos.Y() ;
-    //    fZ = pos.Z() ;
-    //  }
-    //  return fY;
-}
-//____________________________________________________________________________
-Float_t AliPHOSHit::Z() const
-{
-  //  if(fY < -1000.){
-    TVector3  pos ;
-    AliPHOS * phos = static_cast<AliPHOS*> (gAlice->GetDetector("PHOS")) ;
-    phos->GetGeometry() ->RelPosInAlice(GetId(),  pos) ;
-    return pos.Z() ;
-    //    fX = pos.X() ;
-    //    fY = pos.Y() ;
-    //    fZ = pos.Z() ;
-    //  }
-    //  return fZ;
 }
 //____________________________________________________________________________
 Bool_t AliPHOSHit::operator==(AliPHOSHit const &rValue) const
@@ -116,7 +59,7 @@ Bool_t AliPHOSHit::operator==(AliPHOSHit const &rValue) const
 
   Bool_t rv = kFALSE ; 
 
-  if ( (fId == rValue.GetId()) && ( fPrimary == rValue.GetPrimary() ) )
+  if ( (fId == rValue.GetId()) && ( fTrack == rValue.GetPrimary() ) )
     rv = kTRUE;
   
   return rv;
@@ -136,15 +79,3 @@ AliPHOSHit AliPHOSHit::operator+(const AliPHOSHit &rValue)
 
 }
 
-//____________________________________________________________________________
-ostream& operator << (ostream& out, const AliPHOSHit& hit) 
-{
-  // Print out Id and energy 
-  
-  //out << "AliPHOSHit = " << hit.GetId() << " " << hit.GetEnergy() << "  " << hit.GetTime() << endl ;
-  Warning("operator <<", "Implement differently") ; 
-  return out ;
-}
-
-
-