X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STEER%2FAliSimulation.cxx;h=0bb13bcbcff28ae85d1f9e48fd437e20c6da8f85;hp=599776ba9ea98593ce1198e3cec05f68ed7b79db;hb=ef185c83909bd08da827e281ef05ae4b85a6b53b;hpb=f7a1cc68313147ec921d4c82df1890abe00e4032 diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx index 599776ba9ea..0bb13bcbcff 100644 --- a/STEER/AliSimulation.cxx +++ b/STEER/AliSimulation.cxx @@ -114,6 +114,7 @@ #include #include #include +#include #include "AliAlignObj.h" #include "AliCDBEntry.h" @@ -125,7 +126,7 @@ #include "AliCodeTimer.h" #include "AliDAQ.h" #include "AliDigitizer.h" -#include "AliESD.h" +#include "AliESDEvent.h" #include "AliGRPObject.h" #include "AliGenEventHeader.h" #include "AliGenerator.h" @@ -165,7 +166,7 @@ AliSimulation::AliSimulation(const char* configFileName, fLoadAlObjsListOfDets("ALL"), fMakeSDigits("ALL"), fMakeDigits("ALL"), - fMakeTrigger(""), + fTriggerConfig(""), fMakeDigitsFromHits(""), fWriteRawData(""), fRawDataFileName(""), @@ -181,6 +182,7 @@ AliSimulation::AliSimulation(const char* configFileName, fUseBkgrdVertex(kTRUE), fRegionOfInterest(kFALSE), fCDBUri(""), + fQARefUri(""), fSpecCDBUri(), fRun(-1), fSeed(0), @@ -191,10 +193,12 @@ AliSimulation::AliSimulation(const char* configFileName, fLego(NULL), fQADetectors("ALL"), fQATasks("ALL"), - fQASteer(NULL), fRunQA(kTRUE), fEventSpecie(AliRecoParam::kDefault), + fWriteQAExpertData(kTRUE), + fGeometryFile(), fRunHLT("default"), + fpHLT(NULL), fWriteGRPEntry(kTRUE) { // create simulation object with default parameters @@ -202,10 +206,10 @@ AliSimulation::AliSimulation(const char* configFileName, SetGAliceFile("galice.root"); // for QA - fQASteer = new AliQADataMakerSteer("sim") ; - fQASteer->SetActiveDetectors(fQADetectors) ; - fQATasks = Form("%d %d %d", AliQA::kHITS, AliQA::kSDIGITS, AliQA::kDIGITS) ; - fQASteer->SetTasks(fQATasks) ; + AliQAManager * qam = AliQAManager::QAManager(AliQAv1::kSIMMODE) ; + qam->SetActiveDetectors(fQADetectors) ; + fQATasks = Form("%d %d %d", AliQAv1::kHITS, AliQAv1::kSDIGITS, AliQAv1::kDIGITS) ; + qam->SetTasks(fQATasks) ; } //_____________________________________________________________________________ @@ -225,8 +229,8 @@ AliSimulation::~AliSimulation() fSpecCDBUri.Delete(); if (fgInstance==this) fgInstance = 0; - delete fQASteer ; - + AliQAManager::QAManager()->ShowQA() ; + AliQAManager::Destroy() ; AliCodeTimer::Instance()->Print(); } @@ -239,6 +243,45 @@ void AliSimulation::SetNumberOfEvents(Int_t nEvents) fNEvents = nEvents; } +//_____________________________________________________________________________ +void AliSimulation::InitQA() +{ + // activate a default CDB storage + // First check if we have any CDB storage set, because it is used + // to retrieve the calibration and alignment constants + + if (fInitCDBCalled) return; + fInitCDBCalled = kTRUE; + + AliQAManager * qam = AliQAManager::QAManager(AliQAv1::kSIMMODE) ; + qam->SetActiveDetectors(fQADetectors) ; + fQATasks = Form("%d %d %d", AliQAv1::kHITS, AliQAv1::kSDIGITS, AliQAv1::kDIGITS) ; + qam->SetTasks(fQATasks) ; + if (fWriteQAExpertData) + qam->SetWriteExpert() ; + + if (qam->IsDefaultStorageSet()) { + AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + AliWarning("Default QA reference storage has been already set !"); + AliWarning(Form("Ignoring the default storage declared in AliSimulation: %s",fQARefUri.Data())); + AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + fQARefUri = qam->GetDefaultStorage()->GetURI(); + } else { + if (fQARefUri.Length() > 0) { + AliDebug(2,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + AliDebug(2, Form("Default QA reference storage is set to: %s", fQARefUri.Data())); + AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + } else { + fQARefUri="local://$ALICE_ROOT/QARef"; + AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + AliWarning("Default QA reference storage not yet set !!!!"); + AliWarning(Form("Setting it now to: %s", fQARefUri.Data())); + AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + } + qam->SetDefaultStorage(fQARefUri); + } +} + //_____________________________________________________________________________ void AliSimulation::InitCDB() { @@ -265,7 +308,7 @@ void AliSimulation::InitCDB() AliDebug(2, Form("Default CDB storage is set to: %s", fCDBUri.Data())); AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } else { - fCDBUri="local://$ALICE_ROOT"; + fCDBUri="local://$ALICE_ROOT/OCDB"; AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); AliWarning("Default CDB storage not yet set !!!!"); AliWarning(Form("Setting it now to: %s", fCDBUri.Data())); @@ -302,16 +345,11 @@ void AliSimulation::InitRunNumber(){ } if(fRun >= 0) { - AliDebug(2,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); AliDebug(2, Form("Setting CDB run number to: %d",fRun)); - AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } else { fRun=0; - AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); - AliWarning("Run number not yet set !!!!"); - AliWarning(Form("Setting it now to: %d", fRun)); - AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); - + AliWarning(Form("Run number not yet set !!!! Setting it now to: %d", + fRun)); } man->SetRun(fRun); @@ -329,11 +367,20 @@ void AliSimulation::SetCDBLock() { //_____________________________________________________________________________ void AliSimulation::SetDefaultStorage(const char* uri) { -// Store the desired default CDB storage location -// Activate it later within the Run() method - + // Store the desired default CDB storage location + // Activate it later within the Run() method + fCDBUri = uri; + +} +//_____________________________________________________________________________ +void AliSimulation::SetQARefDefaultStorage(const char* uri) { + // Store the desired default CDB storage location + // Activate it later within the Run() method + + fQARefUri = uri; + AliQAv1::SetQARefStorage(fQARefUri.Data()) ; } //_____________________________________________________________________________ @@ -480,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){ @@ -556,24 +603,35 @@ Bool_t AliSimulation::Run(Int_t nEvents) // run the generation, simulation and digitization - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) + AliSysInfo::AddStamp("Start_Run"); // Load run number and seed from environmental vars ProcessEnvironmentVars(); + AliSysInfo::AddStamp("ProcessEnvironmentVars"); gRandom->SetSeed(fSeed); if (nEvents > 0) fNEvents = nEvents; + // create and setup the HLT instance + if (!fRunHLT.IsNull() && !CreateHLT()) { + if (fStopOnError) return kFALSE; + // disable HLT + fRunHLT=""; + } + // generation and simulation -> hits if (fRunGeneration) { if (!RunSimulation()) if (fStopOnError) return kFALSE; } + AliSysInfo::AddStamp("RunSimulation"); // initialize CDB storage from external environment // (either CDB manager or AliSimulation setters), // if not already done in RunSimulation() InitCDB(); + AliSysInfo::AddStamp("InitCDB"); // Set run number in CDBManager from data // From this point on the run number must be always loaded from data! @@ -587,6 +645,8 @@ Bool_t AliSimulation::Run(Int_t nEvents) if (!AliGeomManager::GetGeometry()) { // Initialize the geometry manager AliGeomManager::LoadGeometry("geometry.root"); + AliSysInfo::AddStamp("GetGeometry"); + // // Check that the consistency of symbolic names for the activated subdetectors // // in the geometry loaded by AliGeomManager @@ -609,6 +669,7 @@ Bool_t AliSimulation::Run(Int_t nEvents) // Misalign geometry if(!MisalignGeometry()) if (fStopOnError) return kFALSE; } + AliSysInfo::AddStamp("MissalignGeometry"); // hits -> summable digits @@ -643,13 +704,15 @@ Bool_t AliSimulation::Run(Int_t nEvents) } } + AliSysInfo::AddStamp("Hits2Digits"); // digits -> trigger - if (!RunTrigger(fMakeTrigger,fMakeDigits)) { + if (!RunTrigger(fTriggerConfig,fMakeDigits)) { if (fStopOnError) return kFALSE; } + AliSysInfo::AddStamp("RunTrigger"); // digits -> raw data @@ -660,6 +723,7 @@ Bool_t AliSimulation::Run(Int_t nEvents) } } + AliSysInfo::AddStamp("WriteRaw"); // run HLT simulation on simulated digit data if raw data is not // simulated, otherwise its called as part of WriteRawData @@ -668,6 +732,8 @@ Bool_t AliSimulation::Run(Int_t nEvents) if (fStopOnError) return kFALSE; } } + + AliSysInfo::AddStamp("RunHLT"); //QA if (fRunQA) { @@ -677,6 +743,8 @@ Bool_t AliSimulation::Run(Int_t nEvents) return kFALSE ; } + AliSysInfo::AddStamp("RunQA"); + // Cleanup of CDB manager: cache and active storages! AliCDBManager::Instance()->ClearCache(); @@ -728,7 +796,7 @@ Bool_t AliSimulation::RunLego(const char *setup, Int_t nc1, Float_t c1min, // run the generation and simulation - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) // initialize CDB storage and run number from external environment // (either CDB manager or AliSimulation setters) @@ -781,22 +849,22 @@ Bool_t AliSimulation::RunLego(const char *setup, Int_t nc1, Float_t c1min, AliWarning("Run number not initialized!!"); } - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); 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::GetRunLoader()->MakeTree("E"); + AliRunLoader::Instance()->MakeTree("E"); // // Save stuff at the beginning of the file to avoid file corruption - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); gAlice->Write(); //Save current generator @@ -808,7 +876,7 @@ Bool_t AliSimulation::RunLego(const char *setup, Int_t nc1, Float_t c1min, //Run Lego Object - AliRunLoader::GetRunLoader()->SetNumberOfEventsPerFile(nev); + AliRunLoader::Instance()->SetNumberOfEventsPerFile(nev); gMC->ProcessRun(nev); // End of this run, close files @@ -826,7 +894,7 @@ Bool_t AliSimulation::RunTrigger(const char* config, const char* detectors) { // run the trigger - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) // initialize CDB storage from external environment // (either CDB manager or AliSimulation setters), @@ -846,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."); @@ -889,13 +957,16 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) { // run the generation and simulation - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) // initialize CDB storage and run number from external environment // (either CDB manager or AliSimulation setters) + AliSysInfo::AddStamp("RunSimulation_Begin"); InitCDB(); + AliSysInfo::AddStamp("RunSimulation_InitCDB"); InitRunNumber(); SetCDBLock(); + AliSysInfo::AddStamp("RunSimulation_SetCDBLock"); if (!gAlice) { AliError("no gAlice object. Restart aliroot and try again."); @@ -917,48 +988,45 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) gROOT->LoadMacro(fConfigFileName.Data()); gInterpreter->ProcessLine(gAlice->GetConfigFunction()); + AliSysInfo::AddStamp("RunSimulation_Config"); if(AliCDBManager::Instance()->GetRun() >= 0) { - gAlice->SetRunNumber(AliCDBManager::Instance()->GetRun()); + AliRunLoader::Instance()->SetRunNumber(AliCDBManager::Instance()->GetRun()); + AliRunLoader::Instance()->SetNumberOfEventsPerRun(fNEvents); } else { AliWarning("Run number not initialized!!"); } - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); AliPDG::AddParticlesToPdgDataBase(); - gAlice->GetMCApp()->Init(); - 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::GetRunLoader()->MakeTree("E"); - AliRunLoader::GetRunLoader()->LoadKinematics("RECREATE"); - AliRunLoader::GetRunLoader()->LoadTrackRefs("RECREATE"); - AliRunLoader::GetRunLoader()->LoadHits("all","RECREATE"); + AliRunLoader::Instance()->MakeTree("E"); + AliRunLoader::Instance()->LoadKinematics("RECREATE"); + AliRunLoader::Instance()->LoadTrackRefs("RECREATE"); + AliRunLoader::Instance()->LoadHits("all","RECREATE"); // // Save stuff at the beginning of the file to avoid file corruption - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); gAlice->Write(); gAlice->SetEventNrInRun(-1); //important - we start Begin event from increasing current number in run + 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 AliInfo(Form("Run number: %d",AliCDBManager::Instance()->GetRun())); - AliRunLoader* runLoader = AliRunLoader::GetRunLoader(); + AliRunLoader* runLoader = AliRunLoader::Instance(); if (!runLoader) { AliError(Form("gAlice has no run loader object. " "Check your config file: %s", fConfigFileName.Data())); @@ -983,9 +1051,10 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) if(!AliGeomManager::CheckSymNamesLUT(detsToBeChecked.Data())) AliFatalClass("Current loaded geometry differs in the definition of symbolic names!"); MisalignGeometry(runLoader); + AliSysInfo::AddStamp("RunSimulation_MisalignGeometry"); #endif -// AliRunLoader* runLoader = AliRunLoader::GetRunLoader(); +// AliRunLoader* runLoader = AliRunLoader::Instance(); // if (!runLoader) { // AliError(Form("gAlice has no run loader object. " // "Check your config file: %s", fConfigFileName.Data())); @@ -1002,6 +1071,7 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) // Write GRP entry corresponding to the setting found in Cofig.C if (fWriteGRPEntry) WriteGRPEntry(); + AliSysInfo::AddStamp("RunSimulation_WriteGRP"); if (nEvents <= 0) nEvents = fNEvents; @@ -1050,7 +1120,7 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) } AliInfo("running gAlice"); - AliSysInfo::AddStamp("Start_simulation"); + AliSysInfo::AddStamp("Start_ProcessRun"); // Create the Root Tree with one branch per detector //Hits moved to begin event -> now we are crating separate tree for each event @@ -1060,7 +1130,7 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents) // End of this run, close files if(nEvents>0) FinishRun(); - AliSysInfo::AddStamp("Stop_simulation"); + AliSysInfo::AddStamp("Stop_ProcessRun"); delete runLoader; return kTRUE; @@ -1071,7 +1141,7 @@ Bool_t AliSimulation::RunSDigitization(const char* detectors) { // run the digitization and produce summable digits static Int_t eventNr=0; - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) ; // initialize CDB storage, run number, set CDB lock InitCDB(); @@ -1088,8 +1158,9 @@ Bool_t AliSimulation::RunSDigitization(const char* detectors) if (!det || !det->IsActive()) continue; if (IsSelected(det->GetName(), detStr)) { AliInfo(Form("creating summable digits for %s", det->GetName())); - AliCodeTimerAuto(Form("creating summable digits for %s", det->GetName())); + AliCodeTimerStart(Form("creating summable digits for %s", det->GetName())); det->Hits2SDigits(); + AliCodeTimerStop(Form("creating summable digits for %s", det->GetName())); AliSysInfo::AddStamp(Form("Digit_%s_%d",det->GetName(),eventNr), 0,1, eventNr); } } @@ -1112,14 +1183,14 @@ Bool_t AliSimulation::RunDigitization(const char* detectors, { // run the digitization and produce digits from sdigits - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) // initialize CDB storage, run number, set CDB lock InitCDB(); if (!SetRunNumberFromData()) if (fStopOnError) return kFALSE; SetCDBLock(); - delete AliRunLoader::GetRunLoader(); + delete AliRunLoader::Instance(); delete gAlice; gAlice = NULL; @@ -1178,7 +1249,7 @@ Bool_t AliSimulation::RunHitsDigitization(const char* detectors) { // run the digitization and produce digits from hits - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) // initialize CDB storage, run number, set CDB lock InitCDB(); @@ -1225,20 +1296,29 @@ Bool_t AliSimulation::WriteRawData(const char* detectors, // 'selrawdata' flag can be used to enable writing of detectors raw data // accoring to the trigger cluster. - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) + AliSysInfo::AddStamp("WriteRawData_Start"); TString detStr = detectors; if (!WriteRawFiles(detStr.Data())) { if (fStopOnError) return kFALSE; } + AliSysInfo::AddStamp("WriteRawFiles"); // run HLT simulation on simulated DDL raw files // and produce HLT ddl raw files to be included in date/root file - if (IsSelected("HLT", detStr) && !fRunHLT.IsNull()) { + // bugfix 2009-06-26: the decision whether to write HLT raw data + // is taken in RunHLT. Here HLT always needs to be run in order to + // create HLT digits, unless its switched off. This is due to the + // special placement of the HLT between the generation of DDL files + // and conversion to DATE/Root file. + detStr.ReplaceAll("HLT", ""); + if (!fRunHLT.IsNull()) { if (!RunHLT()) { if (fStopOnError) return kFALSE; } } + AliSysInfo::AddStamp("WriteRawData_RunHLT"); TString dateFileName(fileName); if (!dateFileName.IsNull()) { @@ -1252,6 +1332,7 @@ Bool_t AliSimulation::WriteRawData(const char* detectors, if (!ConvertRawFilesToDate(dateFileName,selDateFileName)) { if (fStopOnError) return kFALSE; } + AliSysInfo::AddStamp("ConvertRawFilesToDate"); if (deleteIntermediateFiles) { AliRunLoader* runLoader = LoadRun("READ"); if (runLoader) for (Int_t iEvent = 0; @@ -1266,6 +1347,7 @@ Bool_t AliSimulation::WriteRawData(const char* detectors, if (!ConvertDateToRoot(dateFileName, fileName)) { if (fStopOnError) return kFALSE; } + AliSysInfo::AddStamp("ConvertDateToRoot"); if (deleteIntermediateFiles) { gSystem->Unlink(dateFileName); } @@ -1290,7 +1372,7 @@ Bool_t AliSimulation::WriteRawFiles(const char* detectors) { // convert the digits to raw data DDL files - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) AliRunLoader* runLoader = LoadRun("READ"); if (!runLoader) return kFALSE; @@ -1351,7 +1433,7 @@ Bool_t AliSimulation::ConvertRawFilesToDate(const char* dateFileName, // The second argument is not empty when the user decides to write // the detectors raw data according to the trigger cluster. - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) char* path = gSystem->Which(gSystem->Getenv("PATH"), "dateStream"); if (!path) { @@ -1563,7 +1645,7 @@ AliRunLoader* AliSimulation::LoadRun(const char* mode) const { // delete existing run loaders, open a new one and load gAlice - delete AliRunLoader::GetRunLoader(); + delete AliRunLoader::Instance(); AliRunLoader* runLoader = AliRunLoader::Open(fGAliceFileName.Data(), AliConfig::GetDefaultEventFolderName(), mode); @@ -1699,23 +1781,23 @@ Bool_t AliSimulation::ConvertRaw2SDigits(const char* rawDirectory, const char* e AliWarning("Run number not initialized!!"); } - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); 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::GetRunLoader()->MakeTree("E"); - AliRunLoader::GetRunLoader()->LoadKinematics("RECREATE"); - AliRunLoader::GetRunLoader()->LoadTrackRefs("RECREATE"); - AliRunLoader::GetRunLoader()->LoadHits("all","RECREATE"); + AliRunLoader::Instance()->MakeTree("E"); + AliRunLoader::Instance()->LoadKinematics("RECREATE"); + AliRunLoader::Instance()->LoadTrackRefs("RECREATE"); + AliRunLoader::Instance()->LoadHits("all","RECREATE"); // // Save stuff at the beginning of the file to avoid file corruption - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); gAlice->Write(); // // Initialize CDB @@ -1726,22 +1808,15 @@ Bool_t AliSimulation::ConvertRaw2SDigits(const char* rawDirectory, const char* e Int_t iDet; // // Get the runloader - AliRunLoader* runLoader = AliRunLoader::GetRunLoader(); + AliRunLoader* runLoader = AliRunLoader::Instance(); // // Open esd file if available TFile* esdFile = TFile::Open(esdFileName); - Bool_t esdOK = (esdFile != 0); - AliESD* esd = new AliESD; TTree* treeESD = 0; - if (esdOK) { - treeESD = (TTree*) esdFile->Get("esdTree"); - if (!treeESD) { - AliWarning("No ESD tree found"); - esdOK = kFALSE; - } else { - treeESD->SetBranchAddress("ESD", &esd); - } - } + AliESDEvent* esd = new AliESDEvent(); + esdFile->GetObject("esdTree", treeESD); + if (treeESD) esd->ReadFromTree(treeESD); + // // Create the RawReader TString fileName(rawDirectory); @@ -1782,7 +1857,7 @@ Bool_t AliSimulation::ConvertRaw2SDigits(const char* rawDirectory, const char* e // // If ESD information available obtain reconstructed vertex and store in header. - if (esdOK) { + if (treeESD) { treeESD->GetEvent(nev); const AliESDVertex* esdVertex = esd->GetPrimaryVertex(); Double_t position[3]; @@ -1823,7 +1898,7 @@ void AliSimulation::FinishRun() if(IsLegoRun()) { AliDebug(1, "Finish Lego"); - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); fLego->FinishRun(); } @@ -1835,16 +1910,16 @@ void AliSimulation::FinishRun() detector->FinishRun(); } - AliDebug(1, "AliRunLoader::GetRunLoader()->WriteHeader(OVERWRITE)"); - AliRunLoader::GetRunLoader()->WriteHeader("OVERWRITE"); + AliDebug(1, "AliRunLoader::Instance()->WriteHeader(OVERWRITE)"); + AliRunLoader::Instance()->WriteHeader("OVERWRITE"); // Write AliRun info and all detectors parameters - AliRunLoader::GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); gAlice->Write(0,TObject::kOverwrite);//write AliRun - AliRunLoader::GetRunLoader()->Write(0,TObject::kOverwrite);//write RunLoader itself + AliRunLoader::Instance()->Write(0,TObject::kOverwrite);//write RunLoader itself if(gAlice->GetMCApp()) gAlice->GetMCApp()->FinishRun(); - AliRunLoader::GetRunLoader()->Synchronize(); + AliRunLoader::Instance()->Synchronize(); } //_____________________________________________________________________________ @@ -1859,6 +1934,62 @@ Int_t AliSimulation::GetDetIndex(const char* detector) return index ; } +//_____________________________________________________________________________ +Bool_t AliSimulation::CreateHLT() +{ + // Init the HLT simulation. + // The function loads the library and creates the instance of AliHLTSimulation. + // the main reason for the decoupled creation is to set the transient OCDB + // objects before the OCDB is locked + + // load the library dynamically + gSystem->Load(ALIHLTSIMULATION_LIBRARY); + + // check for the library version + AliHLTSimulationGetLibraryVersion_t fctVersion=(AliHLTSimulationGetLibraryVersion_t)(gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_GET_LIBRARY_VERSION)); + if (!fctVersion) { + AliError(Form("can not load library %s", ALIHLTSIMULATION_LIBRARY)); + return kFALSE; + } + if (fctVersion()!= ALIHLTSIMULATION_LIBRARY_VERSION) { + AliWarning(Form("%s version does not match: compiled for version %d, loaded %d", ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_LIBRARY_VERSION, fctVersion())); + } + + // print compile info + typedef void (*CompileInfo)( const char*& date, const char*& time); + CompileInfo fctInfo=(CompileInfo)gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, "CompileInfo"); + if (fctInfo) { + const char* date=""; + const char* time=""; + (*fctInfo)(date, time); + if (!date) date="unknown"; + if (!time) time="unknown"; + AliInfo(Form("%s build on %s (%s)", ALIHLTSIMULATION_LIBRARY, date, time)); + } else { + AliInfo(Form("no build info available for %s", ALIHLTSIMULATION_LIBRARY)); + } + + // create instance of the HLT simulation + AliHLTSimulationCreateInstance_t fctCreate=(AliHLTSimulationCreateInstance_t)(gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_CREATE_INSTANCE)); + if (fctCreate==NULL || (fpHLT=(fctCreate()))==NULL) { + AliError(Form("can not create instance of HLT simulation (creator %p)", fctCreate)); + return kFALSE; + } + + TString specObjects; + for (Int_t i = 0; i < fSpecCDBUri.GetEntriesFast(); i++) { + if (specObjects.Length()>0) specObjects+=" "; + specObjects+=fSpecCDBUri[i]->GetName(); + } + + AliHLTSimulationSetup_t fctSetup=(AliHLTSimulationSetup_t)(gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_SETUP)); + if (fctSetup==NULL || fctSetup(fpHLT, this, specObjects.Data())<0) { + AliWarning(Form("failed to setup HLT simulation (function %p)", fctSetup)); + } + + return kTRUE; +} + //_____________________________________________________________________________ Bool_t AliSimulation::RunHLT() { @@ -1892,52 +2023,22 @@ Bool_t AliSimulation::RunHLT() // raw data is simulated int iResult=0; + + if (!fpHLT && !CreateHLT()) { + return kFALSE; + } + AliHLTSimulation* pHLT=fpHLT; + AliRunLoader* pRunLoader = LoadRun("READ"); if (!pRunLoader) return kFALSE; // initialize CDB storage, run number, set CDB lock + // thats for the case of running HLT simulation without all the other steps + // multiple calls are handled by the function, so we can just call InitCDB(); if (!SetRunNumberFromData()) if (fStopOnError) return kFALSE; SetCDBLock(); - // load the library dynamically - gSystem->Load(ALIHLTSIMULATION_LIBRARY); - - // check for the library version - AliHLTSimulationGetLibraryVersion_t fctVersion=(AliHLTSimulationGetLibraryVersion_t)(gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_GET_LIBRARY_VERSION)); - if (!fctVersion) { - AliError(Form("can not load library %s", ALIHLTSIMULATION_LIBRARY)); - return kFALSE; - } - if (fctVersion()!= ALIHLTSIMULATION_LIBRARY_VERSION) { - AliError(Form("%s version does not match: compiled for version %d, loaded %d", ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_LIBRARY_VERSION, fctVersion())); - return kFALSE; - } - - // print compile info - typedef void (*CompileInfo)( char*& date, char*& time); - CompileInfo fctInfo=(CompileInfo)gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, "CompileInfo"); - if (fctInfo) { - Char_t* date=0; - Char_t* time=0; - (*fctInfo)(date,time); - if (!date) {date=new Char_t[8]; strcpy(date,"unknown");} - if (!time) {time=new Char_t[8]; strcpy(time,"unknown");} - AliInfo(Form("%s build on %s (%s)", ALIHLTSIMULATION_LIBRARY, date, time)); - delete date; - delete time; - } else { - AliInfo(Form("no build info available for %s", ALIHLTSIMULATION_LIBRARY)); - } - - // create instance of the HLT simulation - AliHLTSimulationCreateInstance_t fctCreate=(AliHLTSimulationCreateInstance_t)(gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, ALIHLTSIMULATION_CREATE_INSTANCE)); - AliHLTSimulation* pHLT=NULL; - if (fctCreate==NULL || (pHLT=(fctCreate()))==NULL) { - AliError(Form("can not create instance of HLT simulation (creator %p)", fctCreate)); - return kFALSE; - } - // init the HLT simulation TString options; if (fRunHLT.CompareTo("default")!=0) options=fRunHLT; @@ -1983,12 +2084,12 @@ Bool_t AliSimulation::RunQA() // run the QA on summable hits, digits or digits if(!gAlice) return kFALSE; - fQASteer->SetRunLoader(AliRunLoader::GetRunLoader()) ; + AliQAManager::QAManager()->SetRunLoader(AliRunLoader::Instance()) ; TString detectorsw("") ; Bool_t rv = kTRUE ; - fQASteer->SetEventSpecie(fEventSpecie) ; - detectorsw = fQASteer->Run(fQADetectors.Data()) ; + AliQAManager::QAManager()->SetEventSpecie(fEventSpecie) ; + detectorsw = AliQAManager::QAManager()->Run(fQADetectors.Data()) ; if ( detectorsw.IsNull() ) rv = kFALSE ; return rv ; @@ -2008,20 +2109,32 @@ Bool_t AliSimulation::SetRunQA(TString detAndAction) } Int_t colon = detAndAction.Index(":") ; fQADetectors = detAndAction(0, colon) ; - if (fQADetectors.Contains("ALL") ) - fQADetectors = Form("%s %s", fMakeDigits.Data(), fMakeDigitsFromHits.Data()) ; - fQATasks = detAndAction(colon+1, detAndAction.Sizeof() ) ; + if (fQADetectors.Contains("ALL") ){ + TString tmp = Form("%s %s", fMakeDigits.Data(), fMakeDigitsFromHits.Data()) ; + Int_t minus = fQADetectors.Last('-') ; + TString toKeep = Form("%s %s", fMakeDigits.Data(), fMakeDigitsFromHits.Data()) ; + TString toRemove("") ; + while (minus >= 0) { + toRemove = fQADetectors(minus+1, fQADetectors.Length()) ; + toRemove = toRemove.Strip() ; + toKeep.ReplaceAll(toRemove, "") ; + fQADetectors.ReplaceAll(Form("-%s", toRemove.Data()), "") ; + minus = fQADetectors.Last('-') ; + } + fQADetectors = toKeep ; + } + fQATasks = detAndAction(colon+1, detAndAction.Sizeof() ) ; if (fQATasks.Contains("ALL") ) { - fQATasks = Form("%d %d %d", AliQA::kHITS, AliQA::kSDIGITS, AliQA::kDIGITS) ; + fQATasks = Form("%d %d %d", AliQAv1::kHITS, AliQAv1::kSDIGITS, AliQAv1::kDIGITS) ; } else { fQATasks.ToUpper() ; TString tempo("") ; if ( fQATasks.Contains("HIT") ) - tempo = Form("%d ", AliQA::kHITS) ; + tempo = Form("%d ", AliQAv1::kHITS) ; if ( fQATasks.Contains("SDIGIT") ) - tempo += Form("%d ", AliQA::kSDIGITS) ; + tempo += Form("%d ", AliQAv1::kSDIGITS) ; if ( fQATasks.Contains("DIGIT") ) - tempo += Form("%d ", AliQA::kDIGITS) ; + tempo += Form("%d ", AliQAv1::kDIGITS) ; fQATasks = tempo ; if (fQATasks.IsNull()) { AliInfo("No QA requested\n") ; @@ -2030,15 +2143,15 @@ Bool_t AliSimulation::SetRunQA(TString detAndAction) } } TString tempo(fQATasks) ; - tempo.ReplaceAll(Form("%d", AliQA::kHITS), AliQA::GetTaskName(AliQA::kHITS)) ; - tempo.ReplaceAll(Form("%d", AliQA::kSDIGITS), AliQA::GetTaskName(AliQA::kSDIGITS)) ; - tempo.ReplaceAll(Form("%d", AliQA::kDIGITS), AliQA::GetTaskName(AliQA::kDIGITS)) ; + tempo.ReplaceAll(Form("%d", AliQAv1::kHITS), AliQAv1::GetTaskName(AliQAv1::kHITS)) ; + tempo.ReplaceAll(Form("%d", AliQAv1::kSDIGITS), AliQAv1::GetTaskName(AliQAv1::kSDIGITS)) ; + tempo.ReplaceAll(Form("%d", AliQAv1::kDIGITS), AliQAv1::GetTaskName(AliQAv1::kDIGITS)) ; AliInfo( Form("QA will be done on \"%s\" for \"%s\"\n", fQADetectors.Data(), tempo.Data()) ) ; fRunQA = kTRUE ; - fQASteer->SetActiveDetectors(fQADetectors) ; - fQASteer->SetTasks(fQATasks) ; - for (Int_t det = 0 ; det < AliQA::kNDET ; det++) - fQASteer->SetWriteExpert(AliQA::DETECTORINDEX_t(det)) ; + AliQAManager::QAManager()->SetActiveDetectors(fQADetectors) ; + AliQAManager::QAManager()->SetTasks(fQATasks) ; + for (Int_t det = 0 ; det < AliQAv1::kNDET ; det++) + AliQAManager::QAManager()->SetWriteExpert(AliQAv1::DETECTORINDEX_t(det)) ; return kTRUE; } @@ -2096,11 +2209,14 @@ void AliSimulation::WriteGRPEntry() grpObj->SetRunType("PHYSICS"); grpObj->SetTimeStart(0); - grpObj->SetTimeEnd(9999); + TDatime curtime; + grpObj->SetTimeStart(0); + grpObj->SetTimeEnd(curtime.Convert()); + grpObj->SetBeamEnergyIsSqrtSHalfGeV(); // new format of GRP: store sqrt(s)/2 in GeV const AliGenerator *gen = gAlice->GetMCApp()->Generator(); if (gen) { - grpObj->SetBeamEnergy(gen->GetEnergyCMS()); + grpObj->SetBeamEnergy(gen->GetEnergyCMS()/2); TString projectile; Int_t a,z; gen->GetProjectile(projectile,a,z); @@ -2141,7 +2257,7 @@ void AliSimulation::WriteGRPEntry() } } // CTP - if (!fMakeTrigger.IsNull() || strcmp(gAlice->GetTriggerDescriptor(),"")) + if (!fTriggerConfig.IsNull()) detectorPattern |= (1 << AliDAQ::DetectorID("TRG")); // HLT @@ -2152,29 +2268,24 @@ 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; - Float_t factor = field ? field->Factor() : 0; - Float_t l3current = TMath::Abs(factor)*solenoidField*30000./5.; - grpObj->SetL3Current(l3current,(AliGRPObject::Stats)0); - - if (factor > 0) { - grpObj->SetL3Polarity(0); - grpObj->SetDipolePolarity(0); - } - else { - grpObj->SetL3Polarity(1); - grpObj->SetDipolePolarity(1); - } - - if (TMath::Abs(factor) != 0) - grpObj->SetDipoleCurrent(6000,(AliGRPObject::Stats)0); - else - grpObj->SetDipoleCurrent(0,(AliGRPObject::Stats)0); + Float_t factorSol = field ? field->GetFactorSol() : 0; + Float_t currentSol = TMath::Abs(factorSol)>1E-6 ? + TMath::Nint(TMath::Abs(solenoidField/factorSol))/5.*30000.*TMath::Abs(factorSol) : 0; + // + Float_t factorDip = field ? field->GetFactorDip() : 0; + Float_t currentDip = 6000.*TMath::Abs(factorDip); + // + grpObj->SetL3Current(currentSol,(AliGRPObject::Stats)0); + grpObj->SetDipoleCurrent(currentDip,(AliGRPObject::Stats)0); + grpObj->SetL3Polarity(factorSol>0 ? 0:1); + grpObj->SetDipolePolarity(factorDip>0 ? 0:1); + grpObj->SetUniformBMap(field->IsUniform()); // for special MC with k5kGUniform map + grpObj->SetPolarityConventionLHC(); // LHC convention +/+ current -> -/- field main components + // grpObj->SetCavernTemperature(0,(AliGRPObject::Stats)0); //grpMap->Add(new TObjString("fCavernPressure"),new TObjString("0")); ---> not inserted in simulation with the new object, since it is now an AliDCSSensor