bag in AliPHOS::StepMamager fixed, AliPHOSCPVModule.* removed

diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx
index a08a314580d648e77e2358873b11119793de496d..c9f919ecd29650164d842349fd5bbd627dd0ed18 100644 (file)
--- a/PHOS/AliPHOSAnalyze.cxx
+++ b/PHOS/AliPHOSAnalyze.cxx
@@ -54,7 +54,6 @@
 #include "AliPHOSRecParticle.h"
 #include "AliPHOSIndexToObject.h"
 #include "AliPHOSHit.h"
-#include "AliPHOSCPVHit.h"
 #include "AliPHOSCpvRecPoint.h"
 
 ClassImp(AliPHOSAnalyze)

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 37deb15e32d082a5a3692ff74e0ff8c087ca84d9..f4e066f5acd98ceb61622f4961dfcc934683e740 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -61,9 +61,6 @@ ClassImp(AliPHOSv1)
 AliPHOSv1::AliPHOSv1()
 {
   // ctor
-
-  // Create an empty array of AliPHOSCPVModule to satisfy
-  // AliPHOSv1::Streamer when reading root file
  
   fReconstructioner  = 0;
   fTrackSegmentMaker = 0;
@@ -519,7 +516,7 @@ void AliPHOSv1::StepManager(void)
   Int_t          absid    ;           // absolute cell ID number
   Float_t        xyze[4]={0,0,0,0}  ; // position wrt MRS and energy deposited
   TLorentzVector pos      ;           // Lorentz vector of the track current position
-  TLorentzVector pmom = 0    ;        //momentum of the particle initiated hit
+  TLorentzVector pmom     ;        //momentum of the particle initiated hit
   Float_t        xyd[3]={0,0,0}   ;   //local posiiton of the entering
   Bool_t         entered = kFALSE ;  
   Int_t          copy     ;

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index c5d286349c8a481714eb4093d0c7d4e5a5f7c0c3..f5708ccb9a26e6ca6b9517861b782be44c51d1f4 100644 (file)
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -21,8 +21,6 @@ class TFile;
 #include "AliPHOSReconstructioner.h"
 #include "AliPHOSTrackSegmentMaker.h"
 #include "AliPHOSPID.h"
-#include "AliPHOSCPVModule.h"
-#include "AliPHOSCPVHit.h"
 #include "AliPHOSCPVDigit.h"
 
 class AliPHOSv1 : public AliPHOSv0 {

diff --git a/PHOS/AliPHOSv3.cxx b/PHOS/AliPHOSv3.cxx
index 87a718c13fcf2ca6c5c3ba457d51419911bb52e8..e68ac8a7dc8e3c8fd5d05afa897a93342e7a4e2a 100644 (file)
--- a/PHOS/AliPHOSv3.cxx
+++ b/PHOS/AliPHOSv3.cxx
@@ -103,12 +103,12 @@ void AliPHOSv3::StepManager(void)
 //    if (gMC->IsTrackExiting())
 //      cout << "Track leaves the volume " << gMC->CurrentVolName() << endl;
 
-  Int_t          relid[4] ;      // (box, layer, row, column) indices
-  Int_t          absid    ;      // absolute cell ID number
+  Int_t          relid[4] ;        // (box, layer, row, column) indices
+  Int_t          absid    ;        // absolute cell ID number
   Float_t        xyze[4]={0,0,0,0}  ; // position wrt MRS and energy deposited
-  TLorentzVector pos      ;      // Lorentz vector of the track current position
-  TLorentzVector pmom     ;      //momentum of the particle initiated hit
-  Float_t        xyd[2]   ;      //local posiiton of the entering
+  TLorentzVector pos      ;        // Lorentz vector of the track current position
+  TLorentzVector pmom     ;        //momentum of the particle initiated hit
+  Float_t        xyd[2]={0,0}   ;  //local posiiton of the entering
   Bool_t         entered = kFALSE    ;  
   Int_t          copy     ;
 

diff --git a/PHOS/Makefile b/PHOS/Makefile
index 1c4d8acaccdf977f2b77058dc9f7565269749d27..58e2a5d003cd80cedc4f16b770c5e8565bdf7d44 100644 (file)
--- a/PHOS/Makefile
+++ b/PHOS/Makefile
@@ -16,8 +16,7 @@ SRCS          =  AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \
                 AliPHOSEMCAGeometry.cxx \
                 AliPHOSCPVGeometry.cxx AliPHOSCPVBaseGeometry.cxx \
                 AliPHOSPPSDGeometry.cxx AliPHOSSupportGeometry.cxx \
-                AliPHOSCPVModule.cxx AliPHOSCPVDigit.cxx \
-                 AliPHOSDigit.cxx  \
+                AliPHOSCPVDigit.cxx AliPHOSDigit.cxx  \
                  AliPHOSRecPoint.cxx AliPHOSEmcRecPoint.cxx \
                 AliPHOSPpsdRecPoint.cxx AliPHOSCpvRecPoint.cxx \
                 AliPHOSClusterizer.cxx AliPHOSClusterizerv1.cxx  AliPHOSLink.cxx \

diff --git a/PHOS/PHOSLinkDef.h b/PHOS/PHOSLinkDef.h
index 574c21f9accb843a74d2198ec5e6492212ceacde..99839d2410d3f2a201211c18a83bd25224c69eaa 100644 (file)
--- a/PHOS/PHOSLinkDef.h
+++ b/PHOS/PHOSLinkDef.h
@@ -35,7 +35,6 @@
 #pragma link C++ class AliPHOSCPVGeometry+;
 #pragma link C++ class AliPHOSPPSDGeometry+;
 #pragma link C++ class AliPHOSSupportGeometry+;
-#pragma link C++ class AliPHOSCPVModule+;
 #pragma link C++ class AliPHOSCPVDigit+;
 
 #endif