Bug correction

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

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 97fd93fb16526fcd0ba6938b6bc07aced910d0bb..d8cc5f0d9dce57d17248f06ca5f0f7242fca3997 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -27,22 +27,13 @@
 
 
 // --- ROOT system ---
-
-#include <TBRIK.h>
-#include <TNode.h>
 #include <TParticle.h>
-#include <TRandom.h>
-#include <TTree.h>
 #include <TVirtualMC.h>
 
 // --- Standard library ---
 
-#include <string.h>
-#include <stdlib.h>
 
 // --- AliRoot header files ---
-
-#include "AliConst.h"
 #include "AliPHOSCPVDigit.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSHit.h"
@@ -51,6 +42,7 @@
 #include "AliPHOSQAMeanChecker.h"
 #include "AliPHOSv1.h"
 #include "AliRun.h"
+#include "AliMC.h"
 
 ClassImp(AliPHOSv1)
 
@@ -94,7 +86,7 @@ AliPHOSv1::AliPHOSv1(const char *name, const char *title):
   // and the TreeD at the end of the event (branch is set in FinishEvent() ). 
   
   fHits= new TClonesArray("AliPHOSHit",1000) ;
-  gAlice->AddHitList(fHits) ; 
+  gAlice->GetMCApp()->AddHitList(fHits) ; 
 
   fNhits = 0 ;
 
@@ -176,6 +168,21 @@ AliPHOSv1::~AliPHOSv1()
  
 }
 
+//____________________________________________________________________________
+void AliPHOSv1::Copy(AliPHOSv1 & phos)
+{
+  TObject::Copy(phos) ; 
+  AliPHOSv0::Copy(phos) ; 
+  phos.fLightYieldMean         = fLightYieldMean ; 
+  phos.fIntrinsicPINEfficiency = fIntrinsicPINEfficiency ; 
+  phos.fLightYieldAttenuation  = fLightYieldAttenuation ; 
+  phos.fRecalibrationFactor    = fRecalibrationFactor ; 
+  phos.fElectronsPerGeV        = fElectronsPerGeV ; 
+  phos.fAPDGain                = fAPDGain ; 
+  phos.fLightFactor            = fLightFactor ; 
+  phos.fAPDFactor              = fAPDFactor ; 
+}
+
 //____________________________________________________________________________
 void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t Id, Float_t * hits)
 {
@@ -280,12 +287,13 @@ void AliPHOSv1::StepManager(void)
   TLorentzVector pos      ;           // Lorentz vector of the track current position
   Int_t          copy     ;
 
-  Int_t tracknumber =  gAlice->GetCurrentTrackNumber() ; 
+  Int_t tracknumber =  gAlice->GetMCApp()->GetCurrentTrackNumber() ; 
   TString name      =  GetGeometry()->GetName() ; 
 
   Int_t moduleNumber ;
   
-  if( gMC->CurrentVolID(copy) == gMC->VolId("PCPQ") &&
+  static Int_t idPCPQ = gMC->VolId("PCPQ");
+  if( gMC->CurrentVolID(copy) == idPCPQ &&
       (gMC->IsTrackEntering() ) &&
       gMC->TrackCharge() != 0) {      
     
@@ -320,7 +328,7 @@ void AliPHOSv1::StepManager(void)
     moduleNumber--;
     
     TClonesArray *cpvDigits = new TClonesArray("AliPHOSCPVDigit",0);   // array of digits for current hit
-    CPVDigitize(pmom,xyd,moduleNumber,cpvDigits);
+    CPVDigitize(pmom,xyd,cpvDigits);
       
     Float_t xmean = 0;
     Float_t zmean = 0;
@@ -380,8 +388,8 @@ void AliPHOSv1::StepManager(void)
   }
 
  
-  
-  if(gMC->CurrentVolID(copy) == gMC->VolId("PXTL") ) { //  We are inside a PBWO crystal
+  static Int_t idPXTL = gMC->VolId("PXTL");  
+  if(gMC->CurrentVolID(copy) == idPXTL ) { //  We are inside a PBWO crystal
 
     gMC->TrackPosition(pos) ;
     xyzte[0] = pos[0] ;
@@ -398,13 +406,20 @@ void AliPHOSv1::StepManager(void)
     if ( gMC->IsTrackEntering() ){
       Float_t xyzd[3] ;
       gMC -> Gmtod (xyzte, xyzd, 1);    // transform coordinate from master to daughter system    
-      if (xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2.+0.001){   //Entered close to forward surface  
-       TParticle * part = 0 ; 
-       Int_t parent = gAlice->GetCurrentTrackNumber() ; 
-       while ( parent != -1 ) {
-         part = gAlice->Particle(parent) ; 
-         part->SetBit(kKeepBit);
-         parent = part->GetFirstMother() ; 
+      if (xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2.+0.1){   //Entered close to forward surface  
+       Int_t parent = gAlice->GetMCApp()->GetCurrentTrackNumber() ; 
+       TParticle * part = gAlice->GetMCApp()->Particle(parent) ; 
+       Float_t vert[3],vertd[3] ;
+       vert[0]=part->Vx() ;
+       vert[1]=part->Vy() ;
+       vert[2]=part->Vz() ;
+       gMC -> Gmtod (vert, vertd, 1);    // transform coordinate from master to daughter system
+       if(vertd[1]<-GetGeometry()->GetCrystalSize(1)/2.-0.1){ //Particle is created in foront of PHOS 0.1 to get rid of numerical errors 
+         while ( parent != -1 ) {
+           part = gAlice->GetMCApp()->Particle(parent) ; 
+           part->SetBit(kKeepBit);
+           parent = part->GetFirstMother() ; 
+         }
        }
       }
     }
@@ -438,17 +453,17 @@ void AliPHOSv1::StepManager(void)
       
       Int_t primary =-1 ;
       if(fIshunt == 1)
-        primary  =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
+        primary  =  gAlice->GetMCApp()->GetPrimary( gAlice->GetMCApp()->GetCurrentTrackNumber() ); 
       else if(fIshunt == 2){
-         primary = gAlice->GetCurrentTrackNumber() ;
-         TParticle * part = gAlice->Particle(primary) ;
+         primary = gAlice->GetMCApp()->GetCurrentTrackNumber() ;
+         TParticle * part = gAlice->GetMCApp()->Particle(primary) ;
          while ( !part->TestBit(kKeepBit) ) {
            primary = part->GetFirstMother() ;
            if(primary == -1) break ; //there is a possibility that particle passed e.g. thermal isulator and hits a side 
                                      //surface of the crystal. In this case it may have no primary at all. 
                                      //We can not easily separate this case from the case when this is part of the shower, 
                                      //developed in the neighboring crystal.
-           part = gAlice->Particle(primary) ;
+           part = gAlice->GetMCApp()->Particle(primary) ;
          }
       }
 
@@ -467,7 +482,7 @@ void AliPHOSv1::StepManager(void)
 }
 
 //____________________________________________________________________________
-void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, Int_t moduleNumber, TClonesArray *cpvDigits)
+void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, TClonesArray *cpvDigits)
 {
   // ------------------------------------------------------------------------
   // Digitize one CPV hit: