Bug correction

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

diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx
index 1609a9469790821cb74ebcfcf69170778450d67d..816cb09ceba55a76888e790a45c2429b6cd6d884 100644 (file)
--- a/PHOS/AliPHOSvFast.cxx
+++ b/PHOS/AliPHOSvFast.cxx
@@ -1,4 +1,4 @@
-/**************************************************************************
+  /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -26,17 +26,20 @@
 
 // --- ROOT system ---
  
-#include "TBRIK.h"
-#include "TNode.h"
-#include "TParticle.h"
-#include "TGeometry.h"
+#include <TBRIK.h>
+#include <TGeometry.h>
+#include <TNode.h>
+#include <TParticle.h>
+#include "TClonesArray.h" 
+#include <TVirtualMC.h>
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 #include "AliPHOSFastRecParticle.h"
+#include "AliPHOSGeometry.h"
+#include "AliPHOSLoader.h"
 #include "AliPHOSvFast.h"
-#include "AliPHOSGetter.h"
 #include "AliRun.h"
 
 ClassImp(AliPHOSvFast)
@@ -69,8 +72,7 @@ AliPHOSvFast::AliPHOSvFast(const char *name, const char *title):
   // ctor
 
   
-  // create the Getter 
-  AliPHOSGetter::GetInstance(gDirectory->GetName(), 0) ; 
+  // create the Loader 
   
   SetBigBox(0, GetGeometry()->GetOuterBoxSize(0) ) ;
   SetBigBox(1, GetGeometry()->GetOuterBoxSize(3) + GetGeometry()->GetCPVBoxSize(1) ) ; 
@@ -90,34 +92,6 @@ AliPHOSvFast::AliPHOSvFast(const char *name, const char *title):
   fPosParaB2 = 0.00619 ; 
 }
 
-//____________________________________________________________________________
-AliPHOSvFast::AliPHOSvFast(const AliPHOSvFast & pv):
-  AliPHOS(pv.GetName(), pv.GetTitle())
-{
-  // cpy ctor
-
-  
-  // create the Getter 
-  AliPHOSGetter::GetInstance(gDirectory->GetName(), 0) ; 
-  
-  SetBigBox(0, pv.fBigBoxX) ;
-  SetBigBox(1, pv.fBigBoxY) ; 
-  SetBigBox(2, pv.fBigBoxZ) ; 
-  
-  fNRecParticles = pv.fNRecParticles; 
-  fFastRecParticles = new TClonesArray( *(pv.fFastRecParticles) ) ;
-  
-  fResPara1 = pv.fResPara1 ;    
-  fResPara2 = pv.fResPara2 ; 
-  fResPara3 = pv.fResPara3 ; 
-  
-  fPosParaA0 = pv.fPosParaA0 ;    
-  fPosParaA1 = pv.fPosParaA1 ;  
-  fPosParaB0 = pv.fPosParaB0 ;   
-  fPosParaB1 = pv.fPosParaB1 ; 
-  fPosParaB2 = pv.fPosParaB2 ; 
-}
-
 //____________________________________________________________________________
 AliPHOSvFast::~AliPHOSvFast()
 {
@@ -129,6 +103,29 @@ AliPHOSvFast::~AliPHOSvFast()
 
 }
 
+//____________________________________________________________________________
+void AliPHOSvFast::Copy(AliPHOSvFast & fast)
+{
+  TObject::Copy(fast) ; 
+  AliPHOS::Copy(fast) ; 
+  fast.fBigBoxX = fBigBoxX ; 
+  fast.fBigBoxY = fBigBoxY ; 
+  fast.fBigBoxZ = fBigBoxZ ;
+  fast.fNRecParticles = fNRecParticles ;
+  fast.fRan = fRan ; 
+  fast.fResPara1 = fResPara1 ; 
+  fast.fResPara2 = fResPara2 ; 
+  fast.fResPara3 = fResPara3 ;
+  fast.fPosParaA0 = fPosParaA0 ;
+  fast.fPosParaA1 = fPosParaA1 ; 
+  fast.fPosParaB0 = fPosParaB0 ;
+  fast.fPosParaB1 = fPosParaB1 ;
+  fast.fFastRecParticles = new TClonesArray(fFastRecParticles->GetClass()->GetName(), 100) ; 
+  Int_t index ; 
+  for (index = 0 ; index < fFastRecParticles->GetEntries(); index++) 
+    (fast.fFastRecParticles)->AddAt(fFastRecParticles->At(index), index) ;
+}
+
 //____________________________________________________________________________
 void AliPHOSvFast::AddRecParticle(const AliPHOSFastRecParticle & rp)
 {  
@@ -162,7 +159,7 @@ void AliPHOSvFast::BuildGeometry()
  
   const Int_t kColorPHOS = kRed ;
   
-  Double_t const kRADDEG = 180.0 / kPI ;
+  Double_t const kRADDEG = 180.0 / TMath::Pi() ;
   
   new TBRIK( "BigBox", "PHOS box", "void", GetBigBox(0)/2, 
             GetBigBox(1)/2, 
@@ -222,7 +219,7 @@ void AliPHOSvFast::CreateGeometry()
   // --- Position  PHOS mdules in ALICE setup ---
   
   Int_t idrotm[99] ;
-  Double_t const kRADDEG = 180.0 / kPI ;
+  Double_t const kRADDEG = 180.0 / TMath::Pi() ;
   
   for( Int_t i = 1; i <= GetGeometry()->GetNModules(); i++ ) {
     
@@ -280,26 +277,21 @@ Float_t AliPHOSvFast::GetBigBox(Int_t index) const
  }
   return rv ; 
 }
-
 //___________________________________________________________________________
-void AliPHOSvFast::MakeBranch(Option_t* opt, const char *file)
+
+void AliPHOSvFast::MakeBranch(Option_t* opt)
 {  
   // Create new branch in the current reconstructed Root Tree
- 
-  AliDetector::MakeBranch(opt,file) ;
-  
-  char branchname[10];
-  sprintf(branchname,"%s",GetName());
+  AliDetector::MakeBranch(opt);
   const char *cd = strstr(opt,"R");
   
-  if (fFastRecParticles && gAlice->TreeR() && cd) {
-    MakeBranchInTree(gAlice->TreeR(), 
-                     branchname, &fFastRecParticles, fBufferSize, file);
+  if (fFastRecParticles && fLoader->TreeR() && cd) {
+    MakeBranchInTree(fLoader->TreeR(), GetName(), &fFastRecParticles, fBufferSize, 0);
   }
 }
-
 //____________________________________________________________________________
-Double_t AliPHOSvFast::MakeEnergy(const Double_t energy)
+
+Double_t AliPHOSvFast::MakeEnergy(Double_t energy)
 {  
   // Smears the energy according to the energy dependent energy resolution.
   // A gaussian distribution is assumed
@@ -307,9 +299,9 @@ Double_t AliPHOSvFast::MakeEnergy(const Double_t energy)
   Double_t sigma  = SigmaE(energy) ; 
   return  fRan.Gaus(energy, sigma) ;   
 }
-
 //____________________________________________________________________________
-TVector3 AliPHOSvFast::MakePosition(const Double_t energy, const TVector3 pos, const Double_t theta, const Double_t phi)
+
+TVector3 AliPHOSvFast::MakePosition(Double_t energy, TVector3 pos, Double_t theta, Double_t phi)
 {
   // Smears the impact position according to the energy dependent position resolution
   // A gaussian position distribution is assumed
@@ -329,7 +321,7 @@ TVector3 AliPHOSvFast::MakePosition(const Double_t energy, const TVector3 pos, c
 }
 
 //____________________________________________________________________________
-void AliPHOSvFast::MakeRecParticle(const Int_t modid, const TVector3 pos, AliPHOSFastRecParticle & rp)
+void AliPHOSvFast::MakeRecParticle(Int_t modid, TVector3 pos, AliPHOSFastRecParticle & rp)
 {
   // Modify the primary particle properties according
   //  1. the response function of PHOS
@@ -379,7 +371,7 @@ Int_t AliPHOSvFast::MakeType(AliPHOSFastRecParticle & rp )
     test = rp.GetPdgCode() ; 
 
   Fatal("MakeType", "SHOULD NOT BE USED until values of probabilities are properly set ") ;
-
+   // NB: ALL VALUES SHOULD BE CHECKED !!!!
   switch (test) { 
 
   case 22:    // it's a photon              // NB: ALL VALUES SHOLD BE CHECKED !!!!