The logics of handling the geometry file for simulation has changed. The variables...

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

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index fd87811d87027fd68498789897e5c376684858f3..bc0ce65b44b6c686175b17a49073ecadaec13002 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -73,9 +73,6 @@ AliRun::AliRun():
   fConfigFunction(""),
   fRandom(0),
   fBaseFileName(""),
-  fIsRootGeometry(kFALSE),
-  fGeometryFromCDB(kFALSE),
-  fGeometryFileName(""),
   fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
@@ -97,9 +94,6 @@ AliRun::AliRun(const char *name, const char *title):
   fConfigFunction("Config();"),
   fRandom(new TRandom3()),
   fBaseFileName(""),
-  fIsRootGeometry(kFALSE),
-  fGeometryFromCDB(kFALSE),
-  fGeometryFileName(""),
   fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
@@ -155,30 +149,6 @@ AliRun::~AliRun()
 }
 
 
-//_______________________________________________________________________
-void AliRun::SetRootGeometry(Bool_t flag)
-{
-// Instruct application that the geometry is to be retreived from a root file.
-   fIsRootGeometry = flag;
-   if (flag && gMC) gMC->SetRootGeometry();
-}
-
-//_______________________________________________________________________
-void AliRun::SetGeometryFromCDB()
-{
-  // Set the loading of geometry from cdb instead of creating it
-  // A default CDB storage needs to be set before this method is called
-  if(AliCDBManager::Instance()->IsDefaultStorageSet() &&
-       AliCDBManager::Instance()->GetRun() >= 0){
-    SetRootGeometry();
-    fGeometryFromCDB = kTRUE;
-  }else{
-    AliError("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    AliError("Loading of geometry from CDB ignored. First set a default CDB storage!");
-    AliError("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-  }
-}
-
 //_____________________________________________________________________________
 
 void AliRun::InitLoaders()