Removing AliMC and AliMCProcess

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

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 5975ba27d06aa300facbfb8740cc8ef6b0b73a16..9eda05841bb5775d87c9949cbbb91e6ffef00eb5 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -40,10 +40,8 @@
 
 // --- Standard library ---
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <strstream.h>
 
 // --- AliRoot header files ---
 
@@ -52,7 +50,6 @@
 #include "AliPHOSCPVDigit.h"
 #include "AliRun.h"
 #include "AliConst.h"
-#include "AliMC.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSQAIntCheckable.h"
 #include "AliPHOSQAFloatCheckable.h"
@@ -132,8 +129,10 @@ AliPHOSv1::AliPHOSv1(const char *name, const char *title):
   // create checkables 
   fQAHitsMul   = new AliPHOSQAIntCheckable("HitsM") ; 
   fQATotEner   = new AliPHOSQAFloatCheckable("TotEn") ; 
-  fQAHitsMulB  = new TClonesArray("AliPHOSQAIntCheckable",nb) ; 
+  fQAHitsMulB  = new TClonesArray("AliPHOSQAIntCheckable",nb) ;
+  fQAHitsMulB->SetOwner() ; 
   fQATotEnerB  = new TClonesArray("AliPHOSQAFloatCheckable", nb); 
+  fQATotEnerB->SetOwner() ; 
   char tempo[20]  ; 
   Int_t i ; 
   for ( i = 0 ; i < nb ; i++ ) {
@@ -168,8 +167,17 @@ AliPHOSv1::~AliPHOSv1()
     delete fHits ;
     fHits = 0 ; 
   }
-  if (fTreeQA) 
-    delete fTreeQA ; 
+  
+  if ( fQAHitsMulB ) {
+    fQAHitsMulB->Delete() ;
+    delete fQAHitsMulB ; 
+  }
+
+  if ( fQATotEnerB ) {
+    fQATotEnerB->Delete() ;
+    delete fQATotEnerB ; 
+  }
+ 
 }
 
 //____________________________________________________________________________
@@ -433,7 +441,7 @@ void AliPHOSv1::StepManager(void)
       xyzte[4] = fAPDFactor * lightYield  ;
       
       // add current hit to the hit list
-      //cout << "AliPHOSv1::StepManager " << primary << " " << tracknumber << endl ; 
+      // Info("StepManager","%d %d", primary, tracknumber) ; 
       AddHit(fIshunt, primary,tracknumber, absid, xyzte);
       
       // fill the relevant QA Checkables
@@ -479,7 +487,7 @@ void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, Int_t moduleNumbe
   Float_t pNorm = p.Py();
   Float_t eloss = kdEdx;
 
-//    cout << "CPVDigitize: YVK : "<<hitX<<" "<<hitZ<<" | "<<pX<<" "<<pZ<<" "<<pNorm<<endl;
+//Info("CPVDigitize", "YVK : %f %f | %f %f %d", hitX, hitZ, pX, pZ, pNorm) ;
 
   Float_t dZY   = pZ/pNorm * GetGeometry()->GetCPVGasThickness();
   Float_t dXY   = pX/pNorm * GetGeometry()->GetCPVGasThickness();