Rationalisation of the virtual MC interfaces

diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index 36226f3..2f30019 100644 (file)
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -15,7 +15,11 @@
 
 /*
 $Log$
+Revision 1.2  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
+#include <stdlib.h>
 
 #include "AliMC.h"
 
@@ -25,14 +29,11 @@ AliMC* AliMC::fgMC=0;
 
 AliMC* gMC;
 
-AliMC::AliMC()
-{
-}
-
 AliMC::AliMC(const char *name, const char *title) : TNamed(name,title)
 {
   if(fgMC) {
     printf("Cannot initialise twice MonteCarlo class\n");
+    exit(1);
   } else {
     fgMC=this;
     gMC=this;

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index dbc1d3b..ccfab55 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -16,15 +16,19 @@
 #include <TNamed.h>
 #include <TLorentzVector.h>
 
+class AliMC;
+
+R__EXTERN AliMC *gMC;
+
 class AliMC : public TNamed 
 {
   public:
     AliMC(const char *name, const char *title);
-    AliMC();
-    virtual ~AliMC() {}
+    AliMC() {}
+    virtual ~AliMC() {fgMC=gMC=0;}
   
     // static access method
-    static inline AliMC* GetMC();
+    static AliMC* GetMC() { return fgMC; }
 
     //
     // methods for building/management of geometry
@@ -190,10 +194,5 @@ class AliMC : public TNamed
   ClassDef(AliMC,1)  //Geometry Interface Class
 };
 
-// inline methods
-inline AliMC* AliMC::GetMC() { return fgMC; }
-
-R__EXTERN AliMC *gMC;
-
 #endif // ALI_MC_H
 

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 9893e1e..4fe8781 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.26  2000/03/22 13:42:26  fca
+SetGenerator does not replace an existing generator, ResetGenerator does
+
 Revision 1.25  2000/02/23 16:25:22  fca
 AliVMC and AliGeant3 classes introduced
 ReadEuclid moved from AliRun to AliModule
@@ -109,7 +112,7 @@ AliRun::AliRun()
   fGeometry  = 0;
   fDisplay   = 0;
   fField     = 0;
-  fMC        = 0;
+  fVMC       = 0;
   fNdets     = 0;
   fImedia    = 0;
   fTrRmax    = 1.e10;
@@ -170,7 +173,7 @@ AliRun::AliRun(const char *name, const char *title)
   // Create default mag field
   SetField();
   //
-  fMC      = gMC;
+  fVMC      = gVMC;
   //
   // Prepare the tracking medium lists
   fImedia = new TArrayI(1000);
@@ -191,7 +194,7 @@ AliRun::~AliRun()
   //
   delete fImedia;
   delete fField;
-  delete fMC;
+  delete fVMC;
   delete fGeometry;
   delete fDisplay;
   delete fGenerator;
@@ -399,7 +402,7 @@ void AliRun::FinishPrimary()
   //  static Int_t count=0;
   //  const Int_t times=10;
   // This primary is finished, purify stack
-  gAlice->PurifyKine();
+  PurifyKine();
 
   // Write out hits if any
   if (gAlice->TreeH()) {
@@ -1287,19 +1290,19 @@ void AliRun::Run(Int_t nevent, const char *setup)
   if (!fInitDone) Init(setup);
   
   // Create the Root Tree with one branch per detector
-  gAlice->MakeTree("KHDER");
+  MakeTree("KHDER");
 
   todo = TMath::Abs(nevent);
   for (i=0; i<todo; i++) {
   // Process one run (one run = one event)
-     gAlice->Reset(fRun, fEvent);
+     Reset(fRun, fEvent);
      gVMC->ProcessEvent();
-     gAlice->FinishEvent();
+     FinishEvent();
      fEvent++;
   }
   
   // End of this run, close files
-  if(nevent>0) gAlice->FinishRun();
+  if(nevent>0) FinishRun();
 }
 
 //_____________________________________________________________________________
@@ -1355,10 +1358,10 @@ void AliRun::RunLego(const char *setup,Int_t ntheta,Float_t themin,
   fLego->Run();
   
   // Create only the Root event Tree
-  gAlice->MakeTree("E");
+  MakeTree("E");
   
   // End of this run, close files
-  gAlice->FinishRun();
+  FinishRun();
 }
 
 //_____________________________________________________________________________
@@ -1489,7 +1492,7 @@ void AliRun::Streamer(TBuffer &R__b)
     R__b >> fModules;
     R__b >> fParticles;
     R__b >> fField; 
-    //    R__b >> fMC;
+    //    R__b >> fVMC;
     R__b >> fNdets;
     R__b >> fTrRmax;
     R__b >> fTrZmax;
@@ -1511,7 +1514,7 @@ void AliRun::Streamer(TBuffer &R__b)
     R__b << fModules;
     R__b << fParticles;
     R__b << fField;
-    //    R__b << fMC;
+    //    R__b << fVMC;
     R__b << fNdets;
     R__b << fTrRmax;
     R__b << fTrZmax;

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index ea9382b..d14ade2 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -16,7 +16,7 @@
 #include "AliDetector.h"
 #include "AliHeader.h"
 #include "AliMagF.h"
-#include "AliMC.h"
+#include "AliVMC.h"
 #include "AliGenerator.h"
 #include "AliLego.h"
 
@@ -45,7 +45,7 @@ protected:
   AliDisplay   *fDisplay;      //Pointer to event display
   TStopwatch    fTimer;        //Timer object
   AliMagF      *fField;        //Magnetic Field Map
-  AliMC        *fMC;           //pointer to MonteCarlo object
+  AliVMC       *fVMC;          //pointer to MonteCarlo object
   TArrayI      *fImedia;       //Array of correspondence between media and detectors
   Int_t         fNdets;        //Number of detectors
   Float_t       fTrRmax;       //Maximum radius for tracking

diff --git a/STEER/AliVMC.cxx b/STEER/AliVMC.cxx
index 8e91cce..4b1c70f 100644 (file)
--- a/STEER/AliVMC.cxx
+++ b/STEER/AliVMC.cxx
@@ -15,8 +15,14 @@
 
 /*
 $Log$
+Revision 1.1  2000/02/23 16:25:22  fca
+AliVMC and AliGeant3 classes introduced
+ReadEuclid moved from AliRun to AliModule
+
 */
 
+#include <stdlib.h>
+
 #include "AliVMC.h"
 
 ClassImp(AliVMC)
@@ -25,14 +31,11 @@ AliVMC* AliVMC::fgVMC=0;
 
 AliVMC* gVMC;
 
-AliVMC::AliVMC()
-{
-}
-
 AliVMC::AliVMC(const char *name, const char *title) : TNamed(name,title)
 {
   if(fgVMC) {
     printf("Cannot initialise twice Alice MonteCarlo class\n");
+    exit(1);
   } else {
     fgVMC=this;
     gVMC=this;

diff --git a/STEER/AliVMC.h b/STEER/AliVMC.h
index c861cc8..0967a48 100644 (file)
--- a/STEER/AliVMC.h
+++ b/STEER/AliVMC.h
@@ -15,6 +15,12 @@
 
 #include <TNamed.h>
 
+#include "AliMC.h"
+
+class AliVMC;
+
+R__EXTERN AliVMC *gVMC;
+
 class AliVMC : public TNamed 
 {
 
@@ -23,21 +29,19 @@ private:
 
 public:
   AliVMC(const char *name, const char *title);
-  AliVMC();
-  virtual ~AliVMC() {}
+  AliVMC() {}
+  ~AliVMC() {if(gMC) delete gMC; fgVMC=gVMC=0;}
   //Generic access functions
-  static inline AliVMC* GetVMC() {return fgVMC;}
+  static AliVMC* GetVMC() {return fgVMC;}
   //Generic Alice MonteCarlo Functions
   virtual void FinishGeometry() = 0;
   virtual void BuildPhysics() = 0;
   virtual void ProcessEvent() = 0;
-
+  
   //
   ClassDef(AliVMC,1) //Generic MonteCarlo Class
 
 };
 
-R__EXTERN AliVMC *gVMC;
-
 #endif