Fix for coverity

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

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 71cbe168f2110fd64565904864d149e3e2b7de43..58407ebe5942c504508637e317631c19a7180a47 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -51,9 +51,6 @@
 #include "AliDetector.h"
 #include "AliHeader.h"
 #include "AliMC.h"
-#include "AliMagFC.h"
-#include "AliMagFCM.h"
-#include "AliMagFDM.h"
 #include "AliPDG.h"
 #include "AliRun.h"
 #include "AliStack.h"
@@ -68,20 +65,13 @@ ClassImp(AliRun)
 
 //_______________________________________________________________________
 AliRun::AliRun():
-  fRun(-1),
-  fEvent(0),
+//  fRun(-1),
   fEventNrInRun(-1),
   fModules(0),
   fMCApp(0),
-  fField(0),
   fNdets(0),
   fConfigFunction(""),
-  fRandom(0),
   fBaseFileName(""),
-  fIsRootGeometry(kFALSE),
-  fGeometryFromCDB(kFALSE),
-  fGeometryFileName(""),
-  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -95,20 +85,12 @@ AliRun::AliRun():
 //_____________________________________________________________________________
 AliRun::AliRun(const char *name, const char *title):
   TNamed(name,title),
-  fRun(-1),
-  fEvent(0),
   fEventNrInRun(-1),
   fModules(new TObjArray(77)), // Support list for the Detectors
   fMCApp(new AliMC(GetName(),GetTitle())),
-  fField(0),
   fNdets(0),
   fConfigFunction("Config();"),
-  fRandom(new TRandom3()),
   fBaseFileName(""),
-  fIsRootGeometry(kFALSE),
-  fGeometryFromCDB(kFALSE),
-  fGeometryFileName(""),
-  fTriggerDescriptor(""),
   fRunLoader(0x0)
 {
   //
@@ -121,7 +103,7 @@ AliRun::AliRun(const char *name, const char *title):
   gAlice     = this;
 
   // Set random number generator
-  gRandom = fRandom;
+  gRandom = new TRandom3();
 
   if (gSystem->Getenv("CONFIG_SEED")) {
      gRandom->SetSeed(static_cast<UInt_t>(atoi(gSystem->Getenv("CONFIG_SEED"))));
@@ -130,12 +112,8 @@ AliRun::AliRun(const char *name, const char *title):
   // Add to list of browsable  
   gROOT->GetListOfBrowsables()->Add(this,name);
   
-  // Create default mag field
-  fField = new AliMagFC("Map1"," ",2.,1.,10.);
-
 }
 
-
 //_______________________________________________________________________
 AliRun::~AliRun()
 {
@@ -148,6 +126,7 @@ AliRun::~AliRun()
    {
     TFolder* evfold = fRunLoader->GetEventFolder();
     TFolder* modfold = dynamic_cast<TFolder*>(evfold->FindObjectAny(AliConfig::GetModulesFolderName()));
+    if(!modfold) AliFatal(Form("Folder %s not found\n",AliConfig::GetModulesFolderName().Data()));
     TIter next(fModules);
     AliModule *mod;
     while((mod = (AliModule*)next()))
@@ -156,7 +135,6 @@ AliRun::~AliRun()
      }
    }
     
-  delete fField;
   delete fMCApp;
   delete gMC; gMC=0;
   if (fModules) {
@@ -166,42 +144,7 @@ AliRun::~AliRun()
   
 }
 
-//_______________________________________________________________________
-void  AliRun::SetField(AliMagF* magField)
-{
-  //
-  // Set Magnetic Field Map
-  //
-  fField = 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) 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()
 {
   //creates list of getters
@@ -297,7 +240,7 @@ Int_t AliRun::GetEvent(Int_t event)
 /****       R  E  L  O  A  D          ****/
 /*****************************************/
 
-  AliRunLoader::GetRunLoader()->GetEvent(event);
+  AliRunLoader::Instance()->GetEvent(event);
 
 /*****************************************/ 
 /****  P O S T    R E L O A D I N G   ****/
@@ -311,7 +254,7 @@ Int_t AliRun::GetEvent(Int_t event)
      detector->SetTreeAddress();
    }
  
-  return AliRunLoader::GetRunLoader()->GetHeader()->GetNtrack();
+  return AliRunLoader::Instance()->GetHeader()->GetNtrack();
 }
 
 //_______________________________________________________________________
@@ -327,7 +270,7 @@ void AliRun::Hits2Digits(const char *selected)
 
    // Convert Hits to sumable digits
    // 
-   for (Int_t nevent=0; nevent<AliRunLoader::GetRunLoader()->TreeE()->GetEntries(); nevent++) {
+   for (Int_t nevent=0; nevent<AliRunLoader::Instance()->TreeE()->GetEntries(); nevent++) {
      GetEvent(nevent);
      Hits2SDigits(selected);
      SDigits2Digits(selected);
@@ -336,7 +279,6 @@ void AliRun::Hits2Digits(const char *selected)
 
 
 //_______________________________________________________________________
-
 void AliRun::Tree2Tree(Option_t *option, const char *selected)
 {
   //
@@ -408,30 +350,6 @@ void AliRun::Tree2Tree(Option_t *option, const char *selected)
    }
 }
 
-// 
-// MC Application
-// 
-
-//_______________________________________________________________________
-void AliRun::Field(const Double_t* x, Double_t *b) const
-{
-  //
-  // Return the value of the magnetic field
-  //
-    
-  if (Field()) Field()->Field(x,b);
-
-  else {
-    AliError("No mag field defined!");
-    b[0]=b[1]=b[2]=0.;
-  }
-
-  
-}      
-
-// 
-// End of MC Application
-// 
 
 //_______________________________________________________________________
 void AliRun::Streamer(TBuffer &R__b)
@@ -442,22 +360,20 @@ void AliRun::Streamer(TBuffer &R__b)
     if (!gAlice) gAlice = this;
     AliRun::Class()->ReadBuffer(R__b, this);
     gROOT->GetListOfBrowsables()->Add(this,"Run");
-
-    gRandom = fRandom;
+    gRandom = new TRandom3();
   } else {
     AliRun::Class()->WriteBuffer(R__b, this);
   }
 }
-//_______________________________________________________________________
 
+//_______________________________________________________________________
 void AliRun::SetGenEventHeader(AliGenEventHeader* header)
 {
-  AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(header);
+  AliRunLoader::Instance()->GetHeader()->SetGenEventHeader(header);
 }
 
 
 //_______________________________________________________________________
-
 Int_t AliRun::GetEvNumber() const
 { 
 //Returns number of current event  
@@ -469,8 +385,8 @@ Int_t AliRun::GetEvNumber() const
 
   return fRunLoader->GetEventNumber();
 }
-//_______________________________________________________________________
 
+//_______________________________________________________________________
 void AliRun::SetRunLoader(AliRunLoader* rloader)
 {
   //
@@ -482,7 +398,7 @@ void AliRun::SetRunLoader(AliRunLoader* rloader)
   TString evfoldname;
   TFolder* evfold = fRunLoader->GetEventFolder();
   if (evfold) evfoldname = evfold->GetName();
-  else AliWarning("Did not get Event Folder from Run Loader");
+  else AliFatal("Did not get Event Folder from Run Loader");
   
   if ( fRunLoader->GetAliRun() )
    {//if alrun already exists in folder
@@ -520,6 +436,7 @@ void AliRun::SetRunLoader(AliRunLoader* rloader)
    }
 }
 
+//_______________________________________________________________________
 void AliRun::AddModule(AliModule* mod)
 {
   //