fLoadAlObjsListOfDets("ALL"),
fMakeSDigits("ALL"),
fMakeDigits("ALL"),
- fMakeTrigger(""),
+ fTriggerConfig(""),
fMakeDigitsFromHits(""),
fWriteRawData(""),
fRawDataFileName(""),
// digits -> trigger
- if (!RunTrigger(fMakeTrigger,fMakeDigits)) {
+ if (!RunTrigger(fTriggerConfig,fMakeDigits)) {
if (fStopOnError) return kFALSE;
}
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.");
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
}
}
// CTP
- if (!fMakeTrigger.IsNull() || strcmp(gAlice->GetTriggerDescriptor(),""))
+ if (!fTriggerConfig.IsNull())
detectorPattern |= (1 << AliDAQ::DetectorID("TRG"));
// HLT