For Pythia with tune don't switch off MI in ConfigHeavyFlavor

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

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index ac62b3bb7e913ad05e69cf6c516ba13f317777cb..0bb13bcbcff28ae85d1f9e48fd437e20c6da8f85 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -166,7 +166,7 @@ AliSimulation::AliSimulation(const char* configFileName,
   fLoadAlObjsListOfDets("ALL"),
   fMakeSDigits("ALL"),
   fMakeDigits("ALL"),
-  fMakeTrigger(""),
+  fTriggerConfig(""),
   fMakeDigitsFromHits(""),
   fWriteRawData(""),
   fRawDataFileName(""),
@@ -196,6 +196,7 @@ AliSimulation::AliSimulation(const char* configFileName,
   fRunQA(kTRUE), 
   fEventSpecie(AliRecoParam::kDefault),
   fWriteQAExpertData(kTRUE), 
+  fGeometryFile(),
   fRunHLT("default"),
   fpHLT(NULL),
   fWriteGRPEntry(kTRUE)
@@ -526,7 +527,7 @@ Bool_t AliSimulation::MisalignGeometry(AliRunLoader *runLoader)
   }
   
   // Export ideal geometry 
-  if(!gAlice->IsRootGeometry()) AliGeomManager::GetGeometry()->Export("geometry.root");
+  if(!IsGeometryFromFile()) AliGeomManager::GetGeometry()->Export("geometry.root");
 
   // Load alignment data from CDB and apply to geometry through AliGeomManager
   if(fLoadAlignFromCDB){
@@ -707,7 +708,7 @@ Bool_t AliSimulation::Run(Int_t nEvents)
   
   
   // digits -> trigger
-  if (!RunTrigger(fMakeTrigger,fMakeDigits)) {
+  if (!RunTrigger(fTriggerConfig,fMakeDigits)) {
     if (fStopOnError) return kFALSE;
   }
 
@@ -852,10 +853,10 @@ Bool_t AliSimulation::RunLego(const char *setup, Int_t nc1, Float_t c1min,
   
   AliPDG::AddParticlesToPdgDataBase();  
   
-  gAlice->GetMCApp()->Init();
-  
   gMC->SetMagField(TGeoGlobalMagField::Instance()->GetField());
 
+  gAlice->GetMCApp()->Init();
+  
   
   //Must be here because some MCs (G4) adds detectors here and not in Config.C
   gAlice->InitLoaders();
@@ -913,8 +914,8 @@ Bool_t AliSimulation::RunTrigger(const char* config, const char* detectors)
    TString trconfiguration = config;
 
    if (trconfiguration.IsNull()) {
-     if (strcmp(gAlice->GetTriggerDescriptor(),"")) {
-       trconfiguration = gAlice->GetTriggerDescriptor();
+     if(!fTriggerConfig.IsNull()) {
+       trconfiguration = fTriggerConfig;
      }
      else
        AliWarning("No trigger descriptor is specified. Loading the one that is in the CDB.");
@@ -1000,12 +1001,12 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
     
    AliPDG::AddParticlesToPdgDataBase();  
 
-   gAlice->GetMCApp()->Init();
-   AliSysInfo::AddStamp("RunSimulation_InitMCApp");
-
    gMC->SetMagField(TGeoGlobalMagField::Instance()->GetField());
    AliSysInfo::AddStamp("RunSimulation_GetField");
    
+   gAlice->GetMCApp()->Init();
+   AliSysInfo::AddStamp("RunSimulation_InitMCApp");
+
    //Must be here because some MCs (G4) adds detectors here and not in Config.C
    gAlice->InitLoaders();
    AliRunLoader::Instance()->MakeTree("E");
@@ -1020,15 +1021,6 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
    AliSysInfo::AddStamp("RunSimulation_InitLoaders");
   //___________________________________________________________________________________________
   
-  // Get the trigger descriptor string
-  // Either from AliSimulation or from
-  // gAlice
-  if (fMakeTrigger.IsNull()) {
-    if (strcmp(gAlice->GetTriggerDescriptor(),""))
-      fMakeTrigger = gAlice->GetTriggerDescriptor();
-  }
-  else
-    gAlice->SetTriggerDescriptor(fMakeTrigger.Data());
   AliSysInfo::AddStamp("RunSimulation_TriggerDescriptor");
 
   // Set run number in CDBManager
@@ -1793,10 +1785,10 @@ Bool_t AliSimulation::ConvertRaw2SDigits(const char* rawDirectory, const char* e
     
    AliPDG::AddParticlesToPdgDataBase();  
 
-   gAlice->GetMCApp()->Init();
-
    gMC->SetMagField(TGeoGlobalMagField::Instance()->GetField());
    
+   gAlice->GetMCApp()->Init();
+
    //Must be here because some MCs (G4) adds detectors here and not in Config.C
    gAlice->InitLoaders();
    AliRunLoader::Instance()->MakeTree("E");
@@ -2265,7 +2257,7 @@ void AliSimulation::WriteGRPEntry()
     }
   }
   // CTP
-  if (!fMakeTrigger.IsNull() || strcmp(gAlice->GetTriggerDescriptor(),""))
+  if (!fTriggerConfig.IsNull())
     detectorPattern |= (1 << AliDAQ::DetectorID("TRG"));
 
   // HLT
@@ -2276,8 +2268,6 @@ void AliSimulation::WriteGRPEntry()
   grpObj->SetDetectorMask((Int_t)detectorPattern);
   grpObj->SetLHCPeriod("LHC08c");
   grpObj->SetLHCState("STABLE_BEAMS");
-  grpObj->SetLHCLuminosity(0,(AliGRPObject::Stats)0);
-  grpObj->SetBeamIntensity(0,(AliGRPObject::Stats)0);
   //
   AliMagF *field = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
   Float_t solenoidField = field ? TMath::Abs(field->SolenoidField()) : 0;