Merging changes from v4-04-Release

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

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index e5975c2200671dba0c0299e1adca954e27554f5f..dd476a8435abcab5ca181e42ae7a1dc8a257bee1 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -64,9 +64,7 @@
 #include "AliPDG.h"
 #include "AliRun.h"
 #include "AliStack.h"
-#ifdef __APPLE__
-//#include "AliTPCTrackHitsInterfaces.h"
-#endif
+#include "AliAlignObj.h"
 
 AliRun *gAlice;
 
@@ -83,14 +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)
 {
   //
@@ -112,7 +111,6 @@ AliRun::AliRun(const AliRun& arun):
   fMCApp(0),
   fDisplay(0),
   fField(0),
-  fMC(0),
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
@@ -120,6 +118,8 @@ AliRun::AliRun(const AliRun& arun):
   fConfigFunction("\0"),
   fRandom(0),
   fIsRootGeometry(kFALSE),
+  fGeometryFileName(""),
+  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -140,7 +140,6 @@ AliRun::AliRun(const char *name, const char *title):
   fMCApp(0),
   fDisplay(0),
   fField(0),
-  fMC(gMC),
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
@@ -148,7 +147,9 @@ AliRun::AliRun(const char *name, const char *title):
   fConfigFunction("Config();"),
   fRandom(new TRandom3()),
   fIsRootGeometry(kFALSE),
- fRunLoader(0x0)
+  fGeometryFileName(""),
+  fTriggerDescriptor(""),
+  fRunLoader(0x0)
 {
   //
   //  Constructor for the main processor.
@@ -177,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
-
 }
 
 
@@ -290,8 +283,7 @@ 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)
@@ -628,7 +620,6 @@ void AliRun::RunMC(Int_t nevent, const char *setup)
   //Hits moved to begin event -> now we are crating separate tree for each event
 
   gMC->ProcessRun(nevent);
-//   cout<<"\n***** "<<gGeoManager->GetMaterial("TPCEpoxy")->GetA()<<"  ****\n";
 
   // End of this run, close files
   if(nevent>0) FinishRun();
@@ -962,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)
@@ -989,5 +964,3 @@ void AliRun::SetDebug(Int_t level)
   TString str = name; gSystem->ExpandPathName(str);
   return !gSystem->AccessPathName(str.Data(),mode);
 }
-
-