Return to the original methods from AliLoader (Marco)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALHit.cxx

diff --git a/EMCAL/AliEMCALHit.cxx b/EMCAL/AliEMCALHit.cxx
index ece99a2088ff1fbc99d56c9b2503d2ac7ad0a1e2..d3d6a7d18885878fea2d137a317fbfb7a8e6858b 100644 (file)
--- a/EMCAL/AliEMCALHit.cxx
+++ b/EMCAL/AliEMCALHit.cxx
@@ -1,4 +1,4 @@
-/**************************************************************************
+ /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -17,27 +17,18 @@
 
 //_________________________________________________________________________
 //  Hits class for EMCAL    
-//  A hit in EMCAL is the sum of all hits in a single segment
-//  from a single enterring particle             
+//  A hit in EMCAL is the sum of all hits in a tower
+//  from a single entering particle             
 //*-- Author: Sahal Yacoob (LBL / UCT)
 // Based on AliPHOSHit
 
 // --- Standard library ---
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <strstream.h>
-#include <iostream.h>
+#include <Riostream.h>
 
 // --- ROOT system ---
-#include <TLorentzVector.h>
 
 // --- AliRoot header files ---
 #include "AliEMCALHit.h"
-#include "AliRun.h"
-#include "AliConst.h"
-#include "AliEMCALGeometry.h"
-#include "AliEMCALGetter.h"
 
 ClassImp(AliEMCALHit)
 
@@ -53,15 +44,15 @@ AliEMCALHit::AliEMCALHit(){
     fX       = 0.0;
     fY       = 0.0;
     fZ       = 0.0;
-    fPx       = 0.0;
-    fPy       = 0.0;
-    fPz       = 0.0;
-    fPe       = 0.0;
+    fPx      = 0.0;
+    fPy      = 0.0;
+    fPz      = 0.0;
+    fPe      = 0.0;
     fIparent = 0;
     fIenergy = 0.0;
 }
 //______________________________________________________________________
-AliEMCALHit::AliEMCALHit(const AliEMCALHit & hit){
+AliEMCALHit::AliEMCALHit(const AliEMCALHit & hit) : AliHit(hit){
     // copy ctor
    
     fId      = hit.fId ; 
@@ -100,24 +91,13 @@ AliEMCALHit::AliEMCALHit(Int_t shunt, Int_t primary, Int_t track,Int_t iparent,
     fIenergy    = ienergy;
 }
 
-//______________________________________________________________________
-const Bool_t AliEMCALHit::IsInPreShower() const 
-{
-  Bool_t rv = kFALSE ;
-  
-  const AliEMCALGeometry * geom = AliEMCALGetter::GetInstance()->EMCALGeometry() ;
-  if((GetId()/geom->GetNPhi()) < (2*geom->GetNZ())) 
-    rv = kTRUE; 
-  return rv; 
-} 
-
 //______________________________________________________________________
 Bool_t AliEMCALHit::operator==(AliEMCALHit const &rValue) const{ 
     // Two hits are identical if they have the same Id and originat
     // from the same enterring Particle 
     Bool_t rv = kFALSE;
 
-    if ( (fId == rValue.GetId()) && ( fIparent == rValue.GetIparent()) )
+    if ( (fId == rValue.GetId()) && ( fIparent == rValue.GetIparent()))
        rv = kTRUE;
 
     return rv;