Trigger interaction records conainer class + the corresponding raw-data reader stuff...

[u/mrichter/AliRoot.git] / PHOS / AliPHOSDebug.cxx

diff --git a/PHOS/AliPHOSDebug.cxx b/PHOS/AliPHOSDebug.cxx
index d9c8b934df0013e8f85e14a08d5a8066fd5d977b..ed5d8599683b7d03ccf35545f9db1b70dc8caaf1 100644 (file)
--- a/PHOS/AliPHOSDebug.cxx
+++ b/PHOS/AliPHOSDebug.cxx
@@ -44,10 +44,9 @@
 #include "AliPHOSv1.h"
 #include "AliPHOSHit.h"
 #include "AliPHOSDigit.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 #include "AliRun.h"
 #include "AliConst.h"
-#include "AliMC.h"
 
 ClassImp(AliPHOSv1)
 
@@ -98,7 +97,7 @@ AliPHOSv0(name,title)
 }
 
 //____________________________________________________________________________
-AliPHOSv1::AliPHOSv1(AliPHOSReconstructioner * Reconstructioner, const char *name, const char *title):
+AliPHOSv1::AliPHOSv1(AliPHOSReconstructor * Reconstructioner, const char *name, const char *title):
   AliPHOSv0(name,title)
 {
   // ctor : title is used to identify the layout
@@ -431,7 +430,7 @@ void AliPHOSv1::MakeBranch(Option_t* opt, char *file)
 }
 
 //_____________________________________________________________________________
-void AliPHOSv1::Reconstruction(AliPHOSReconstructioner * Reconstructioner)
+void AliPHOSv1::Reconstruction(AliPHOSReconstructor * Reconstructioner)
 { 
   // 1. Reinitializes the existing RecPoint, TrackSegment, and RecParticles Lists and 
   // 2. Creates TreeR with a branch for each list
@@ -546,7 +545,8 @@ void AliPHOSv1::StepManager(void)
 
     // Yuri Kharlov, 28 September 2000
 
-    if( gMC->CurrentVolID(copy) == gMC->VolId("PCPQ") &&
+    static Int_t idPCPQ = gMC->VolId("PCPQ");
+    if( gMC->CurrentVolID(copy) == idPCPQ &&
        entered &&
        gMC->TrackCharge() != 0) {