Correct setting of the run number (Raffaele)

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index f26e3944405e8cd39266874ea8f27cd0fa6a4585..0803e497c8570a10232865ab1ca5560fe9463a55 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -64,6 +64,7 @@
 #include "AliPDG.h"
 #include "AliRun.h"
 #include "AliStack.h"
+#include "AliCDBManager.h"
 #include "AliAlignObj.h"
 
 AliRun *gAlice;
@@ -560,6 +561,10 @@ void AliRun::InitMC(const char *setup)
   gROOT->LoadMacro(setup);
   gInterpreter->ProcessLine(fConfigFunction.Data());
 
+  // Set the run number in the CDB manager as assigned from
+  // constructor or from config file 
+  AliCDBManager::Instance()->SetRun(GetRunNumber());
+  
   fRunLoader->CdGAFile();
 
   AliPDG::AddParticlesToPdgDataBase();  

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index fc1c285ea9e6fe645abae30a494fbd118947b649..3b495a8b3adcd4cd0a5a398083ed91ae77bf7eae 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -627,7 +627,6 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
     gAlice->SetTriggerDescriptor(fMakeTrigger.Data());
 
   // Set run number in CDBManager
-  AliCDBManager::Instance()->SetRun(gAlice->GetRunNumber());
   AliInfo(Form("Run number: %d",AliCDBManager::Instance()->GetRun()));
 
   AliRunLoader* runLoader = gAlice->GetRunLoader();