X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliRun.cxx;h=dd476a8435abcab5ca181e42ae7a1dc8a257bee1;hb=12e26c263331e2ed324ce5b54927f438b1242985;hp=3f5d5ce63a21e44a408e500e0055f9321ae9fd15;hpb=b60e0f5e973d124b1e0ba20fcff9f6868d41ce95;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 3f5d5ce63a2..dd476a8435a 100644
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -49,6 +49,7 @@
 #include <TRandom3.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
+#include <TGeoManager.h>
 // 
 #include "AliLog.h"
 #include "AliDetector.h"
@@ -63,9 +64,7 @@
 #include "AliPDG.h"
 #include "AliRun.h"
 #include "AliStack.h"
-#ifdef __APPLE__
-//#include "AliTPCTrackHitsInterfaces.h"
-#endif
+#include "AliAlignObj.h"
 
 AliRun *gAlice;
 
@@ -82,13 +81,15 @@ AliRun::AliRun():
   fMCApp(0),
   fDisplay(0),
   fField(0),
-  fMC(0),
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
   fPDGDB(0),  //Particle factory object
-  fConfigFunction("\0"),
+  fConfigFunction(""),
   fRandom(0),
+  fIsRootGeometry(kFALSE),
+  fGeometryFileName(""),
+  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -110,13 +111,15 @@ AliRun::AliRun(const AliRun& arun):
   fMCApp(0),
   fDisplay(0),
   fField(0),
-  fMC(0),
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
   fPDGDB(0),  //Particle factory object
   fConfigFunction("\0"),
   fRandom(0),
+  fIsRootGeometry(kFALSE),
+  fGeometryFileName(""),
+  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -137,13 +140,15 @@ AliRun::AliRun(const char *name, const char *title):
   fMCApp(0),
   fDisplay(0),
   fField(0),
-  fMC(gMC),
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
   fPDGDB(TDatabasePDG::Instance()),        //Particle factory object!
   fConfigFunction("Config();"),
   fRandom(new TRandom3()),
+  fIsRootGeometry(kFALSE),
+  fGeometryFileName(""),
+  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -173,14 +178,6 @@ AliRun::AliRun(const char *name, const char *title):
   // Add particle list to configuration
   AliConfig::Instance()->Add(fPDGDB); 
 
-#ifdef __APPLE__
-  // Terrible hack to avoid problem with the initialisation of 
-  // static and globals on Mac OS X 
-  //  AliClassAliTrackHitsInfo p1=galiclass____AliClassAliTrackHitsInfo;
-  // AliClassAliTrackHitsParam p2=galiclass____AliTrackHitsParam;
-  //AliClassAliHitInfo p3=galiclass____AliHitInfo;
-#endif
-
 }
 
 
@@ -280,6 +277,13 @@ void  AliRun::SetField(AliMagF* magField)
   fField->ReadField();
 }
 
+//_______________________________________________________________________
+void AliRun::SetRootGeometry(Bool_t flag)
+{
+// Instruct application that the geometry is to be retreived from a root file.
+   fIsRootGeometry = flag;
+   if (flag) gMC->SetRootGeometry();
+}
 //_______________________________________________________________________
 void AliRun::SetField(Int_t type, Int_t version, Float_t scale,
 		      Float_t maxField, const char* filename)
@@ -949,22 +953,6 @@ void AliRun::AddModule(AliModule* mod)
   fNdets++;
 }
 
-
-//_______________________________________________________________________
-Int_t AliRun::GetDebug() const
-{
-  AliWarning("Don't use this method any more, use AliDebug instead");
-  return AliDebugLevel();
-}
-
-//_______________________________________________________________________
-void AliRun::SetDebug(Int_t level)
-{
-  AliWarning("Don't use this method any more, use AliLog instead");
-  AliLog::SetClassDebugLevel("AliRun", level);
-}
-
-
 // added by Alberto Colla
 //_____________________________________________________________________________
 /*inline*/ Bool_t AliRun::IsFileAccessible(const char* fnam, EAccessMode mode)
@@ -976,5 +964,3 @@ void AliRun::SetDebug(Int_t level)
   TString str = name; gSystem->ExpandPathName(str);
   return !gSystem->AccessPathName(str.Data(),mode);
 }
-
-