X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliReconstruction.cxx;h=d5e17bef3e3507e0336c2773a614075706332da6;hb=0bf7aade5951086bd634c5e01319145065a905f9;hp=9d4e9004df48e680f200774477658bafb08bae1c;hpb=43c9dae15a722bf623d55249bf2a480e5a3a5709;p=u%2Fmrichter%2FAliRoot.git diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx index 9d4e9004df4..d5e17bef3e3 100644 --- a/STEER/AliReconstruction.cxx +++ b/STEER/AliReconstruction.cxx @@ -129,6 +129,7 @@ #include #include #include +#include #include "AliReconstruction.h" #include "AliCodeTimer.h" @@ -177,18 +178,6 @@ #include "AliTriggerClass.h" #include "AliCTPRawStream.h" -#include "AliAODEvent.h" -#include "AliAODHeader.h" -#include "AliAODTrack.h" -#include "AliAODVertex.h" -#include "AliAODv0.h" -#include "AliAODJet.h" -#include "AliAODCaloCells.h" -#include "AliAODCaloCluster.h" -#include "AliAODPmdCluster.h" -#include "AliAODFmdCluster.h" -#include "AliAODTracklets.h" - #include "AliQADataMakerRec.h" #include "AliGlobalQADataMaker.h" #include "AliQA.h" @@ -199,6 +188,7 @@ #include "AliSysInfo.h" // memory snapshots #include "AliRawHLTManager.h" +#include "AliMagWrapCheb.h" ClassImp(AliReconstruction) @@ -211,7 +201,7 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* name, const char* title) : TNamed(name, title), - fUniformField(kTRUE), + fUniformField(kFALSE), fRunVertexFinder(kTRUE), fRunVertexFinderTracks(kTRUE), fRunHLTTracking(kFALSE), @@ -256,7 +246,7 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, fDiamondProfileTPC(NULL), fMeanVertexConstraint(kTRUE), - fGRPList(NULL), + fGRPData(NULL), fAlignObjArray(NULL), fCDBUri(), @@ -266,8 +256,22 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, fRunQA(kTRUE), fRunGlobalQA(kTRUE), fInLoopQA(kFALSE), - - fRunPlaneEff(kFALSE) + fSameQACycle(kFALSE), + + fRunPlaneEff(kFALSE), + + fesd(NULL), + fhltesd(NULL), + fesdf(NULL), + ffile(NULL), + ftree(NULL), + fhlttree(NULL), + ffileOld(NULL), + ftreeOld(NULL), + fhlttreeOld(NULL), + ftVertexer(NULL), + fIsNewRunLoader(kFALSE), + fRunAliEVE(kFALSE) { // create reconstruction object with default parameters @@ -331,7 +335,7 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) : fDiamondProfileTPC(NULL), fMeanVertexConstraint(rec.fMeanVertexConstraint), - fGRPList(NULL), + fGRPData(NULL), fAlignObjArray(rec.fAlignObjArray), fCDBUri(rec.fCDBUri), @@ -341,7 +345,21 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) : fRunQA(rec.fRunQA), fRunGlobalQA(rec.fRunGlobalQA), fInLoopQA(rec.fInLoopQA), - fRunPlaneEff(rec.fRunPlaneEff) + fSameQACycle(rec.fSameQACycle), + fRunPlaneEff(rec.fRunPlaneEff), + + fesd(NULL), + fhltesd(NULL), + fesdf(NULL), + ffile(NULL), + ftree(NULL), + fhlttree(NULL), + ffileOld(NULL), + ftreeOld(NULL), + fhlttreeOld(NULL), + ftVertexer(NULL), + fIsNewRunLoader(rec.fIsNewRunLoader), + fRunAliEVE(kFALSE) { // copy constructor @@ -496,7 +514,7 @@ Bool_t AliReconstruction::SetRunNumberFromData() AliCDBManager* man = AliCDBManager::Instance(); if(man->GetRun() > 0) { - AliWarning("Run number is taken from event header! Ignoring settings in AliCDBManager!"); + AliWarning("Run number is taken from raw-event header! Ignoring settings in AliCDBManager!"); } if (!fRunLoader) { @@ -513,8 +531,15 @@ Bool_t AliReconstruction::SetRunNumberFromData() fRawReader->RewindEvents(); } else { - AliError("No raw-data events found !"); - return kFALSE; + if(man->GetRun() > 0) { + AliWarning("No raw events is found ! Using settings in AliCDBManager !"); + man->Print(); + return kTRUE; + } + else { + AliWarning("Neither raw events nor settings in AliCDBManager are found !"); + return kFALSE; + } } } else { @@ -592,6 +617,18 @@ void AliReconstruction::SetGAliceFile(const char* fileName) fGAliceFileName = fileName; } +//_____________________________________________________________________________ +void AliReconstruction::SetInput(const char* input) +{ + // In case the input string starts with 'mem://', we run in an online mode + // and AliRawReaderDateOnline object is created. In all other cases a raw-data + // file is assumed. One can give as an input: + // mem://: - events taken from DAQ monitoring libs online + // or + // mem:// - emulation of the above mode (via DATE monitoring libs) + fInput = input; +} + //_____________________________________________________________________________ void AliReconstruction::SetOption(const char* detector, const char* option) { @@ -602,34 +639,44 @@ void AliReconstruction::SetOption(const char* detector, const char* option) fOptions.Add(new TNamed(detector, option)); } - //_____________________________________________________________________________ -Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) +Bool_t AliReconstruction::Run(const char* input) { -// run the reconstruction + // Run Run Run + AliCodeTimerAuto(""); - AliCodeTimerAuto("") - - // set the input - if (!IsOnline) { - if (!input) input = fInput.Data(); - TString fileName(input); - if (fileName.EndsWith("/")) { - fRawReader = new AliRawReaderFile(fileName); - } else if (fileName.EndsWith(".root")) { - fRawReader = new AliRawReaderRoot(fileName); - } else if (!fileName.IsNull()) { - fRawReader = new AliRawReaderDate(fileName); - } - } - else { - if (!input) { - AliError("Null pointer to the event structure!"); - return kFALSE; - } - fRawReader = new AliRawReaderDate((void *)input); + if (!InitRun(input)) return kFALSE; + + //******* The loop over events + Int_t iEvent = 0; + while ((iEvent < fRunLoader->GetNumberOfEvents()) || + (fRawReader && fRawReader->NextEvent())) { + if (!RunEvent(iEvent)) return kFALSE; + iEvent++; } + if (!FinishRun()) return kFALSE; + + return kTRUE; +} + +//_____________________________________________________________________________ +Bool_t AliReconstruction::InitRun(const char* input) +{ + // Initialize all the stuff before + // going into the event loop + // If the second argument is given, the first one is ignored and + // the reconstruction works in an online mode + AliCodeTimerAuto(""); + + // Overwrite the previous setting + if (input) fInput = input; + + // set the input in case of raw data + fRawReader = AliRawReader::Create(fInput.Data()); + if (!fRawReader) + AliInfo("Reconstruction will run over digits"); + if (!fEquipIdMap.IsNull() && fRawReader) fRawReader->LoadEquipmentIdsMap(fEquipIdMap); @@ -667,26 +714,100 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) TString geom(gSystem->DirName(fGAliceFileName)); geom += "/geometry.root"; AliGeomManager::LoadGeometry(geom.Data()); + if(!AliGeomManager::CheckSymNamesLUT()) + AliFatalClass("Current loaded geometry differs in the definition of symbolic names!"); if (!gGeoManager) if (fStopOnError) return kFALSE; } if (!MisalignGeometry(fLoadAlignData)) if (fStopOnError) return kFALSE; AliSysInfo::AddStamp("LoadGeom"); - //QA - AliQADataMakerSteer qas ; - if (fRunQA && fRawReader) qas.Run(fRunLocalReconstruction, fRawReader) ; - // checking the QA of previous steps - //CheckQA() ; - - /* - // local reconstruction - if (!fRunLocalReconstruction.IsNull()) { - if (!RunLocalReconstruction(fRunLocalReconstruction)) { - if (fStopOnError) {CleanUp(); return kFALSE;} + + // Get the GRP CDB entry + AliCDBEntry* entryGRP = AliCDBManager::Instance()->Get("GRP/GRP/Data"); + + if (entryGRP) + fGRPData = dynamic_cast(entryGRP->GetObject()); + + if (!fGRPData) { + AliError("No GRP entry found in OCDB!"); + return kFALSE; + } + + + // Magnetic field map + if (!AliTracker::GetFieldMap()) { + // Construct the field map out of the information retrieved from GRP. + // + // For the moment, this is a dummy piece of code. + // The actual map is expected to be already created in rec.C ! + // + + Float_t factor=1.; + Int_t map=AliMagWrapCheb::k5kG; + Bool_t dipoleON=kTRUE; + + // L3 + TObjString *l3Current= + dynamic_cast(fGRPData->GetValue("fL3Current")); + if (!l3Current) { + AliError("GRP/GRP/Data entry: missing value for the L3 current !"); + return kFALSE; } + TObjString *l3Polarity= + dynamic_cast(fGRPData->GetValue("fL3Polarity")); + if (!l3Polarity) { + AliError("GRP/GRP/Data entry: missing value for the L3 polarity !"); + return kFALSE; + } + + // Dipole + TObjString *diCurrent= + dynamic_cast(fGRPData->GetValue("fDipoleCurrent")); + if (!diCurrent) { + AliError("GRP/GRP/Data entry: missing value for the dipole current !"); + return kFALSE; + } + TObjString *diPolarity= + dynamic_cast(fGRPData->GetValue("fDipolePolarity")); + if (!diPolarity) { + AliError("GRP/GRP/Data entry: missing value for the dipole polarity !"); + return kFALSE; + } + + + AliMagF *field= + new AliMagWrapCheb("Maps","Maps",2,factor,10.,map,dipoleON); + AliTracker::SetFieldMap(field,fUniformField); + + //Temporary measure + AliFatal("Please, provide the field map ! Crashing deliberately..."); + + } + + + // Get the diamond profile from OCDB + AliCDBEntry* entry = AliCDBManager::Instance() + ->Get("GRP/Calib/MeanVertex"); + + if(entry) { + fDiamondProfile = dynamic_cast (entry->GetObject()); + } else { + AliError("No diamond profile found in OCDB!"); } - */ + + entry = 0; + entry = AliCDBManager::Instance() + ->Get("GRP/Calib/MeanVertexTPC"); + + if(entry) { + fDiamondProfileTPC = dynamic_cast (entry->GetObject()); + } else { + AliError("No diamond profile found in OCDB!"); + } + + ftVertexer = new AliVertexerTracks(AliTracker::GetBz()); + if(fDiamondProfile && fMeanVertexConstraint) ftVertexer->SetVtxStart(fDiamondProfile); // get vertexer if (fRunVertexFinder && !CreateVertexer()) { @@ -707,86 +828,45 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) AliSysInfo::AddStamp("LoadTrackers"); // get the possibly already existing ESD file and tree - AliESDEvent* esd = new AliESDEvent(); AliESDEvent* hltesd = new AliESDEvent(); - TFile* fileOld = NULL; - TTree* treeOld = NULL; TTree *hlttreeOld = NULL; + fesd = new AliESDEvent(); fhltesd = new AliESDEvent(); if (!gSystem->AccessPathName("AliESDs.root")){ gSystem->CopyFile("AliESDs.root", "AliESDs.old.root", kTRUE); - fileOld = TFile::Open("AliESDs.old.root"); - if (fileOld && fileOld->IsOpen()) { - treeOld = (TTree*) fileOld->Get("esdTree"); - if (treeOld)esd->ReadFromTree(treeOld); - hlttreeOld = (TTree*) fileOld->Get("HLTesdTree"); - if (hlttreeOld) hltesd->ReadFromTree(hlttreeOld); + ffileOld = TFile::Open("AliESDs.old.root"); + if (ffileOld && ffileOld->IsOpen()) { + ftreeOld = (TTree*) ffileOld->Get("esdTree"); + if (ftreeOld)fesd->ReadFromTree(ftreeOld); + fhlttreeOld = (TTree*) ffileOld->Get("HLTesdTree"); + if (fhlttreeOld) fhltesd->ReadFromTree(fhlttreeOld); } } // create the ESD output file and tree - TFile* file = TFile::Open("AliESDs.root", "RECREATE"); - file->SetCompressionLevel(2); - if (!file->IsOpen()) { + ffile = TFile::Open("AliESDs.root", "RECREATE"); + ffile->SetCompressionLevel(2); + if (!ffile->IsOpen()) { AliError("opening AliESDs.root failed"); - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } - TTree* tree = new TTree("esdTree", "Tree with ESD objects"); - esd = new AliESDEvent(); - esd->CreateStdContent(); - esd->WriteToTree(tree); + ftree = new TTree("esdTree", "Tree with ESD objects"); + fesd = new AliESDEvent(); + fesd->CreateStdContent(); + fesd->WriteToTree(ftree); - TTree* hlttree = new TTree("HLTesdTree", "Tree with HLT ESD objects"); - hltesd = new AliESDEvent(); - hltesd->CreateStdContent(); - hltesd->WriteToTree(hlttree); + fhlttree = new TTree("HLTesdTree", "Tree with HLT ESD objects"); + fhltesd = new AliESDEvent(); + fhltesd->CreateStdContent(); + fhltesd->WriteToTree(fhlttree); - /* CKB Why? - delete esd; delete hltesd; - esd = NULL; hltesd = NULL; - */ - // create the branch with ESD additions - - - AliESDfriend *esdf = 0; if (fWriteESDfriend) { - esdf = new AliESDfriend(); - TBranch *br=tree->Branch("ESDfriend.","AliESDfriend", &esdf); + fesdf = new AliESDfriend(); + TBranch *br=ftree->Branch("ESDfriend.","AliESDfriend", &fesdf); br->SetFile("AliESDfriends.root"); - esd->AddObject(esdf); + fesd->AddObject(fesdf); } - - // Get the GRP CDB entry - AliCDBEntry* entryGRP = AliCDBManager::Instance()->Get("GRP/GRP/Data"); - - if(entryGRP) { - fGRPList = dynamic_cast (entryGRP->GetObject()); - } else { - AliError("No GRP entry found in OCDB!"); - } - // Get the diamond profile from OCDB - AliCDBEntry* entry = AliCDBManager::Instance() - ->Get("GRP/Calib/MeanVertex"); - - if(entry) { - fDiamondProfile = dynamic_cast (entry->GetObject()); - } else { - AliError("No diamond profile found in OCDB!"); - } - - entry = 0; - entry = AliCDBManager::Instance() - ->Get("GRP/Calib/MeanVertexTPC"); - - if(entry) { - fDiamondProfileTPC = dynamic_cast (entry->GetObject()); - } else { - AliError("No diamond profile found in OCDB!"); - } - - AliVertexerTracks tVertexer(AliTracker::GetBz()); - if(fDiamondProfile && fMeanVertexConstraint) tVertexer.SetVtxStart(fDiamondProfile); if (fRawReader) fRawReader->RewindEvents(); @@ -795,78 +875,107 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) AliInfo(Form("Current memory usage %d %d", ProcInfo.fMemResident, ProcInfo.fMemVirtual)); + //QA + AliQADataMakerSteer qas ; + if (fRunQA && fRawReader) { + qas.Run(fRunLocalReconstruction, fRawReader) ; + fSameQACycle = kTRUE ; + } //Initialize the QA and start of cycle for out-of-cycle QA if (fRunQA) { - TString detStr(fFillESD); - for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) { - if (!IsSelected(fgkDetectorName[iDet], detStr)) continue; - AliQADataMakerRec *qadm = GetQADataMaker(iDet); - if (!qadm) continue; - AliInfo(Form("Initializing the QA data maker for %s", - fgkDetectorName[iDet])); - qadm->Init(AliQA::kRECPOINTS, AliCDBManager::Instance()->GetRun()); - qadm->Init(AliQA::kESDS, AliCDBManager::Instance()->GetRun()); - if (!fInLoopQA) { - qadm->StartOfCycle(AliQA::kRECPOINTS); - qadm->StartOfCycle(AliQA::kESDS,"same"); - } - } - } - if (fRunGlobalQA) { - AliQADataMakerRec *qadm = GetQADataMaker(fgkNDetectors); - AliInfo(Form("Initializing the global QA data maker")); - TObjArray *arr= - qadm->Init(AliQA::kRECPOINTS, AliCDBManager::Instance()->GetRun()); - AliTracker::SetResidualsArray(arr); - qadm->Init(AliQA::kESDS, AliCDBManager::Instance()->GetRun()); - if (!fInLoopQA) { - qadm->StartOfCycle(AliQA::kRECPOINTS); - qadm->StartOfCycle(AliQA::kESDS,"same"); - } +// TString detStr(fFillESD); +// for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) { +// if (!IsSelected(fgkDetectorName[iDet], detStr)) continue; +// AliQADataMakerRec *qadm = GetQADataMaker(iDet); +// if (!qadm) continue; +// AliInfo(Form("Initializing the QA data maker for %s", +// fgkDetectorName[iDet])); +// qadm->Init(AliQA::kRECPOINTS, AliCDBManager::Instance()->GetRun()); +// qadm->Init(AliQA::kESDS, AliCDBManager::Instance()->GetRun()); +// if (!fInLoopQA) { +// qadm->StartOfCycle(AliQA::kRECPOINTS, fSameQACycle); +// qadm->StartOfCycle(AliQA::kESDS,"same"); +// } +// } + if (fRunGlobalQA) { + AliQADataMakerRec *qadm = GetQADataMaker(AliQA::kGLOBAL); + AliInfo(Form("Initializing the global QA data maker")); + TObjArray *arr= + qadm->Init(AliQA::kRECPOINTS, AliCDBManager::Instance()->GetRun()); + AliTracker::SetResidualsArray(arr); + qadm->Init(AliQA::kESDS, AliCDBManager::Instance()->GetRun()); + if (!fInLoopQA) { + qadm->StartOfCycle(AliQA::kRECPOINTS, fSameQACycle); + qadm->StartOfCycle(AliQA::kESDS, "same"); + } + } + if (!fInLoopQA) + fSameQACycle = kTRUE; } //Initialize the Plane Efficiency framework if (fRunPlaneEff && !InitPlaneEff()) { - if(fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + if(fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } - //******* The loop over events - for (Int_t iEvent = 0; iEvent < fRunLoader->GetNumberOfEvents(); iEvent++) { - if (fRawReader) fRawReader->NextEvent(); - if ((iEvent < fFirstEvent) || ((fLastEvent >= 0) && (iEvent > fLastEvent))) { - // copy old ESD to the new one - if (treeOld) { - esd->ReadFromTree(treeOld); - treeOld->GetEntry(iEvent); - tree->Fill(); - } - if (hlttreeOld) { - esd->ReadFromTree(hlttreeOld); - hlttreeOld->GetEntry(iEvent); - hlttree->Fill(); - } - continue; + if (strcmp(gProgName,"alieve") == 0) + fRunAliEVE = InitAliEVE(); + + return kTRUE; +} + +//_____________________________________________________________________________ +Bool_t AliReconstruction::RunEvent(Int_t iEvent) +{ + // run the reconstruction over a single event + // The event loop is steered in Run method + + AliCodeTimerAuto(""); + + if (iEvent >= fRunLoader->GetNumberOfEvents()) { + fRunLoader->SetEventNumber(iEvent); + fRunLoader->GetHeader()->Reset(fRawReader->GetRunNumber(), + iEvent, iEvent); + //?? fRunLoader->MakeTree("H"); + fRunLoader->TreeE()->Fill(); + } + + if ((iEvent < fFirstEvent) || ((fLastEvent >= 0) && (iEvent > fLastEvent))) { + // copy old ESD to the new one + if (ftreeOld) { + fesd->ReadFromTree(ftreeOld); + ftreeOld->GetEntry(iEvent); + ftree->Fill(); } - - AliInfo(Form("processing event %d", iEvent)); + if (fhlttreeOld) { + fhltesd->ReadFromTree(fhlttreeOld); + fhlttreeOld->GetEntry(iEvent); + fhlttree->Fill(); + } + return kTRUE; + } + + AliInfo(Form("processing event %d", iEvent)); //Start of cycle for the in-loop QA if (fInLoopQA) { if (fRunQA) { TString detStr(fFillESD); for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) { - if (!IsSelected(fgkDetectorName[iDet], detStr)) continue; + if (!IsSelected(fgkDetectorName[iDet], detStr)) + continue; AliQADataMakerRec *qadm = GetQADataMaker(iDet); - if (!qadm) continue; - qadm->StartOfCycle(AliQA::kRECPOINTS); + if (!qadm) + continue; + qadm->StartOfCycle(AliQA::kRECPOINTS, fSameQACycle); qadm->StartOfCycle(AliQA::kESDS, "same") ; } - } - if (fRunGlobalQA) { - AliQADataMakerRec *qadm = GetQADataMaker(fgkNDetectors); - qadm->StartOfCycle(AliQA::kRECPOINTS); - qadm->StartOfCycle(AliQA::kESDS,"same"); - } + if (fRunGlobalQA) { + AliQADataMakerRec *qadm = GetQADataMaker(AliQA::kGLOBAL); + qadm->StartOfCycle(AliQA::kRECPOINTS, fSameQACycle); + qadm->StartOfCycle(AliQA::kESDS, "same"); + } + } } fRunLoader->GetEvent(iEvent); @@ -875,98 +984,114 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) sprintf(aFileName, "ESD_%d.%d_final.root", fRunLoader->GetHeader()->GetRun(), fRunLoader->GetHeader()->GetEventNrInRun()); - if (!gSystem->AccessPathName(aFileName)) continue; + if (!gSystem->AccessPathName(aFileName)) return kTRUE; - // local signle event reconstruction + // local single event reconstruction if (!fRunLocalReconstruction.IsNull()) { - if (!RunLocalEventReconstruction(fRunLocalReconstruction)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + TString detectors=fRunLocalReconstruction; + // run HLT event reconstruction first + // ;-( IsSelected changes the string + if (IsSelected("HLT", detectors) && + !RunLocalEventReconstruction("HLT")) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} + } + detectors=fRunLocalReconstruction; + detectors.ReplaceAll("HLT", ""); + if (!RunLocalEventReconstruction(detectors)) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } } - esd->SetRunNumber(fRunLoader->GetHeader()->GetRun()); - hltesd->SetRunNumber(fRunLoader->GetHeader()->GetRun()); - esd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun()); - hltesd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun()); + fesd->SetRunNumber(fRunLoader->GetHeader()->GetRun()); + fhltesd->SetRunNumber(fRunLoader->GetHeader()->GetRun()); + fesd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun()); + fhltesd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun()); // Set magnetic field from the tracker - esd->SetMagneticField(AliTracker::GetBz()); - hltesd->SetMagneticField(AliTracker::GetBz()); + fesd->SetMagneticField(AliTracker::GetBz()); + fhltesd->SetMagneticField(AliTracker::GetBz()); // Fill raw-data error log into the ESD - if (fRawReader) FillRawDataErrorLog(iEvent,esd); + if (fRawReader) FillRawDataErrorLog(iEvent,fesd); // vertex finder if (fRunVertexFinder) { - if (!ReadESD(esd, "vertex")) { - if (!RunVertexFinder(esd)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} - } - if (fCheckPointLevel > 0) WriteESD(esd, "vertex"); - } - } - - // HLT tracking - if (!fRunTracking.IsNull()) { - if (fRunHLTTracking) { - hltesd->SetPrimaryVertexSPD(esd->GetVertex()); - if (!RunHLTTracking(hltesd)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + if (!ReadESD(fesd, "vertex")) { + if (!RunVertexFinder(fesd)) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } + if (fCheckPointLevel > 0) WriteESD(fesd, "vertex"); } } // Muon tracking if (!fRunTracking.IsNull()) { if (fRunMuonTracking) { - if (!RunMuonTracking(esd)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + if (!RunMuonTracking(fesd)) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } } } // barrel tracking if (!fRunTracking.IsNull()) { - if (!ReadESD(esd, "tracking")) { - if (!RunTracking(esd)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + if (!ReadESD(fesd, "tracking")) { + if (!RunTracking(fesd)) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } - if (fCheckPointLevel > 0) WriteESD(esd, "tracking"); + if (fCheckPointLevel > 0) WriteESD(fesd, "tracking"); } } // fill ESD if (!fFillESD.IsNull()) { - if (!FillESD(esd, fFillESD)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + TString detectors=fFillESD; + // run HLT first and on hltesd + // ;-( IsSelected changes the string + if (IsSelected("HLT", detectors) && + !FillESD(fhltesd, "HLT")) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} + } + detectors=fFillESD; + // Temporary fix to avoid problems with HLT that overwrites the offline ESDs + if (detectors.Contains("ALL")) { + detectors=""; + for (Int_t idet=0; idet 1) WriteESD(esd, "PID"); + AliESDpid::MakePID(fesd); + if (fCheckPointLevel > 1) WriteESD(fesd, "PID"); if (fFillTriggerESD) { - if (!ReadESD(esd, "trigger")) { - if (!FillTriggerESD(esd)) { - if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;} + if (!ReadESD(fesd, "trigger")) { + if (!FillTriggerESD(fesd)) { + if (fStopOnError) {CleanUp(ffile, ffileOld); return kFALSE;} } - if (fCheckPointLevel > 1) WriteESD(esd, "trigger"); + if (fCheckPointLevel > 1) WriteESD(fesd, "trigger"); } } - file->cd(); + ffile->cd(); // - // Propagate track to the beam pipe (if not laready done by ITS) + // Propagate track to the beam pipe (if not already done by ITS) // - const Int_t ntracks = esd->GetNumberOfTracks(); - const Double_t kBz = esd->GetMagneticField(); + const Int_t ntracks = fesd->GetNumberOfTracks(); + const Double_t kBz = fesd->GetMagneticField(); const Double_t kRadius = 2.8; //something less than the beam pipe radius TObjArray trkArray; @@ -976,7 +1101,7 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) const Double_t kMaxStep = 5; //max step over the material Bool_t ok; - AliESDtrack *track = esd->GetTrack(itrack); + AliESDtrack *track = fesd->GetTrack(itrack); if (!track) continue; AliExternalTrackParam *tpcTrack = @@ -999,7 +1124,7 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) ok = AliTracker:: PropagateTrackTo(track,kRadius,track->GetMass(),kMaxStep,kTRUE); if (ok) { - track->RelateToVertex(esd->GetPrimaryVertexSPD(), kBz, kRadius); + track->RelateToVertex(fesd->GetPrimaryVertexSPD(), kBz, kRadius); } } @@ -1014,34 +1139,34 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) } if (fRunVertexFinderTracks) { // TPC + ITS primary vertex - tVertexer.SetITSrefitRequired(); + ftVertexer->SetITSrefitRequired(); if(fDiamondProfile && fMeanVertexConstraint) { - tVertexer.SetVtxStart(fDiamondProfile); + ftVertexer->SetVtxStart(fDiamondProfile); } else { - tVertexer.SetConstraintOff(); + ftVertexer->SetConstraintOff(); } - AliESDVertex *pvtx=tVertexer.FindPrimaryVertex(esd); + AliESDVertex *pvtx=ftVertexer->FindPrimaryVertex(fesd); if (pvtx) { if (pvtx->GetStatus()) { - esd->SetPrimaryVertex(pvtx); + fesd->SetPrimaryVertex(pvtx); for (Int_t i=0; iGetTrack(i); + AliESDtrack *t = fesd->GetTrack(i); t->RelateToVertex(pvtx, kBz, kRadius); } } } // TPC-only primary vertex - tVertexer.SetITSrefitNotRequired(); + ftVertexer->SetITSrefitNotRequired(); if(fDiamondProfileTPC && fMeanVertexConstraint) { - tVertexer.SetVtxStart(fDiamondProfileTPC); + ftVertexer->SetVtxStart(fDiamondProfileTPC); } else { - tVertexer.SetConstraintOff(); + ftVertexer->SetConstraintOff(); } - pvtx=tVertexer.FindPrimaryVertex(&trkArray,selectedIdx); + pvtx=ftVertexer->FindPrimaryVertex(&trkArray,selectedIdx); if (pvtx) { if (pvtx->GetStatus()) { - esd->SetPrimaryVertexTPC(pvtx); + fesd->SetPrimaryVertexTPC(pvtx); Int_t nsel=trkArray.GetEntriesFast(); for (Int_t i=0; iSetDiamond(fDiamondProfile); + if(fDiamondProfile) fesd->SetDiamond(fDiamondProfile); if (fRunV0Finder) { // V0 finding AliV0vertexer vtxer; - vtxer.Tracks2V0vertices(esd); + vtxer.Tracks2V0vertices(fesd); if (fRunCascadeFinder) { // Cascade finding AliCascadeVertexer cvtxer; - cvtxer.V0sTracks2CascadeVertices(esd); + cvtxer.V0sTracks2CascadeVertices(fesd); } } // write ESD - if (fCleanESD) CleanESD(esd); + if (fCleanESD) CleanESD(fesd); - if (fRunGlobalQA) { - AliQADataMakerRec *qadm = GetQADataMaker(fgkNDetectors); - if (qadm) qadm->Exec(AliQA::kESDS, esd); - } + if (fRunQA) { + if (fRunGlobalQA) { + AliQADataMakerRec *qadm = GetQADataMaker(AliQA::kGLOBAL); + if (qadm) qadm->Exec(AliQA::kESDS, fesd); + } + } if (fWriteESDfriend) { - esdf->~AliESDfriend(); - new (esdf) AliESDfriend(); // Reset... - esd->GetESDfriend(esdf); + fesdf->~AliESDfriend(); + new (fesdf) AliESDfriend(); // Reset... + fesd->GetESDfriend(fesdf); } - tree->Fill(); + ftree->Fill(); // write HLT ESD - hlttree->Fill(); + fhlttree->Fill(); + + // call AliEVE + if (fRunAliEVE) RunAliEVE(); - if (fCheckPointLevel > 0) WriteESD(esd, "final"); - esd->Reset(); - hltesd->Reset(); + if (fCheckPointLevel > 0) WriteESD(fesd, "final"); + fesd->Reset(); + fhltesd->Reset(); if (fWriteESDfriend) { - esdf->~AliESDfriend(); - new (esdf) AliESDfriend(); // Reset... + fesdf->~AliESDfriend(); + new (fesdf) AliESDfriend(); // Reset... } + ProcInfo_t ProcInfo; gSystem->GetProcInfo(&ProcInfo); AliInfo(Form("Event %d -> Current memory usage %d %d",iEvent, ProcInfo.fMemResident, ProcInfo.fMemVirtual)); @@ -1102,19 +1233,21 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) // End of cycle for the in-loop QA if (fInLoopQA) { if (fRunQA) { - RunQA(fFillESD.Data(), esd); + RunQA(fFillESD.Data(), fesd); TString detStr(fFillESD); for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) { - if (!IsSelected(fgkDetectorName[iDet], detStr)) continue; - AliQADataMakerRec * qadm = GetQADataMaker(iDet); - if (!qadm) continue; - qadm->EndOfCycle(AliQA::kRECPOINTS); - qadm->EndOfCycle(AliQA::kESDS); - qadm->Finish(); - } + if (!IsSelected(fgkDetectorName[iDet], detStr)) + continue; + AliQADataMakerRec * qadm = GetQADataMaker(iDet); + if (!qadm) + continue; + qadm->EndOfCycle(AliQA::kRECPOINTS); + qadm->EndOfCycle(AliQA::kESDS); + qadm->Finish(); + } } if (fRunGlobalQA) { - AliQADataMakerRec *qadm = GetQADataMaker(fgkNDetectors); + AliQADataMakerRec *qadm = GetQADataMaker(AliQA::kGLOBAL); if (qadm) { qadm->EndOfCycle(AliQA::kRECPOINTS); qadm->EndOfCycle(AliQA::kESDS); @@ -1122,13 +1255,26 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) } } } - } - //******** End of the loop over events + return kTRUE; +} + +//_____________________________________________________________________________ +Bool_t AliReconstruction::FinishRun() +{ + // Finalize the run + // Called after the exit + // from the event loop + AliCodeTimerAuto(""); + if (fIsNewRunLoader) { // galice.root didn't exist + fRunLoader->WriteHeader("OVERWRITE"); + fRunLoader->CdGAFile(); + fRunLoader->Write(0, TObject::kOverwrite); + } - tree->GetUserInfo()->Add(esd); - hlttree->GetUserInfo()->Add(hltesd); + ftree->GetUserInfo()->Add(fesd); + fhlttree->GetUserInfo()->Add(fhltesd); const TMap *cdbMap = AliCDBManager::Instance()->GetStorageMap(); const TList *cdbList = AliCDBManager::Instance()->GetRetrievedIds(); @@ -1156,24 +1302,24 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) cdbListCopy->Add(new TObjString(id->ToString().Data())); } - tree->GetUserInfo()->Add(cdbMapCopy); - tree->GetUserInfo()->Add(cdbListCopy); + ftree->GetUserInfo()->Add(cdbMapCopy); + ftree->GetUserInfo()->Add(cdbListCopy); if(fESDPar.Contains("ESD.par")){ AliInfo("Attaching ESD.par to Tree"); TNamed *fn = CopyFileToTNamed(fESDPar.Data(),"ESD.par"); - tree->GetUserInfo()->Add(fn); + ftree->GetUserInfo()->Add(fn); } - file->cd(); + ffile->cd(); if (fWriteESDfriend) - tree->SetBranchStatus("ESDfriend*",0); + ftree->SetBranchStatus("ESDfriend*",0); // we want to have only one tree version number - tree->Write(tree->GetName(),TObject::kOverwrite); - hlttree->Write(); + ftree->Write(ftree->GetName(),TObject::kOverwrite); + fhlttree->Write(); // Finish with Plane Efficiency evaluation: before of CleanUp !!! if (fRunPlaneEff && !FinishPlaneEff()) { @@ -1181,46 +1327,41 @@ Bool_t AliReconstruction::Run(const char* input, Bool_t IsOnline) } gROOT->cd(); - CleanUp(file, fileOld); + CleanUp(ffile, ffileOld); if (fWriteAOD) { - TFile *esdFile = TFile::Open("AliESDs.root", "READONLY"); - TFile *aodFile = TFile::Open("AliAOD.root", "RECREATE"); - ESDFile2AODFile(esdFile, aodFile); - aodFile->Close(); - esdFile->Close(); + AliWarning("AOD creation not supported anymore during reconstruction. See ANALYSIS/AliAnalysisTaskESDfilter.cxx instead."); } // Create tags for the events in the ESD tree (the ESD tree is always present) // In case of empty events the tags will contain dummy values AliESDTagCreator *esdtagCreator = new AliESDTagCreator(); - esdtagCreator->CreateESDTags(fFirstEvent,fLastEvent,fGRPList); + esdtagCreator->CreateESDTags(fFirstEvent,fLastEvent,fGRPData); if (fWriteAOD) { - AliAODTagCreator *aodtagCreator = new AliAODTagCreator(); - aodtagCreator->CreateAODTags(fFirstEvent,fLastEvent,fGRPList); + AliWarning("AOD tag creation not supported anymore during reconstruction."); } //Finish QA and end of cycle for out-of-loop QA if (!fInLoopQA) { - if (fRunQA) { - qas.Run(fRunLocalReconstruction.Data(), AliQA::kRECPOINTS); - //qas.Reset() ; - qas.Run(fRunTracking.Data(), AliQA::kESDS); - } - if (fRunGlobalQA) { - AliQADataMakerRec *qadm = GetQADataMaker(fgkNDetectors); - if (qadm) { - qadm->EndOfCycle(AliQA::kRECPOINTS); - qadm->EndOfCycle(AliQA::kESDS); - qadm->Finish(); - } - } + if (fRunQA) { + AliQADataMakerSteer qas; + qas.Run(fRunLocalReconstruction.Data(), AliQA::kRECPOINTS, fSameQACycle); + //qas.Reset() ; + qas.Run(fRunLocalReconstruction.Data(), AliQA::kESDS, fSameQACycle); + if (fRunGlobalQA) { + AliQADataMakerRec *qadm = GetQADataMaker(AliQA::kGLOBAL); + if (qadm) { + qadm->EndOfCycle(AliQA::kRECPOINTS); + qadm->EndOfCycle(AliQA::kESDS); + qadm->Finish(); + } + } + } } // Cleanup of CDB manager: cache and active storages! AliCDBManager::Instance()->ClearCache(); - return kTRUE; } @@ -1295,6 +1436,17 @@ Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors) AliReconstructor* reconstructor = GetReconstructor(iDet); if (!reconstructor) continue; AliLoader* loader = fLoader[iDet]; + // Matthias April 2008: temporary fix to run HLT reconstruction + // although the HLT loader is missing + if (strcmp(fgkDetectorName[iDet], "HLT")==0) { + if (fRawReader) { + reconstructor->Reconstruct(fRawReader, NULL); + } else { + TTree* dummy=NULL; + reconstructor->Reconstruct(dummy, NULL); + } + continue; + } if (!loader) { AliWarning(Form("No loader is defined for %s!",fgkDetectorName[iDet])); continue; @@ -1595,6 +1747,9 @@ Bool_t AliReconstruction::RunTracking(AliESDEvent*& esd) } // run tracking + if (iDet>1) // start filling residuals for the "outer" detectors + if (fRunGlobalQA) AliTracker::SetFillResiduals(kTRUE); + if (fTracker[iDet]->PropagateBack(esd) != 0) { AliError(Form("%s backward propagation failed", fgkDetectorName[iDet])); // return kFALSE; @@ -1615,6 +1770,8 @@ Bool_t AliReconstruction::RunTracking(AliESDEvent*& esd) } AliSysInfo::AddStamp(Form("Tracking1%s_%d",fgkDetectorName[iDet],eventNr), iDet,3, eventNr); } + //stop filling residuals for the "outer" detectors + if (fRunGlobalQA) AliTracker::SetFillResiduals(kFALSE); // write space-points to the ESD in case alignment data output // is switched on @@ -1623,13 +1780,14 @@ Bool_t AliReconstruction::RunTracking(AliESDEvent*& esd) // pass 3: TRD + TPC + ITS refit inwards - if (fRunGlobalQA) AliTracker::SetFillResiduals(kTRUE); - for (Int_t iDet = 2; iDet >= 0; iDet--) { if (!fTracker[iDet]) continue; AliDebug(1, Form("%s inward refit", fgkDetectorName[iDet])); // run tracking + if (iDet<2) // start filling residuals for TPC and ITS + if (fRunGlobalQA) AliTracker::SetFillResiduals(kTRUE); + if (fTracker[iDet]->RefitInward(esd) != 0) { AliError(Form("%s inward refit failed", fgkDetectorName[iDet])); // return kFALSE; @@ -1649,7 +1807,7 @@ Bool_t AliReconstruction::RunTracking(AliESDEvent*& esd) fLoader[iDet]->UnloadRecPoints(); AliSysInfo::AddStamp(Form("RUnloadCluster%s_%d",fgkDetectorName[iDet],eventNr), iDet,5, eventNr); } - + // stop filling residuals for TPC and ITS if (fRunGlobalQA) AliTracker::SetFillResiduals(kFALSE); eventNr++; @@ -1763,6 +1921,7 @@ Bool_t AliReconstruction::FillTriggerESD(AliESDEvent*& esd) TString configstr(""); if (!aCTP->LoadConfiguration(configstr)) { // Load CTP config from OCDB AliError("No trigger configuration found in OCDB! The trigger classes information will no be stored in ESD!"); + delete aCTP; return kFALSE; } } @@ -1789,6 +1948,7 @@ Bool_t AliReconstruction::FillTriggerESD(AliESDEvent*& esd) AliTriggerConfiguration *config = aCTP->GetConfiguration(); if (!config) { AliError("No trigger configuration has been found! The trigger classes information will no be stored in ESD!"); + if (fRawReader) delete aCTP; return kFALSE; } @@ -1800,6 +1960,7 @@ Bool_t AliReconstruction::FillTriggerESD(AliESDEvent*& esd) esd->SetTriggerClass(trclass->GetName(),trindex); } + if (fRawReader) delete aCTP; return kTRUE; } @@ -1892,19 +2053,9 @@ Bool_t AliReconstruction::InitRunLoader() CleanUp(); return kFALSE; } + fRunLoader->CdGAFile(); - if (gFile->GetKey(AliRunLoader::GetGAliceName())) { - if (fRunLoader->LoadgAlice() == 0) { - gAlice = fRunLoader->GetAliRun(); - AliTracker::SetFieldMap(gAlice->Field(),fUniformField); - } - } - if (!gAlice && !fRawReader) { - AliError(Form("no gAlice object found in file %s", - fGAliceFileName.Data())); - CleanUp(); - return kFALSE; - } + fRunLoader->LoadgAlice(); //PH This is a temporary fix to give access to the kinematics //PH that is needed for the labels of ITS clusters @@ -1926,25 +2077,13 @@ Bool_t AliReconstruction::InitRunLoader() CleanUp(); return kFALSE; } + fIsNewRunLoader = kTRUE; fRunLoader->MakeTree("E"); - Int_t iEvent = 0; - while (fRawReader->NextEvent()) { - fRunLoader->SetEventNumber(iEvent); - fRunLoader->GetHeader()->Reset(fRawReader->GetRunNumber(), - iEvent, iEvent); - fRunLoader->MakeTree("H"); - fRunLoader->TreeE()->Fill(); - iEvent++; - } - fRawReader->RewindEvents(); + if (fNumberOfEventsPerFile > 0) fRunLoader->SetNumberOfEventsPerFile(fNumberOfEventsPerFile); else - fRunLoader->SetNumberOfEventsPerFile(iEvent); - fRunLoader->WriteHeader("OVERWRITE"); - fRunLoader->CdGAFile(); - fRunLoader->Write(0, TObject::kOverwrite); -// AliTracker::SetFieldMap(???); + fRunLoader->SetNumberOfEventsPerFile((UInt_t)-1); } return kTRUE; @@ -1961,7 +2100,8 @@ AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet) TPluginManager* pluginManager = gROOT->GetPluginManager(); TString detName = fgkDetectorName[iDet]; TString recName = "Ali" + detName + "Reconstructor"; - if (gAlice && !gAlice->GetDetector(detName) && (detName != "HLT")) return NULL; + + if (!fIsNewRunLoader && !fRunLoader->GetLoader(detName+"Loader") && (detName != "HLT")) return NULL; AliReconstructor* reconstructor = NULL; // first check if a plugin is defined for the reconstructor @@ -2099,14 +2239,17 @@ void AliReconstruction::CleanUp(TFile* file, TFile* fileOld) } delete fVertexer; fVertexer = NULL; + + if (ftVertexer) delete ftVertexer; + ftVertexer = NULL; if(!(AliCDBManager::Instance()->GetCacheFlag())) { delete fDiamondProfile; fDiamondProfile = NULL; delete fDiamondProfileTPC; fDiamondProfileTPC = NULL; - delete fGRPList; - fGRPList = NULL; + delete fGRPData; + fGRPData = NULL; } @@ -2127,6 +2270,7 @@ void AliReconstruction::CleanUp(TFile* file, TFile* fileOld) delete fileOld; gSystem->Unlink("AliESDs.old.root"); } + } //_____________________________________________________________________________ @@ -2183,760 +2327,6 @@ void AliReconstruction::WriteESD(AliESDEvent* esd, const char* recStep) const } - - - -//_____________________________________________________________________________ -void AliReconstruction::ESDFile2AODFile(TFile* esdFile, TFile* aodFile) -{ - // write all files from the given esd file to an aod file - - // create an AliAOD object - AliAODEvent *aod = new AliAODEvent(); - aod->CreateStdContent(); - - // go to the file - aodFile->cd(); - - // create the tree - TTree *aodTree = new TTree("aodTree", "AliAOD tree"); - aodTree->Branch(aod->GetList()); - - // connect to ESD - TTree *t = (TTree*) esdFile->Get("esdTree"); - AliESDEvent *esd = new AliESDEvent(); - esd->ReadFromTree(t); - - Int_t nEvents = t->GetEntries(); - - // set arrays and pointers - Float_t posF[3]; - Double_t pos[3]; - Double_t p[3]; - Double_t p_pos[3]; - Double_t p_neg[3]; - Double_t covVtx[6]; - Double_t covTr[21]; - Double_t pid[10]; - - // loop over events and fill them - for (Int_t iEvent = 0; iEvent < nEvents; ++iEvent) { - //cout << "event: " << iEvent << endl; - t->GetEntry(iEvent); - - // Multiplicity information needed by the header (to be revised!) - Int_t nTracks = esd->GetNumberOfTracks(); - Int_t nPosTracks = 0; - for (Int_t iTrack=0; iTrackGetTrack(iTrack)->Charge()> 0) nPosTracks++; - - // Access the header - AliAODHeader *header = aod->GetHeader(); - - // fill the header - header->SetRunNumber (esd->GetRunNumber() ); - header->SetBunchCrossNumber(esd->GetBunchCrossNumber()); - header->SetOrbitNumber (esd->GetOrbitNumber() ); - header->SetPeriodNumber (esd->GetPeriodNumber() ); - header->SetTriggerMask (esd->GetTriggerMask() ); - header->SetTriggerCluster (esd->GetTriggerCluster() ); - header->SetEventType (esd->GetEventType() ); - header->SetMagneticField (esd->GetMagneticField() ); - header->SetZDCN1Energy (esd->GetZDCN1Energy() ); - header->SetZDCP1Energy (esd->GetZDCP1Energy() ); - header->SetZDCN2Energy (esd->GetZDCN2Energy() ); - header->SetZDCP2Energy (esd->GetZDCP2Energy() ); - header->SetZDCEMEnergy (esd->GetZDCEMEnergy(0),esd->GetZDCEMEnergy(1)); - header->SetRefMultiplicity (nTracks); - header->SetRefMultiplicityPos(nPosTracks); - header->SetRefMultiplicityNeg(nTracks - nPosTracks); - header->SetMuonMagFieldScale(-999.); // FIXME - header->SetCentrality(-999.); // FIXME - - Int_t nV0s = esd->GetNumberOfV0s(); - Int_t nCascades = esd->GetNumberOfCascades(); - Int_t nKinks = esd->GetNumberOfKinks(); - Int_t nVertices = nV0s + 2*nCascades /*could lead to two vertices, one V0 and the Xi */+ nKinks + 1 /* = prim. vtx*/; - Int_t nJets = 0; - Int_t nCaloClus = esd->GetNumberOfCaloClusters(); - Int_t nFmdClus = 0; - Int_t nPmdClus = esd->GetNumberOfPmdTracks(); - - aod->ResetStd(nTracks, nVertices, nV0s+nCascades, nJets, nCaloClus, nFmdClus, nPmdClus); - - // Array to take into account the tracks already added to the AOD - Bool_t * usedTrack = NULL; - if (nTracks>0) { - usedTrack = new Bool_t[nTracks]; - for (Int_t iTrack=0; iTrack0) { - usedV0 = new Bool_t[nV0s]; - for (Int_t iV0=0; iV00) { - usedKink = new Bool_t[nKinks]; - for (Int_t iKink=0; iKinkGetVertices()); - Int_t jVertices=0; - - // Access to the AOD container of tracks - TClonesArray &tracks = *(aod->GetTracks()); - Int_t jTracks=0; - - // Access to the AOD container of V0s - TClonesArray &V0s = *(aod->GetV0s()); - Int_t jV0s=0; - - // Add primary vertex. The primary tracks will be defined - // after the loops on the composite objects (V0, cascades, kinks) - const AliESDVertex *vtx = esd->GetPrimaryVertex(); - - vtx->GetXYZ(pos); // position - vtx->GetCovMatrix(covVtx); //covariance matrix - - AliAODVertex * primary = new(vertices[jVertices++]) - AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, -1, AliAODVertex::kPrimary); - - - AliAODTrack *aodTrack = 0x0; - - // Create vertices starting from the most complex objects - - // Cascades - for (Int_t nCascade = 0; nCascade < nCascades; ++nCascade) { - AliESDcascade *cascade = esd->GetCascade(nCascade); - - cascade->GetXYZ(pos[0], pos[1], pos[2]); - cascade->GetPosCovXi(covVtx); - - // Add the cascade vertex - AliAODVertex * vcascade = new(vertices[jVertices++]) AliAODVertex(pos, - covVtx, - cascade->GetChi2Xi(), // = chi2/NDF since NDF = 2*2-3 - primary, - nCascade, - AliAODVertex::kCascade); - - primary->AddDaughter(vcascade); // the cascade 'particle' (represented by a vertex) is added as a daughter to the primary vertex - - // Add the V0 from the cascade. The ESD class have to be optimized... - // Now we have to search for the corresponding V0 in the list of V0s - // using the indeces of the positive and negative tracks - - Int_t posFromV0 = cascade->GetPindex(); - Int_t negFromV0 = cascade->GetNindex(); - - - AliESDv0 * v0 = 0x0; - Int_t indV0 = -1; - - for (Int_t iV0=0; iV0GetV0(iV0); - Int_t posV0 = v0->GetPindex(); - Int_t negV0 = v0->GetNindex(); - - if (posV0==posFromV0 && negV0==negFromV0) { - indV0 = iV0; - break; - } - } - - AliAODVertex * vV0FromCascade = 0x0; - - if (indV0>-1 && !usedV0[indV0]) { - - // the V0 exists in the array of V0s and is not used - - usedV0[indV0] = kTRUE; - - v0->GetXYZ(pos[0], pos[1], pos[2]); - v0->GetPosCov(covVtx); - - vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos, - covVtx, - v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3 - vcascade, - indV0, - AliAODVertex::kV0); - } else { - - // the V0 doesn't exist in the array of V0s or was used - cerr << "Error: event " << iEvent << " cascade " << nCascade - << " The V0 " << indV0 - << " doesn't exist in the array of V0s or was used!" << endl; - - cascade->GetXYZ(pos[0], pos[1], pos[2]); - cascade->GetPosCov(covVtx); - - vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos, - covVtx, - v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3 - vcascade, - indV0, - AliAODVertex::kV0); - vcascade->AddDaughter(vV0FromCascade); - - } - - // Add the positive tracks from the V0 - - if (! usedTrack[posFromV0]) { - - usedTrack[posFromV0] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(posFromV0); - esdTrack->GetPxPyPz(p_pos); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - vV0FromCascade->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p_pos, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - vV0FromCascade, - kTRUE, // check if this is right - kFALSE, // check if this is right - AliAODTrack::kSecondary) - ); - aodTrack->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " cascade " << nCascade - << " track " << posFromV0 << " has already been used!" << endl; - } - - // Add the negative tracks from the V0 - - if (!usedTrack[negFromV0]) { - - usedTrack[negFromV0] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(negFromV0); - esdTrack->GetPxPyPz(p_neg); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - vV0FromCascade->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p_neg, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - vV0FromCascade, - kTRUE, // check if this is right - kFALSE, // check if this is right - AliAODTrack::kSecondary) - ); - aodTrack->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " cascade " << nCascade - << " track " << negFromV0 << " has already been used!" << endl; - } - - // add it to the V0 array as well - Double_t d0[2] = { -999., -99.}; - // counting is probably wrong - new(V0s[jV0s++]) AliAODv0(vV0FromCascade, -999., -99., p_pos, p_neg, d0); // to be refined - - // Add the bachelor track from the cascade - - Int_t bachelor = cascade->GetBindex(); - - if(!usedTrack[bachelor]) { - - usedTrack[bachelor] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(bachelor); - esdTrack->GetPxPyPz(p); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - vcascade->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - vcascade, - kTRUE, // check if this is right - kFALSE, // check if this is right - AliAODTrack::kSecondary) - ); - aodTrack->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " cascade " << nCascade - << " track " << bachelor << " has already been used!" << endl; - } - - // Add the primary track of the cascade (if any) - - } // end of the loop on cascades - - // V0s - - for (Int_t nV0 = 0; nV0 < nV0s; ++nV0) { - - if (usedV0[nV0]) continue; // skip if aready added to the AOD - - AliESDv0 *v0 = esd->GetV0(nV0); - - v0->GetXYZ(pos[0], pos[1], pos[2]); - v0->GetPosCov(covVtx); - - AliAODVertex * vV0 = - new(vertices[jVertices++]) AliAODVertex(pos, - covVtx, - v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3 - primary, - nV0, - AliAODVertex::kV0); - primary->AddDaughter(vV0); - - Int_t posFromV0 = v0->GetPindex(); - Int_t negFromV0 = v0->GetNindex(); - - // Add the positive tracks from the V0 - - if (!usedTrack[posFromV0]) { - - usedTrack[posFromV0] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(posFromV0); - esdTrack->GetPxPyPz(p_pos); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - vV0->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p_pos, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - vV0, - kTRUE, // check if this is right - kFALSE, // check if this is right - AliAODTrack::kSecondary) - ); - aodTrack->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " V0 " << nV0 - << " track " << posFromV0 << " has already been used!" << endl; - } - - // Add the negative tracks from the V0 - - if (!usedTrack[negFromV0]) { - - usedTrack[negFromV0] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(negFromV0); - esdTrack->GetPxPyPz(p_neg); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - vV0->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p_neg, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - vV0, - kTRUE, // check if this is right - kFALSE, // check if this is right - AliAODTrack::kSecondary) - ); - aodTrack->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " V0 " << nV0 - << " track " << negFromV0 << " has already been used!" << endl; - } - - // add it to the V0 array as well - Double_t d0[2] = { 999., 99.}; - new(V0s[jV0s++]) AliAODv0(vV0, 999., 99., p_pos, p_neg, d0); // to be refined - } - V0s.Expand(jV0s); - // end of the loop on V0s - - // Kinks: it is a big mess the access to the information in the kinks - // The loop is on the tracks in order to find the mother and daugther of each kink - - - for (Int_t iTrack=0; iTrackGetTrack(iTrack); - - Int_t ikink = esdTrack->GetKinkIndex(0); - - if (ikink) { - // Negative kink index: mother, positive: daughter - - // Search for the second track of the kink - - for (Int_t jTrack = iTrack+1; jTrackGetTrack(jTrack); - - Int_t jkink = esdTrack1->GetKinkIndex(0); - - if ( TMath::Abs(ikink)==TMath::Abs(jkink) ) { - - // The two tracks are from the same kink - - if (usedKink[TMath::Abs(ikink)-1]) continue; // skip used kinks - - Int_t imother = -1; - Int_t idaughter = -1; - - if (ikink<0 && jkink>0) { - - imother = iTrack; - idaughter = jTrack; - } - else if (ikink>0 && jkink<0) { - - imother = jTrack; - idaughter = iTrack; - } - else { - cerr << "Error: Wrong combination of kink indexes: " - << ikink << " " << jkink << endl; - continue; - } - - // Add the mother track - - AliAODTrack * mother = NULL; - - if (!usedTrack[imother]) { - - usedTrack[imother] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(imother); - esdTrack->GetPxPyPz(p); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - mother = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - primary, - kTRUE, // check if this is right - kTRUE, // check if this is right - AliAODTrack::kPrimary); - primary->AddDaughter(mother); - mother->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1 - << " track " << imother << " has already been used!" << endl; - } - - // Add the kink vertex - AliESDkink * kink = esd->GetKink(TMath::Abs(ikink)-1); - - AliAODVertex * vkink = - new(vertices[jVertices++]) AliAODVertex(kink->GetPosition(), - NULL, - 0., - mother, - esdTrack->GetID(), // This is the track ID of the mother's track! - AliAODVertex::kKink); - // Add the daughter track - - AliAODTrack * daughter = NULL; - - if (!usedTrack[idaughter]) { - - usedTrack[idaughter] = kTRUE; - - AliESDtrack *esdTrack = esd->GetTrack(idaughter); - esdTrack->GetPxPyPz(p); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - daughter = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - vkink, - kTRUE, // check if this is right - kTRUE, // check if this is right - AliAODTrack::kPrimary); - vkink->AddDaughter(daughter); - daughter->ConvertAliPIDtoAODPID(); - } - else { - cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1 - << " track " << idaughter << " has already been used!" << endl; - } - } - } - } - } - vertices.Expand(jVertices); - - // Tracks (primary and orphan) - for (Int_t nTrack = 0; nTrack < nTracks; ++nTrack) { - - if (usedTrack[nTrack]) continue; - - AliESDtrack *esdTrack = esd->GetTrack(nTrack); - esdTrack->GetPxPyPz(p); - esdTrack->GetXYZ(pos); - esdTrack->GetCovarianceXYZPxPyPz(covTr); - esdTrack->GetESDpid(pid); - - Float_t impactXY, impactZ; - - esdTrack->GetImpactParameters(impactXY,impactZ); - - if (impactXY<3.) { - // track inside the beam pipe - - primary->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(), - esdTrack->GetLabel(), - p, - kTRUE, - pos, - kFALSE, - covTr, - (Short_t)esdTrack->Charge(), - esdTrack->GetITSClusterMap(), - pid, - primary, - kTRUE, // check if this is right - kTRUE, // check if this is right - AliAODTrack::kPrimary) - ); - aodTrack->ConvertAliPIDtoAODPID(); - } - else { - // outside the beam pipe: orphan track - // Don't write them anymore! - continue; - } - } // end of loop on tracks - - // muon tracks - Int_t nMuTracks = esd->GetNumberOfMuonTracks(); - for (Int_t nMuTrack = 0; nMuTrack < nMuTracks; ++nMuTrack) { - - AliESDMuonTrack *esdMuTrack = esd->GetMuonTrack(nMuTrack); - p[0] = esdMuTrack->Px(); - p[1] = esdMuTrack->Py(); - p[2] = esdMuTrack->Pz(); - pos[0] = primary->GetX(); - pos[1] = primary->GetY(); - pos[2] = primary->GetZ(); - - // has to be changed once the muon pid is provided by the ESD - for (Int_t i = 0; i < 10; pid[i++] = 0.); pid[AliAODTrack::kMuon]=1.; - - primary->AddDaughter(aodTrack = - new(tracks[jTracks++]) AliAODTrack(0, // no ID provided - 0, // no label provided - p, - kTRUE, - pos, - kFALSE, - NULL, // no covariance matrix provided - esdMuTrack->Charge(), - 0, // ITSClusterMap is set below - pid, - primary, - kFALSE, // muon tracks are not used to fit the primary vtx - kFALSE, // not used for vertex fit - AliAODTrack::kPrimary) - ); - - aodTrack->SetHitsPatternInTrigCh(esdMuTrack->GetHitsPatternInTrigCh()); - Int_t track2Trigger = esdMuTrack->GetMatchTrigger(); - aodTrack->SetMatchTrigger(track2Trigger); - if (track2Trigger) - aodTrack->SetChi2MatchTrigger(esdMuTrack->GetChi2MatchTrigger()); - else - aodTrack->SetChi2MatchTrigger(0.); - } - tracks.Expand(jTracks); // remove 'empty slots' due to unwritten tracks - - // Access to the AOD container of PMD clusters - TClonesArray &pmdClusters = *(aod->GetPmdClusters()); - Int_t jPmdClusters=0; - - for (Int_t iPmd = 0; iPmd < nPmdClus; ++iPmd) { - // file pmd clusters, to be revised! - AliESDPmdTrack *pmdTrack = esd->GetPmdTrack(iPmd); - Int_t nLabel = 0; - Int_t *label = 0x0; - Double_t pos[3] = { pmdTrack->GetClusterX(), pmdTrack->GetClusterY(), pmdTrack->GetClusterZ() }; - Double_t pid[9] = { 0., 0., 0., 0., 0., 0., 0., 0., 0. }; // to be revised! - // type not set! - // assoc cluster not set - new(pmdClusters[jPmdClusters++]) AliAODPmdCluster(iPmd, nLabel, label, pmdTrack->GetClusterADC(), pos, pid); - } - - // Access to the AOD container of clusters - TClonesArray &caloClusters = *(aod->GetCaloClusters()); - Int_t jClusters=0; - - for (Int_t iClust=0; iClustGetCaloCluster(iClust); - - Int_t id = cluster->GetID(); - Int_t nLabel = 0; - Int_t *label = 0x0; - Float_t energy = cluster->E(); - cluster->GetPosition(posF); - Char_t ttype=AliAODCluster::kUndef; - - if (cluster->GetClusterType() == AliESDCaloCluster::kPHOSCluster) { - ttype=AliAODCluster::kPHOSNeutral; - } - else if (cluster->GetClusterType() == AliESDCaloCluster::kEMCALClusterv1) { - ttype = AliAODCluster::kEMCALClusterv1; - } - - - AliAODCaloCluster *caloCluster = new(caloClusters[jClusters++]) AliAODCaloCluster(id, - nLabel, - label, - energy, - pos, - NULL, - ttype); - - caloCluster->SetCaloCluster(); // to be refined! - - } - caloClusters.Expand(jClusters); // resize TObjArray to 'remove' slots for pseudo clusters - // end of loop on calo clusters - - // fill EMCAL cell info - if (esd->GetEMCALCells()) { // protection against missing ESD information - AliESDCaloCells &esdEMcells = *(esd->GetEMCALCells()); - Int_t nEMcell = esdEMcells.GetNumberOfCells() ; - - AliAODCaloCells &aodEMcells = *(aod->GetEMCALCells()); - aodEMcells.CreateContainer(nEMcell); - aodEMcells.SetType(AliAODCaloCells::kEMCAL); - for (Int_t iCell = 0; iCell < nEMcell; iCell++) { - aodEMcells.SetCell(iCell,esdEMcells.GetCellNumber(iCell),esdEMcells.GetAmplitude(iCell)); - } - aodEMcells.Sort(); - } - - // fill PHOS cell info - if (esd->GetPHOSCells()) { // protection against missing ESD information - AliESDCaloCells &esdPHcells = *(esd->GetPHOSCells()); - Int_t nPHcell = esdPHcells.GetNumberOfCells() ; - - AliAODCaloCells &aodPHcells = *(aod->GetPHOSCells()); - aodPHcells.CreateContainer(nPHcell); - aodPHcells.SetType(AliAODCaloCells::kPHOS); - for (Int_t iCell = 0; iCell < nPHcell; iCell++) { - aodPHcells.SetCell(iCell,esdPHcells.GetCellNumber(iCell),esdPHcells.GetAmplitude(iCell)); - } - aodPHcells.Sort(); - } - - // tracklets - AliAODTracklets &SPDTracklets = *(aod->GetTracklets()); - const AliMultiplicity *mult = esd->GetMultiplicity(); - if (mult) { - if (mult->GetNumberOfTracklets()>0) { - SPDTracklets.CreateContainer(mult->GetNumberOfTracklets()); - - for (Int_t n=0; nGetNumberOfTracklets(); n++) { - SPDTracklets.SetTracklet(n, mult->GetTheta(n), mult->GetPhi(n), mult->GetDeltaPhi(n), mult->GetLabel(n)); - } - } - } else { - Printf("ERROR: AliMultiplicity could not be retrieved from ESD"); - } - - delete [] usedTrack; - delete [] usedV0; - delete [] usedKink; - - // fill the tree for this event - aodTree->Fill(); - } // end of event loop - - aodTree->GetUserInfo()->Add(aod); - - // write the tree to the specified file - aodFile = aodTree->GetCurrentFile(); - aodFile->cd(); - aodTree->Write(); - - return; -} - void AliReconstruction::WriteAlignmentData(AliESDEvent* esd) { // Write space-points which are then used in the alignment procedures @@ -3021,7 +2411,7 @@ void AliReconstruction::FillRawDataErrorLog(Int_t iEvent, AliESDEvent* esd) } -TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString fName){ +TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString pName){ // Dump a file content into a char in TNamed ifstream in; in.open(fPath.Data(),ios::in | ios::binary|ios::ate); @@ -3034,9 +2424,9 @@ TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString fName){ in.read (memblock, kBytes); in.close(); TString fData(memblock,kBytes); - fn = new TNamed(fName,fData); + fn = new TNamed(pName,fData); printf("fData Size: %d \n",fData.Sizeof()); - printf("fName Size: %d \n",fName.Sizeof()); + printf("pName Size: %d \n",pName.Sizeof()); printf("fn Size: %d \n",fn->Sizeof()); delete[] memblock; } @@ -3047,21 +2437,21 @@ TNamed* AliReconstruction::CopyFileToTNamed(TString fPath,TString fName){ return fn; } -void AliReconstruction::TNamedToFile(TTree* fTree, TString fName){ +void AliReconstruction::TNamedToFile(TTree* fTree, TString pName){ // This is not really needed in AliReconstruction at the moment // but can serve as a template TList *fList = fTree->GetUserInfo(); - TNamed *fn = (TNamed*)fList->FindObject(fName.Data()); + TNamed *fn = (TNamed*)fList->FindObject(pName.Data()); printf("fn Size: %d \n",fn->Sizeof()); - TString fTmp(fn->GetName()); // to be 100% sure in principle fName also works + TString fTmp(fn->GetName()); // to be 100% sure in principle pName also works const char* cdata = fn->GetTitle(); printf("fTmp Size %d\n",fTmp.Sizeof()); int size = fn->Sizeof()-fTmp.Sizeof()-sizeof(UChar_t)-sizeof(Int_t); // see dfinition of TString::SizeOf()... printf("calculated size %d\n",size); - ofstream out(fName.Data(),ios::out | ios::binary); + ofstream out(pName.Data(),ios::out | ios::binary); out.write(cdata,size); out.close(); @@ -3086,7 +2476,7 @@ AliQADataMakerRec * AliReconstruction::GetQADataMaker(Int_t iDet) TPluginManager* pluginManager = gROOT->GetPluginManager(); TString detName = fgkDetectorName[iDet]; TString qadmName = "Ali" + detName + "QADataMakerRec"; - if (gAlice && !gAlice->GetDetector(detName) && (detName != "HLT")) + if (!fIsNewRunLoader && !fRunLoader->GetLoader(detName+"Loader") && (detName != "HLT")) return NULL; // first check if a plugin is defined for the quality assurance data maker @@ -3158,8 +2548,8 @@ void AliReconstruction::CheckQA() for (Int_t iDet = 0; iDet < AliQA::kNDET; iDet++) { TString detName(AliQA::GetDetName(iDet)) ; - AliQA * qa = AliQA::Instance(AliQA::DETECTORINDEX(iDet)) ; - if ( qa->IsSet(AliQA::DETECTORINDEX(iDet), AliQA::kSIM, AliQA::kFATAL)) { + AliQA * qa = AliQA::Instance(AliQA::DETECTORINDEX_t(iDet)) ; + if ( qa->IsSet(AliQA::DETECTORINDEX_t(iDet), AliQA::kSIM, AliQA::kFATAL)) { AliInfo(Form("QA status for %s in Hits and/or SDIGITS and/or Digits was Fatal; No reconstruction performed", detName.Data())) ; } else { if ( fRunLocalReconstruction.Contains(AliQA::GetDetName(iDet)) || @@ -3242,3 +2632,40 @@ Bool_t AliReconstruction::InitPlaneEff() { AliWarning(Form("Implementation of this method not yet done !! Method return kTRUE")); return kTRUE; } + +//_____________________________________________________________________________ +Bool_t AliReconstruction::InitAliEVE() +{ + // This method should be called only in case + // AliReconstruction is run + // within the alieve environment. + // It will initialize AliEVE in a way + // so that it can visualize event processed + // by AliReconstruction. + // The return flag shows whenever the + // AliEVE initialization was successful or not. + + TString macroStr; + macroStr.Form("%s/EVE/macros/alieve_online.C",gSystem->ExpandPathName("$ALICE_ROOT")); + AliInfo(Form("Loading AliEVE macro: %s",macroStr.Data())); + if (gROOT->LoadMacro(macroStr.Data()) != 0) return kFALSE; + + gROOT->ProcessLine("if (!gAliEveEvent) {gAliEveEvent = new AliEveEventManager();gAliEveEvent->SetAutoLoad(kTRUE);gAliEveEvent->AddNewEventCommand(\"alieve_online_on_new_event()\");gEve->AddEvent(gAliEveEvent);};"); + gROOT->ProcessLine("alieve_online_init()"); + + return kTRUE; +} + +//_____________________________________________________________________________ +void AliReconstruction::RunAliEVE() +{ + // Runs AliEVE visualisation of + // the current event. + // Should be executed only after + // successful initialization of AliEVE. + + AliInfo("Running AliEVE..."); + gROOT->ProcessLine(Form("gAliEveEvent->SetEvent((AliRunLoader*)%p,(AliRawReader*)%p,(AliESDEvent*)%p);",fRunLoader,fRawReader,fesd)); + gROOT->ProcessLine("gAliEveEvent->StartStopAutoLoadTimer();"); + gSystem->Run(); +}