Corrected deletion of gMC (I.Hrivnacova)

[u/mrichter/AliRoot.git] / STEER / AliRun.cxx

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 7bbf4fd2682ef8b4b289c1025a2555e7a95d17c2..9a88b014bd3f9d181b8afa9a5f9715eea62a2779 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -13,7 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/* $Header$ */
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -51,9 +51,7 @@
 #include "TFile.h"
 #include "TFolder.h"
 #include "TGeometry.h"
-#include "TKey.h"
 #include "TNode.h"
-#include "TObjectTable.h"
 #include "TParticle.h"
 #include "TRandom3.h"
 #include "TROOT.h"
@@ -63,10 +61,8 @@
 #include "AliConfig.h"
 #include "AliDetector.h"
 #include "AliDisplay.h"
-#include "AliGenEventHeader.h"
 #include "AliGenerator.h"
 #include "AliHeader.h"
-#include "AliHit.h"
 #include "AliLego.h"
 #include "AliLegoGenerator.h"
 #include "AliMCQA.h"
@@ -275,7 +271,8 @@ AliRun::~AliRun()
   if(fTreeE)curfil=fTreeE->GetCurrentFile();
   delete fImedia;
   delete fField;
-  delete fMC;
+  // delete fMC;
+  delete gMC; gMC=0;
   delete fGeometry;
   delete fDisplay;
   delete fGenerator;
@@ -324,6 +321,9 @@ AliRun::~AliRun()
 //_______________________________________________________________________
 void AliRun::Copy(AliRun &) const
 {
+  //
+  //  Copy method ... not implemented
+  //
   Fatal("Copy","Not implemented!\n");
 }
 
@@ -412,7 +412,7 @@ void AliRun::CleanDetectors()
 }
 
 //_______________________________________________________________________
-Int_t AliRun::DistancetoPrimitive(Int_t, Int_t)
+Int_t AliRun::DistancetoPrimitive(Int_t, Int_t) const
 {
   //
   // Return the distance from the mouse to the AliRun object
@@ -605,6 +605,27 @@ void AliRun::EnergySummary()
   //  fSum2Energy.Set(0);
 }
 
+//_______________________________________________________________________
+void AliRun::Announce() const
+{
+  //
+  // Announce the current version of AliRoot
+  //
+  printf("%70s",
+        "****************************************************************\n");
+  printf("%6s","*");printf("%64s","*\n");
+
+  printf("%6s","*");
+  printf("    You are running AliRoot version v3-09-07\n");
+
+  printf("%6s","*");
+  printf("    The cvs tag for the current program is $Name$\n");
+
+  printf("%6s","*");printf("%64s","*\n");
+  printf("%70s",
+        "****************************************************************\n");
+}
+
 //_______________________________________________________________________
 AliModule *AliRun::GetModule(const char *name) const
 {
@@ -909,6 +930,9 @@ void AliRun::ResetGenerator(AliGenerator *generator)
 //_______________________________________________________________________
 void AliRun::SetTransPar(const char *filename)
 {
+  //
+  // Sets the file name for transport parameters
+  //
   fTransParName = filename;
 }
 
@@ -1125,9 +1149,12 @@ void AliRun::MakeTree(Option_t *option, const char *file)
 }
 
 //_______________________________________________________________________
-TParticle* AliRun::Particle(Int_t i)
+TParticle* AliRun::Particle(Int_t i) const
 {
-    return fStack->Particle(i);
+  //
+  // Returns particle i on the simulation stack
+  //
+  return fStack->Particle(i);
 }
 
 //_______________________________________________________________________
@@ -1202,6 +1229,8 @@ void AliRun::InitMC(const char *setup)
   // Initialize the Alice setup
   //
 
+  Announce();
+
   if(fInitDone) {
     Warning("Init","Cannot initialise AliRun twice!\n");
     return;
@@ -1691,14 +1720,17 @@ void AliRun::BeginPrimary()
 //_______________________________________________________________________
 void AliRun::PreTrack()
 {
-     TObjArray &dets = *fModules;
-     AliModule *module;
-
-     for(Int_t i=0; i<=fNdets; i++)
-       if((module = dynamic_cast<AliModule*>(dets[i])))
-        module->PreTrack();
-
-     fMCQA->PreTrack();
+  //
+  // Method called before each track
+  //
+  TObjArray &dets = *fModules;
+  AliModule *module;
+  
+  for(Int_t i=0; i<=fNdets; i++)
+    if((module = dynamic_cast<AliModule*>(dets[i])))
+      module->PreTrack();
+  
+  fMCQA->PreTrack();
 }
 
 //_______________________________________________________________________
@@ -1732,12 +1764,15 @@ void AliRun::Stepping()
 //_______________________________________________________________________
 void AliRun::PostTrack()
 {
-     TObjArray &dets = *fModules;
-     AliModule *module;
-
-     for(Int_t i=0; i<=fNdets; i++)
-       if((module = dynamic_cast<AliModule*>(dets[i])))
-        module->PostTrack();
+  //
+  // Called after a track has been trasported
+  //
+  TObjArray &dets = *fModules;
+  AliModule *module;
+  
+  for(Int_t i=0; i<=fNdets; i++)
+    if((module = dynamic_cast<AliModule*>(dets[i])))
+      module->PostTrack();
 }
 
 //_______________________________________________________________________
@@ -1820,18 +1855,22 @@ void AliRun::FinishEvent()
 //_______________________________________________________________________
 void AliRun::Field(const Double_t* x, Double_t *b) const
 {
-   Float_t xfloat[3];
-   for (Int_t i=0; i<3; i++) xfloat[i] = x[i]; 
-
-   if (Field()) {
-         Float_t bfloat[3];
-         Field()->Field(xfloat,bfloat);
-         for (Int_t j=0; j<3; j++) b[j] = bfloat[j]; 
-   } 
-   else {
-         printf("No mag field defined!\n");
-         b[0]=b[1]=b[2]=0.;
-   }
+  //
+  // Returns the magnetic field at point x[3]
+  // Units are kGauss
+  //
+  Float_t xfloat[3];
+  for (Int_t i=0; i<3; i++) xfloat[i] = x[i]; 
+  
+  if (Field()) {
+    Float_t bfloat[3];
+    Field()->Field(xfloat,bfloat);
+    for (Int_t j=0; j<3; j++) b[j] = bfloat[j]; 
+  } 
+  else {
+    printf("No mag field defined!\n");
+    b[0]=b[1]=b[2]=0.;
+  }
 
 }      
 
@@ -1882,7 +1921,7 @@ Int_t AliRun::GetNtrack() const {
 }
 
 //_______________________________________________________________________
-TObjArray* AliRun::Particles() {
+TObjArray* AliRun::Particles() const {
   //
   // Returns pointer to Particles array
   //
@@ -1890,7 +1929,7 @@ TObjArray* AliRun::Particles() {
 }
 
 //_______________________________________________________________________
-TTree* AliRun::TreeK() {
+TTree* AliRun::TreeK() const {
   //
   // Returns pointer to the TreeK array
   //