removed obsolete refeference to ppsd

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

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 49dd9e07f05fbae6d6a20f48e52b52b6523d9195..ac1cc9f6a4df037fa8a4b770832c66f630806151 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,7 +287,7 @@ void AliPHOSv1::StepManager(void)
   TLorentzVector pos      ;           // Lorentz vector of the track current position
   Int_t          copy     ;
 
-  Int_t tracknumber =  gAlice->CurrentTrack() ; 
+  Int_t tracknumber =  gAlice->GetMCApp()->GetCurrentTrackNumber() ; 
   TString name      =  GetGeometry()->GetName() ; 
 
   Int_t moduleNumber ;
@@ -320,7 +327,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;
@@ -400,9 +407,9 @@ void AliPHOSv1::StepManager(void)
       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->CurrentTrack() ; 
+       Int_t parent = gAlice->GetMCApp()->GetCurrentTrackNumber() ; 
        while ( parent != -1 ) {
-         part = gAlice->Particle(parent) ; 
+         part = gAlice->GetMCApp()->Particle(parent) ; 
          part->SetBit(kKeepBit);
          parent = part->GetFirstMother() ; 
        }
@@ -438,17 +445,17 @@ void AliPHOSv1::StepManager(void)
       
       Int_t primary =-1 ;
       if(fIshunt == 1)
-        primary  =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
+        primary  =  gAlice->GetMCApp()->GetPrimary( gAlice->GetMCApp()->GetCurrentTrackNumber() ); 
       else if(fIshunt == 2){
-         primary = gAlice->CurrentTrack() ;
-         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 +474,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: