ExecuteEvent()const added

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

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 23c0c49305ee8dbe4724cb99e268a497ef131d89..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 ; 
+  }
+ 
 }
 
 //____________________________________________________________________________
@@ -269,7 +277,7 @@ void AliPHOSv1::StepManager(void)
 
   Int_t          relid[4] ;           // (box, layer, row, column) indices
   Int_t          absid    ;           // absolute cell ID number
-  Float_t        xyze[5]={-1000,-1000,-1000,0,0}  ; // position wrt MRS, time and energy deposited
+  Float_t        xyzte[5]={-1000.,-1000.,-1000.,0.,0.}  ; // position wrt MRS, time and energy deposited
   TLorentzVector pos      ;           // Lorentz vector of the track current position
   Int_t          copy     ;
 
@@ -290,10 +298,10 @@ void AliPHOSv1::StepManager(void)
     for (i=0; i<3; i++) xyzm[i] = pos[i];
     gMC -> Gmtod (xyzm, xyzd, 1);    // transform coordinate from master to daughter system
     
-    Float_t        xyd[3]={0,0,0}   ;   //local posiiton of the entering
+    Float_t        xyd[3]={0,0,0}   ;   //local position of the entering
     xyd[0]  = xyzd[0];
-    xyd[1]  =-xyzd[1];
-    xyd[2]  =-xyzd[2];
+    xyd[1]  =-xyzd[2];
+    xyd[2]  =-xyzd[1];
     
     // Current momentum of the hit's track in the local ref. system
     TLorentzVector pmom     ;        //momentum of the particle initiated hit
@@ -356,10 +364,10 @@ void AliPHOSv1::StepManager(void)
       
       // add current digit to the temporary hit list
 
-      xyze[3] = gMC->TrackTime() ;
-      xyze[4] = cpvDigit->GetQpad() ;                          // amplitude in a pad
+      xyzte[3] = gMC->TrackTime() ;
+      xyzte[4] = cpvDigit->GetQpad() ;                          // amplitude in a pad
       primary = -1;                                             // No need in primary for CPV
-      AddHit(fIshunt, primary, tracknumber, absid, xyze);
+      AddHit(fIshunt, primary, tracknumber, absid, xyzte);
       
       if (cpvDigit->GetQpad() > 0.02) {
        xmean += cpvDigit->GetQpad() * (cpvDigit->GetXpad() + 0.5);
@@ -379,9 +387,9 @@ void AliPHOSv1::StepManager(void)
   if(gMC->CurrentVolID(copy) == gMC->VolId("PXTL") ) { //  We are inside a PBWO crystal
 
     gMC->TrackPosition(pos) ;
-    xyze[0] = pos[0] ;
-    xyze[1] = pos[1] ;
-    xyze[2] = pos[2] ;
+    xyzte[0] = pos[0] ;
+    xyzte[1] = pos[1] ;
+    xyzte[2] = pos[2] ;
 
     Float_t global[3], local[3] ;
     global[0] = pos[0] ;
@@ -392,7 +400,7 @@ void AliPHOSv1::StepManager(void)
     //Put in the TreeK particle entering PHOS and all its parents
     if ( gMC->IsTrackEntering() ){
       Float_t xyzd[3] ;
-      gMC -> Gmtod (xyze, xyzd, 1);    // transform coordinate from master to daughter system    
+      gMC -> Gmtod (xyzte, xyzd, 1);    // transform coordinate from master to daughter system    
       if (xyzd[1] >  GetGeometry()->GetCrystalSize(1)/2-0.002 ||
          xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2+0.002) {
        TParticle * part = 0 ; 
@@ -405,7 +413,7 @@ void AliPHOSv1::StepManager(void)
       }
     }
     if ( lostenergy != 0 ) {  // Track is inside the crystal and deposits some energy 
-      xyze[3] = gMC->TrackTime() ;     
+      xyzte[3] = gMC->TrackTime() ;     
       
       gMC->CurrentVolOffID(10, moduleNumber) ; // get the PHOS module number ;
       
@@ -422,22 +430,23 @@ void AliPHOSv1::StepManager(void)
       
       gMC->Gmtod(global, local, 1) ;
       
-      //Calculates the light yield, the number of photns produced in the
+      //Calculates the light yield, the number of photons produced in the
       //crystal 
       Float_t lightYield = gRandom->Poisson(fLightFactor * lostenergy *
                                            exp(-fLightYieldAttenuation *
                                                (local[1]+GetGeometry()->GetCrystalSize(1)/2.0 ))
                                            ) ;
+
       //Calculates de energy deposited in the crystal  
-      xyze[4] = fAPDFactor * lightYield  ;
+      xyzte[4] = fAPDFactor * lightYield  ;
       
       // add current hit to the hit list
-      //cout << "AliPHOSv1::StepManager " << primary << " " << tracknumber << endl ; 
-      AddHit(fIshunt, primary,tracknumber, absid, xyze);
+      // Info("StepManager","%d %d", primary, tracknumber) ; 
+      AddHit(fIshunt, primary,tracknumber, absid, xyzte);
       
       // fill the relevant QA Checkables
-      fQATotEner->Update( xyze[4] ) ;                                             // total energy in PHOS
-      (static_cast<AliPHOSQAFloatCheckable*>((*fQATotEnerB)[moduleNumber-1]))->Update( xyze[4] ) ; // energy in this block  
+      fQATotEner->Update( xyzte[4] ) ;                                             // total energy in PHOS
+      (static_cast<AliPHOSQAFloatCheckable*>((*fQATotEnerB)[moduleNumber-1]))->Update( xyzte[4] ) ; // energy in this block  
       
     } // there is deposited energy
   } // we are inside a PHOS Xtal
@@ -478,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();