Updated version.

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

diff --git a/EMCAL/AliEMCALv1.cxx b/EMCAL/AliEMCALv1.cxx
index 3523a2d97196c4f28805bea5ff3e93309f95c71c..52c48c1dd60a5c9ff93012286a704b3460c2bffb 100644 (file)
--- a/EMCAL/AliEMCALv1.cxx
+++ b/EMCAL/AliEMCALv1.cxx
@@ -30,6 +30,7 @@
 //  2. Timing signal is collected and added to hit
 
 // --- ROOT system ---
+#include <TClonesArray.h>
 #include <TParticle.h>
 #include <TVirtualMC.h>
 
@@ -41,6 +42,7 @@
 #include "AliEMCALGeometry.h"
 #include "AliRun.h"
 #include "AliMC.h"
+#include "AliStack.h"
 
 ClassImp(AliEMCALv1)
 
@@ -73,17 +75,6 @@ AliEMCALv1::AliEMCALv1(const char *name, const char *title)
     fIshunt     =  2; // All hits are associated with particles entering the calorimeter
 }
 
-//______________________________________________________________________
-AliEMCALv1::AliEMCALv1(const AliEMCALv1 & emcal)
-  : AliEMCALv0(emcal),
-    fCurPrimary(emcal.fCurPrimary),
-    fCurParent(emcal.fCurParent),
-    fCurTrack(emcal.fCurTrack),
-    fTimeCut(emcal.fTimeCut)
-{
-  //copy ctor
-}
-
 //______________________________________________________________________
 AliEMCALv1::~AliEMCALv1(){
     // dtor
@@ -143,6 +134,9 @@ void AliEMCALv1::StepManager(void){
   
   AliEMCALGeometry * geom = GetGeometry() ; 
 
+  TParticle *part;
+  Int_t parent;
+
   static Int_t idXPHI = gMC->VolId("XPHI");
   if(gMC->CurrentVolID(copy) == idXPHI ) { // We are in a Scintillator Layer 
     Float_t depositedEnergy ; 
@@ -153,16 +147,20 @@ void AliEMCALv1::StepManager(void){
 
       if (fCurParent==-1 || tracknumber != fCurTrack) {
        // Check parentage
-       Int_t parent=tracknumber;
+       //Int_t parent=tracknumber;
+       parent=tracknumber;
        if (fCurParent != -1) {
          while (parent != fCurParent && parent != -1) {
-           TParticle *part=gAlice->GetMCApp()->Particle(parent);
+           //TParticle *part=gAlice->GetMCApp()->Particle(parent);
+           part=gAlice->GetMCApp()->Particle(parent);
            parent=part->GetFirstMother();
          }
        }
        if (fCurParent==-1 || parent==-1) {
-         Int_t parent=tracknumber;
-         TParticle *part=gAlice->GetMCApp()->Particle(parent);
+         //Int_t parent=tracknumber;
+         //TParticle *part=gAlice->GetMCApp()->Particle(parent);
+         parent=tracknumber;
+         part=gAlice->GetMCApp()->Particle(parent);
          while (parent != -1 && geom->IsInEMCAL(part->Vx(),part->Vy(),part->Vz())) {
            parent=part->GetFirstMother();
            if (parent!=-1) 
@@ -172,7 +170,8 @@ void AliEMCALv1::StepManager(void){
          if (fCurParent==-1)
            Error("StepManager","Cannot find parent");
          else {
-           TParticle *part=gAlice->GetMCApp()->Particle(fCurParent);
+           //TParticle *part=gAlice->GetMCApp()->Particle(fCurParent);
+           part=gAlice->GetMCApp()->Particle(fCurParent);
            ienergy = part->Energy(); 
          }
          while (parent != -1) {
@@ -235,6 +234,7 @@ void AliEMCALv1::StepManager(void){
   }
 }
 
+//___________________________________________________________
 void AliEMCALv1::RemapTrackHitIDs(Int_t *map) {
   // remap track index numbers for primary and parent indices
   // (Called by AliStack::PurifyKine)
@@ -253,6 +253,7 @@ void AliEMCALv1::RemapTrackHitIDs(Int_t *map) {
   }
 }
 
+//___________________________________________________________
 void AliEMCALv1::FinishPrimary() {
   // finish primary
   fCurPrimary=-1;