X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FAliAnalysisAlien.cxx;h=e38bbb9081647bd37dac31b7132796fd97322378;hb=e144bdbca27e7d5e1de547b100cc59b712e8f1c8;hp=3e78fb7f51559143c98b10b60afae537d1994d07;hpb=65eb22f856053ffd8cca6b88bdb1289846be18c6;p=u%2Fmrichter%2FAliRoot.git diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx index 3e78fb7f515..e38bbb90816 100644 --- a/ANALYSIS/AliAnalysisAlien.cxx +++ b/ANALYSIS/AliAnalysisAlien.cxx @@ -24,6 +24,7 @@ #include "Riostream.h" #include "TEnv.h" +#include "TKey.h" #include "TBits.h" #include "TError.h" #include "TROOT.h" @@ -33,6 +34,7 @@ #include "TChain.h" #include "TObjString.h" #include "TObjArray.h" +#include "TMacro.h" #include "TGrid.h" #include "TGridResult.h" #include "TGridCollection.h" @@ -41,12 +43,29 @@ #include "TGridJobStatus.h" #include "TFileMerger.h" #include "AliAnalysisManager.h" +#include "AliAnalysisTaskCfg.h" #include "AliVEventHandler.h" #include "AliAnalysisDataContainer.h" #include "AliMultiInputEventHandler.h" ClassImp(AliAnalysisAlien) +#if 0 +; +#endif +namespace { + Bool_t copyLocal2Alien(const char* where, const char* loc, const char* rem) + { + TString sl(Form("file:%s", loc)); + TString sr(Form("alien://%s", rem)); + Bool_t ret = TFile::Cp(sl, sr); + if (!ret) { + Warning(where, "Failed to copy %s to %s", sl.Data(), sr.Data()); + } + return ret; + } +} + //______________________________________________________________________________ AliAnalysisAlien::AliAnalysisAlien() :AliAnalysisGrid(), @@ -111,7 +130,9 @@ AliAnalysisAlien::AliAnalysisAlien() fAliRootMode(), fMergeDirName(), fInputFiles(0), - fPackages(0) + fPackages(0), + fModules(0), + fProofParam() { // Dummy ctor. SetDefaults(); @@ -181,7 +202,9 @@ AliAnalysisAlien::AliAnalysisAlien(const char *name) fAliRootMode(), fMergeDirName(), fInputFiles(0), - fPackages(0) + fPackages(0), + fModules(0), + fProofParam() { // Default ctor. SetDefaults(); @@ -251,7 +274,9 @@ AliAnalysisAlien::AliAnalysisAlien(const AliAnalysisAlien& other) fAliRootMode(other.fAliRootMode), fMergeDirName(other.fMergeDirName), fInputFiles(0), - fPackages(0) + fPackages(0), + fModules(0), + fProofParam() { // Copy ctor. fGridJDL = (TGridJDL*)gROOT->ProcessLine("new TAlienJDL()"); @@ -272,16 +297,28 @@ AliAnalysisAlien::AliAnalysisAlien(const AliAnalysisAlien& other) while ((obj=next())) fPackages->Add(new TObjString(obj->GetName())); fPackages->SetOwner(); } + if (other.fModules) { + fModules = new TObjArray(); + fModules->SetOwner(); + TIter next(other.fModules); + AliAnalysisTaskCfg *mod, *crt; + while ((crt=(AliAnalysisTaskCfg*)next())) { + mod = new AliAnalysisTaskCfg(*crt); + fModules->Add(mod); + } + } } //______________________________________________________________________________ AliAnalysisAlien::~AliAnalysisAlien() { // Destructor. - if (fGridJDL) delete fGridJDL; - if (fMergingJDL) delete fMergingJDL; - if (fInputFiles) delete fInputFiles; - if (fPackages) delete fPackages; + delete fGridJDL; + delete fMergingJDL; + delete fInputFiles; + delete fPackages; + delete fModules; + fProofParam.DeleteAll(); } //______________________________________________________________________________ @@ -364,10 +401,240 @@ AliAnalysisAlien &AliAnalysisAlien::operator=(const AliAnalysisAlien& other) while ((obj=next())) fPackages->Add(new TObjString(obj->GetName())); fPackages->SetOwner(); } + if (other.fModules) { + fModules = new TObjArray(); + fModules->SetOwner(); + TIter next(other.fModules); + AliAnalysisTaskCfg *mod, *crt; + while ((crt=(AliAnalysisTaskCfg*)next())) { + mod = new AliAnalysisTaskCfg(*crt); + fModules->Add(mod); + } + } } return *this; } +//______________________________________________________________________________ +void AliAnalysisAlien::AddModule(AliAnalysisTaskCfg *module) +{ +// Adding a module. Checks if already existing. Becomes owned by this. + if (!module) return; + if (GetModule(module->GetName())) { + Error("AddModule", "A module having the same name %s already added", module->GetName()); + return; + } + if (!fModules) { + fModules = new TObjArray(); + fModules->SetOwner(); + } + fModules->Add(module); +} + +//______________________________________________________________________________ +void AliAnalysisAlien::AddModules(TObjArray *list) +{ +// Adding a list of modules. Checks if already existing. Becomes owned by this. + TIter next(list); + AliAnalysisTaskCfg *module; + while ((module = (AliAnalysisTaskCfg*)next())) AddModule(module); +} + +//______________________________________________________________________________ +Bool_t AliAnalysisAlien::CheckDependencies() +{ +// Check if all dependencies are satisfied. Reorder modules if needed. + Int_t nmodules = GetNmodules(); + if (!nmodules) { + Warning("CheckDependencies", "No modules added yet to check their dependencies"); + return kTRUE; + } + AliAnalysisTaskCfg *mod = 0; + AliAnalysisTaskCfg *dep = 0; + TString depname; + Int_t i, j, k; + for (i=0; iAt(i); + Int_t ndeps = mod->GetNdeps(); + Int_t istart = i; + for (j=0; jGetDependency(j); + dep = GetModule(depname); + if (!dep) { + Error("CheckDependencies","Dependency %s not added for module %s", + depname.Data(), mod->GetName()); + return kFALSE; + } + if (dep->NeedsDependency(mod->GetName())) { + Error("CheckDependencies","Modules %s and %s circularly depend on each other", + mod->GetName(), dep->GetName()); + return kFALSE; + } + Int_t idep = fModules->IndexOf(dep); + // The dependency task must come first + if (idep>i) { + // Remove at idep and move all objects below up one slot + // down to index i included. + fModules->RemoveAt(idep); + for (k=idep-1; k>=i; k--) fModules->AddAt(fModules->RemoveAt(k),k+1); + fModules->AddAt(dep, i++); + } + //Redo from istart if dependencies were inserted + if (i>istart) i=istart-1; + } + } + return kTRUE; +} + +//______________________________________________________________________________ +AliAnalysisManager *AliAnalysisAlien::CreateAnalysisManager(const char *name, const char *filename) +{ +// Create the analysis manager and optionally execute the macro in filename. + AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager(); + if (mgr) return mgr; + mgr = new AliAnalysisManager(name); + mgr->SetGridHandler((AliAnalysisGrid*)this); + if (strlen(filename)) { + TString line = gSystem->ExpandPathName(filename); + line.Prepend(".x "); + gROOT->ProcessLine(line.Data()); + } + return mgr; +} + +//______________________________________________________________________________ +Int_t AliAnalysisAlien::GetNmodules() const +{ +// Get number of modules. + if (!fModules) return 0; + return fModules->GetEntries(); +} + +//______________________________________________________________________________ +AliAnalysisTaskCfg *AliAnalysisAlien::GetModule(const char *name) +{ +// Get a module by name. + if (!fModules) return 0; + return (AliAnalysisTaskCfg*)fModules->FindObject(name); +} + +//______________________________________________________________________________ +Bool_t AliAnalysisAlien::LoadModule(AliAnalysisTaskCfg *mod) +{ +// Load a given module. + if (mod->IsLoaded()) return kTRUE; + Int_t ndeps = mod->GetNdeps(); + TString depname; + for (Int_t j=0; jGetDependency(j); + AliAnalysisTaskCfg *dep = GetModule(depname); + if (!dep) { + Error("LoadModule","Dependency %s not existing for module %s", + depname.Data(), mod->GetName()); + return kFALSE; + } + if (!LoadModule(dep)) { + Error("LoadModule","Dependency %s for module %s could not be loaded", + depname.Data(), mod->GetName()); + return kFALSE; + } + } + // Load libraries for the module + if (!mod->CheckLoadLibraries()) { + Error("LoadModule", "Cannot load all libraries for module %s", mod->GetName()); + return kFALSE; + } + // Execute the macro + if (mod->ExecuteMacro()<0) { + Error("LoadModule", "Executing the macro %s with arguments: %s for module %s returned a negative value", + mod->GetMacroName(), mod->GetMacroArgs(), mod->GetName()); + return kFALSE; + } + // Configure dependencies + if (mod->GetConfigMacro() && mod->ExecuteConfigMacro()<0) { + Error("LoadModule", "There was an error executing the deps config macro %s for module %s", + mod->GetConfigMacro()->GetTitle(), mod->GetName()); + return kFALSE; + } + // Adjust extra libraries + Int_t nlibs = mod->GetNlibs(); + TString lib; + for (Int_t i=0; iGetLibrary(i); + if (fAdditionalLibs.Contains(lib)) continue; + lib = Form("lib%s.so", lib.Data()); + if (!fAdditionalLibs.IsNull()) fAdditionalLibs += " "; + fAdditionalLibs += lib; + } + return kTRUE; +} + +//______________________________________________________________________________ +Bool_t AliAnalysisAlien::GenerateTest(const char *name, const char *modname) +{ +// Generate test macros for a single module or for the full train. + fAdditionalLibs = ""; + if (strlen(modname)) { + if (!CheckDependencies()) return kFALSE; + AliAnalysisTaskCfg *mod = GetModule(modname); + if (!mod) { + Error("GenerateTest", "cannot generate test for inexistent module %s", modname); + return kFALSE; + } + if (!LoadModule(mod)) return kFALSE; + } else if (!LoadModules()) return kFALSE; + AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager(); + if (!mgr->InitAnalysis()) return kFALSE; + mgr->PrintStatus(); + SetLocalTest(kTRUE); + Int_t productionMode = fProductionMode; + SetProductionMode(); + TString macro = fAnalysisMacro; + TString executable = fExecutable; + TString validation = fValidationScript; + TString execCommand = fExecutableCommand; + SetAnalysisMacro(Form("%s.C", name)); + SetExecutable(Form("%s.sh", name)); + SetExecutableCommand("aliroot -b -q "); + SetValidationScript(Form("%s_validation.sh", name)); + WriteAnalysisFile(); + WriteAnalysisMacro(); + WriteExecutable(); + WriteValidationScript(); + SetLocalTest(kFALSE); + SetProductionMode(productionMode); + fAnalysisMacro = macro; + fExecutable = executable; + fExecutableCommand = execCommand; + fValidationScript = validation; + return kTRUE; +} + +//______________________________________________________________________________ +Bool_t AliAnalysisAlien::LoadModules() +{ +// Load all modules by executing the AddTask macros. Checks first the dependencies. + fAdditionalLibs = ""; + Int_t nmodules = GetNmodules(); + if (!nmodules) { + Warning("LoadModules", "No module to be loaded"); + return kTRUE; + } + AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager(); + if (!mgr) { + Error("LoadModules", "No analysis manager created yet. Use CreateAnalysisManager first."); + return kFALSE; + } + if (!CheckDependencies()) return kFALSE; + nmodules = GetNmodules(); + AliAnalysisTaskCfg *mod; + for (Int_t imod=0; imodAt(imod); + if (!LoadModule(mod)) return kFALSE; + } + return kTRUE; +} + //______________________________________________________________________________ void AliAnalysisAlien::SetRunPrefix(const char *prefix) { @@ -411,8 +678,17 @@ void AliAnalysisAlien::AddRunList(const char* runList) void AliAnalysisAlien::AddRunNumber(const char* run) { // Add a run number to the list of runs to be processed. - if (fRunNumbers.Length()) fRunNumbers += " "; - fRunNumbers += run; + TString runs = run; + TObjString *os; + TObjArray *arr = runs.Tokenize(" "); + TIter next(arr); + TString prefix; + prefix.Append(fRunPrefix, fRunPrefix.Index("%d")); + while ((os=(TObjString*)next())){ + if (fRunNumbers.Length()) fRunNumbers += " "; + fRunNumbers += Form("%s%s", prefix.Data(), os->GetString().Data()); + } + delete arr; } //______________________________________________________________________________ @@ -692,10 +968,58 @@ Bool_t AliAnalysisAlien::CheckInputData() return kTRUE; } +//______________________________________________________________________________ +Bool_t AliAnalysisAlien::CopyLocalDataset(const char *griddir, const char *pattern, Int_t nfiles, const char *output, const char *anchorfile) +{ +// Copy data from the given grid directory according a pattern and make a local +// dataset. + if (!Connect()) { + Error("CopyLocalDataset", "Cannot copy local dataset with no grid connection"); + return kFALSE; + } + if (!DirectoryExists(griddir)) { + Error("CopyLocalDataset", "Data directory %s not existing.", griddir); + return kFALSE; + } + TString command = Form("find -z -l %d %s %s", nfiles, griddir, pattern); + printf("Running command: %s\n", command.Data()); + TGridResult *res = gGrid->Command(command); + Int_t nfound = res->GetEntries(); + if (!nfound) { + Error("CopyLocalDataset", "No file found in <%s> having pattern <%s>", griddir, pattern); + return kFALSE; + } + printf("... found %d files. Copying locally ...\n", nfound); + // Copy files locally + ofstream out; + out.open(output, ios::out); + TMap *map; + TString turl, dirname, filename, temp; + TString cdir = gSystem->WorkingDirectory(); + gSystem->MakeDirectory("data"); + gSystem->ChangeDirectory("data"); + for (Int_t i=0; iAt(i); + turl = map->GetValue("turl")->GetName(); + filename = gSystem->BaseName(turl.Data()); + dirname = gSystem->DirName(turl.Data()); + dirname = gSystem->BaseName(dirname.Data()); + gSystem->MakeDirectory(dirname); + if (TFile::Cp(turl, Form("file:./%s/%s", dirname.Data(), filename.Data()))) { + if (strlen(anchorfile)) filename = Form("%s#%s", filename.Data(), anchorfile); + out << cdir << "/data/" << Form("%s/%s", dirname.Data(), filename.Data()) << endl; + } + } + gSystem->ChangeDirectory(cdir); + delete res; + return kTRUE; +} + //______________________________________________________________________________ Bool_t AliAnalysisAlien::CreateDataset(const char *pattern) { // Create dataset for the grid data directory + run number. + const Int_t gMaxEntries = 15000; if (fProductionMode || TestBit(AliAnalysisGrid::kOffline)) return kTRUE; if (!Connect()) { Error("CreateDataset", "Cannot create dataset with no grid connection"); @@ -712,8 +1036,11 @@ Bool_t AliAnalysisAlien::CreateDataset(const char *pattern) TString command; TString options = "-x collection "; if (TestBit(AliAnalysisGrid::kTest)) options += Form("-l %d ", fNtestFiles); + else options += Form("-l %d ", gMaxEntries); // Protection for the find command TString conditions = ""; - + Int_t nstart = 0; + Int_t ncount = 0; + Int_t stage = 0; TString file; TString path; Int_t nruns = 0; @@ -730,29 +1057,65 @@ Bool_t AliAnalysisAlien::CreateDataset(const char *pattern) // CdWork(); if (TestBit(AliAnalysisGrid::kTest)) file = "wn.xml"; else file = Form("%s.xml", gSystem->BaseName(path)); - if (gSystem->AccessPathName(file) || TestBit(AliAnalysisGrid::kTest) || fOverwriteMode) { - command = "find "; - command += options; - command += path; - command += " "; - command += pattern; - command += conditions; - printf("command: %s\n", command.Data()); - TGridResult *res = gGrid->Command(command); - if (res) delete res; - // Write standard output to file - gROOT->ProcessLine(Form("gGrid->Stdout(); > %s", file.Data())); - Bool_t hasGrep = (gSystem->Exec("grep --version 2>/dev/null > /dev/null")==0)?kTRUE:kFALSE; - Bool_t nullFile = kFALSE; - if (!hasGrep) { - Warning("CreateDataset", "'grep' command not available on this system - cannot validate the result of the grid 'find' command"); - } else { - nullFile = (gSystem->Exec(Form("grep /event %s 2>/dev/null > /dev/null",file.Data()))==0)?kFALSE:kTRUE; - if (nullFile) { - Error("CreateDataset","Dataset %s produced by the previous find command is empty !", file.Data()); - return kFALSE; + while (1) { + ncount = 0; + stage++; + if (gSystem->AccessPathName(file) || TestBit(AliAnalysisGrid::kTest) || fOverwriteMode) { + command = "find "; + command += Form("%s -o %d ",options.Data(), nstart); + command += path; + command += " "; + command += pattern; + command += conditions; + printf("command: %s\n", command.Data()); + TGridResult *res = gGrid->Command(command); + if (res) delete res; + // Write standard output to file + gROOT->ProcessLine(Form("gGrid->Stdout(); > __tmp%d__%s", stage, file.Data())); + Bool_t hasGrep = (gSystem->Exec("grep --version 2>/dev/null > /dev/null")==0)?kTRUE:kFALSE; + Bool_t nullFile = kFALSE; + if (!hasGrep) { + Warning("CreateDataset", "'grep' command not available on this system - cannot validate the result of the grid 'find' command"); + } else { + nullFile = (gSystem->Exec(Form("grep -c /event __tmp%d__%s 2>/dev/null > __tmp__",stage,file.Data()))==0)?kFALSE:kTRUE; + if (nullFile) { + Error("CreateDataset","Dataset %s produced by the previous find command is empty !", file.Data()); + gSystem->Exec("rm -f __tmp*"); + return kFALSE; + } + TString line; + ifstream in; + in.open("__tmp__"); + in >> line; + in.close(); + gSystem->Exec("rm -f __tmp__"); + ncount = line.Atoi(); + } + } + if (ncount == gMaxEntries) { + Info("CreateDataset", "Dataset %s has more than 15K entries. Trying to merge...", file.Data()); + cadd = (TGridCollection*)gROOT->ProcessLine(Form("new TAlienCollection(\"__tmp%d__%s\", 1000000);",stage,file.Data())); + if (!cbase) cbase = cadd; + else { + cbase->Add(cadd); + delete cadd; } - } + nstart += ncount; + } else { + if (cbase) { + cadd = (TGridCollection*)gROOT->ProcessLine(Form("new TAlienCollection(\"__tmp%d__%s\", 1000000);",stage,file.Data())); + printf("... please wait - TAlienCollection::Add() scales badly...\n"); + cbase->Add(cadd); + delete cadd; + cbase->ExportXML(Form("file://%s", file.Data()),kFALSE,kFALSE, file, "Merged entries for a run"); + delete cbase; cbase = 0; + } else { + TFile::Cp(Form("__tmp%d__%s",stage, file.Data()), file.Data()); + } + gSystem->Exec("rm -f __tmp*"); + Info("CreateDataset", "Created dataset %s with %d files", file.Data(), nstart+ncount); + break; + } } Bool_t fileExists = FileExists(file); if (!TestBit(AliAnalysisGrid::kTest) && (!fileExists || fOverwriteMode)) { @@ -775,36 +1138,79 @@ Bool_t AliAnalysisAlien::CreateDataset(const char *pattern) TObjString *os; TIter next(arr); while ((os=(TObjString*)next())) { - path = Form("%s/%s ", fGridDataDir.Data(), os->GetString().Data()); + nstart = 0; + stage = 0; + path = Form("%s/%s/ ", fGridDataDir.Data(), os->GetString().Data()); if (!DirectoryExists(path)) continue; // CdWork(); if (TestBit(AliAnalysisGrid::kTest)) file = "wn.xml"; else file = Form("%s.xml", os->GetString().Data()); // If local collection file does not exist, create it via 'find' command. - if (gSystem->AccessPathName(file) || TestBit(AliAnalysisGrid::kTest) || fOverwriteMode) { - command = "find "; - command += options; - command += path; - command += pattern; - command += conditions; - TGridResult *res = gGrid->Command(command); - if (res) delete res; - // Write standard output to file - gROOT->ProcessLine(Form("gGrid->Stdout(); > %s", file.Data())); - Bool_t hasGrep = (gSystem->Exec("grep --version 2>/dev/null > /dev/null")==0)?kTRUE:kFALSE; - Bool_t nullFile = kFALSE; - if (!hasGrep) { - Warning("CreateDataset", "'grep' command not available on this system - cannot validate the result of the grid 'find' command"); - } else { - nullFile = (gSystem->Exec(Form("grep /event %s 2>/dev/null > /dev/null",file.Data()))==0)?kFALSE:kTRUE; - if (nullFile) { - Warning("CreateDataset","Dataset %s produced by: <%s> is empty !", file.Data(), command.Data()); - fRunNumbers.ReplaceAll(os->GetString().Data(), ""); - continue; + while (1) { + ncount = 0; + stage++; + if (gSystem->AccessPathName(file) || TestBit(AliAnalysisGrid::kTest) || fOverwriteMode) { + command = "find "; + command += Form("%s -o %d ",options.Data(), nstart); + command += path; + command += pattern; + command += conditions; + TGridResult *res = gGrid->Command(command); + if (res) delete res; + // Write standard output to file + gROOT->ProcessLine(Form("gGrid->Stdout(); > __tmp%d__%s", stage,file.Data())); + Bool_t hasGrep = (gSystem->Exec("grep --version 2>/dev/null > /dev/null")==0)?kTRUE:kFALSE; + Bool_t nullFile = kFALSE; + if (!hasGrep) { + Warning("CreateDataset", "'grep' command not available on this system - cannot validate the result of the grid 'find' command"); + } else { + nullFile = (gSystem->Exec(Form("grep -c /event __tmp%d__%s 2>/dev/null > __tmp__",stage,file.Data()))==0)?kFALSE:kTRUE; + if (nullFile) { + Warning("CreateDataset","Dataset %s produced by: <%s> is empty !", file.Data(), command.Data()); + gSystem->Exec("rm -f __tmp*"); + fRunNumbers.ReplaceAll(os->GetString().Data(), ""); + break; + } + TString line; + ifstream in; + in.open("__tmp__"); + in >> line; + in.close(); + gSystem->Exec("rm -f __tmp__"); + ncount = line.Atoi(); + } + nullResult = kFALSE; + } + if (ncount == gMaxEntries) { + Info("CreateDataset", "Dataset %s has more than 15K entries. Trying to merge...", file.Data()); + if (fNrunsPerMaster > 1) { + Error("CreateDataset", "File %s has more than %d entries. Please set the number of runs per master to 1 !", + file.Data(),gMaxEntries); + return kFALSE; + } + cadd = (TGridCollection*)gROOT->ProcessLine(Form("new TAlienCollection(\"__tmp%d__%s\", 1000000);",stage,file.Data())); + if (!cbase) cbase = cadd; + else { + cbase->Add(cadd); + delete cadd; } + nstart += ncount; + } else { + if (cbase && fNrunsPerMaster<2) { + cadd = (TGridCollection*)gROOT->ProcessLine(Form("new TAlienCollection(\"__tmp%d__%s\", 1000000);",stage,file.Data())); + printf("... please wait - TAlienCollection::Add() scales badly...\n"); + cbase->Add(cadd); + delete cadd; + cbase->ExportXML(Form("file://%s", file.Data()),kFALSE,kFALSE, file, "Merged entries for a run"); + delete cbase; cbase = 0; + } else { + TFile::Cp(Form("__tmp%d__%s",stage, file.Data()), file.Data()); + } + gSystem->Exec("rm -f __tmp*"); + Info("CreateDataset", "Created dataset %s with %d files", file.Data(), nstart+ncount); + break; } - nullResult = kFALSE; - } + } if (TestBit(AliAnalysisGrid::kTest)) break; // Check if there is one run per master job. if (fNrunsPerMaster<2) { @@ -863,6 +1269,8 @@ Bool_t AliAnalysisAlien::CreateDataset(const char *pattern) // Process a full run range. for (Int_t irun=fRunRange[0]; irun<=fRunRange[1]; irun++) { format = Form("%%s/%s ", fRunPrefix.Data()); + nstart = 0; + stage = 0; path = Form(format.Data(), fGridDataDir.Data(), irun); if (!DirectoryExists(path)) continue; // CdWork(); @@ -877,28 +1285,68 @@ Bool_t AliAnalysisAlien::CreateDataset(const char *pattern) } } // If local collection file does not exist, create it via 'find' command. - if (gSystem->AccessPathName(file) || TestBit(AliAnalysisGrid::kTest) || fOverwriteMode) { - command = "find "; - command += options; - command += path; - command += pattern; - command += conditions; - TGridResult *res = gGrid->Command(command); - if (res) delete res; - // Write standard output to file - gROOT->ProcessLine(Form("gGrid->Stdout(); > %s", file.Data())); - Bool_t hasGrep = (gSystem->Exec("grep --version 2>/dev/null > /dev/null")==0)?kTRUE:kFALSE; - Bool_t nullFile = kFALSE; - if (!hasGrep) { - Warning("CreateDataset", "'grep' command not available on this system - cannot validate the result of the grid 'find' command"); - } else { - nullFile = (gSystem->Exec(Form("grep /event %s 2>/dev/null > /dev/null",file.Data()))==0)?kFALSE:kTRUE; - if (nullFile) { - Warning("CreateDataset","Dataset %s produced by: <%s> is empty !", file.Data(), command.Data()); - continue; + while (1) { + ncount = 0; + stage++; + if (gSystem->AccessPathName(file) || TestBit(AliAnalysisGrid::kTest) || fOverwriteMode) { + command = "find "; + command += Form("%s -o %d ",options.Data(), nstart); + command += path; + command += pattern; + command += conditions; + TGridResult *res = gGrid->Command(command); + if (res) delete res; + // Write standard output to file + gROOT->ProcessLine(Form("gGrid->Stdout(); > __tmp%d__%s", stage,file.Data())); + Bool_t hasGrep = (gSystem->Exec("grep --version 2>/dev/null > /dev/null")==0)?kTRUE:kFALSE; + Bool_t nullFile = kFALSE; + if (!hasGrep) { + Warning("CreateDataset", "'grep' command not available on this system - cannot validate the result of the grid 'find' command"); + } else { + nullFile = (gSystem->Exec(Form("grep -c /event __tmp%d__%s 2>/dev/null > __tmp__",stage,file.Data()))==0)?kFALSE:kTRUE; + if (nullFile) { + Warning("CreateDataset","Dataset %s produced by: <%s> is empty !", file.Data(), command.Data()); + gSystem->Exec("rm -f __tmp*"); + break; + } + TString line; + ifstream in; + in.open("__tmp__"); + in >> line; + in.close(); + gSystem->Exec("rm -f __tmp__"); + ncount = line.Atoi(); + } + nullResult = kFALSE; + } + if (ncount == gMaxEntries) { + Info("CreateDataset", "Dataset %s has more than 15K entries. Trying to merge...", file.Data()); + if (fNrunsPerMaster > 1) { + Error("CreateDataset", "File %s has more than %d entries. Please set the number of runs per master to 1 !", + file.Data(),gMaxEntries); + return kFALSE; + } + cadd = (TGridCollection*)gROOT->ProcessLine(Form("new TAlienCollection(\"__tmp%d__%s\", 1000000);",stage,file.Data())); + if (!cbase) cbase = cadd; + else { + cbase->Add(cadd); + delete cadd; } + nstart += ncount; + } else { + if (cbase && fNrunsPerMaster<2) { + cadd = (TGridCollection*)gROOT->ProcessLine(Form("new TAlienCollection(\"__tmp%d__%s\", 1000000);",stage,file.Data())); + printf("... please wait - TAlienCollection::Add() scales badly...\n"); + cbase->Add(cadd); + delete cadd; + cbase->ExportXML(Form("file://%s", file.Data()),kFALSE,kFALSE, file, "Merged entries for a run"); + delete cbase; cbase = 0; + } else { + TFile::Cp(Form("__tmp%d__%s",stage, file.Data()), file.Data()); + } + Info("CreateDataset", "Created dataset %s with %d files", file.Data(), nstart+ncount); + break; } - nullResult = kFALSE; } if (TestBit(AliAnalysisGrid::kTest)) break; // Check if there is one run per master job. @@ -1100,8 +1548,6 @@ Bool_t AliAnalysisAlien::CreateJDL() analysisFile.ReplaceAll(".sh", ".root"); fGridJDL->AddToInputSandbox(Form("LF:%s/%s", workdir.Data(),analysisFile.Data())); fMergingJDL->AddToInputSandbox(Form("LF:%s/%s", workdir.Data(),analysisFile.Data())); - if (IsUsingTags() && !gSystem->AccessPathName("ConfigureCuts.C")) - fGridJDL->AddToInputSandbox(Form("LF:%s/ConfigureCuts.C", workdir.Data())); if (fAdditionalLibs.Length()) { arr = fAdditionalLibs.Tokenize(" "); TIter next(arr); @@ -1240,10 +1686,14 @@ Bool_t AliAnalysisAlien::CreateJDL() if (FileExists(locjdl)) gGrid->Rm(locjdl); if (FileExists(locjdl1)) gGrid->Rm(locjdl1); Info("CreateJDL", "\n##### Copying JDL file <%s> to your AliEn output directory", fJDLName.Data()); - TFile::Cp(Form("file:%s",fJDLName.Data()), Form("alien://%s", locjdl.Data())); + if (!copyLocal2Alien("CreateJDL", fJDLName, locjdl)) + Fatal("","Terminating"); +// TFile::Cp(Form("file:%s",fJDLName.Data()), Form("alien://%s", locjdl.Data())); if (fMergeViaJDL) { Info("CreateJDL", "\n##### Copying merging JDL file <%s> to your AliEn output directory", mergeJDLName.Data()); - TFile::Cp(Form("file:%s",mergeJDLName.Data()), Form("alien://%s", locjdl1.Data())); +// TFile::Cp(Form("file:%s",mergeJDLName.Data()), Form("alien://%s", locjdl1.Data())); + if (!copyLocal2Alien("CreateJDL", mergeJDLName.Data(), locjdl1)) + Fatal("","Terminating"); } } if (fAdditionalLibs.Length()) { @@ -1254,7 +1704,10 @@ Bool_t AliAnalysisAlien::CreateJDL() if (os->GetString().Contains(".so")) continue; Info("CreateJDL", "\n##### Copying dependency: <%s> to your alien workspace", os->GetString().Data()); if (FileExists(os->GetString())) gGrid->Rm(os->GetString()); - TFile::Cp(Form("file:%s",os->GetString().Data()), Form("alien://%s/%s", workdir.Data(), os->GetString().Data())); +// TFile::Cp(Form("file:%s",os->GetString().Data()), Form("alien://%s/%s", workdir.Data(), os->GetString().Data())); + if (!copyLocal2Alien("CreateJDL", os->GetString().Data(), + Form("%s/%s", workdir.Data(), os->GetString().Data()))) + Fatal("","Terminating"); } delete arr; } @@ -1264,7 +1717,10 @@ Bool_t AliAnalysisAlien::CreateJDL() while ((obj=next())) { if (FileExists(obj->GetName())) gGrid->Rm(obj->GetName()); Info("CreateJDL", "\n##### Copying dependency: <%s> to your alien workspace", obj->GetName()); - TFile::Cp(Form("file:%s",obj->GetName()), Form("alien://%s/%s", workdir.Data(), obj->GetName())); +// TFile::Cp(Form("file:%s",obj->GetName()), Form("alien://%s/%s", workdir.Data(), obj->GetName())); + if (!copyLocal2Alien("CreateJDL",obj->GetName(), + Form("%s/%s", workdir.Data(), obj->GetName()))) + Fatal("","Terminating"); } } } @@ -1296,7 +1752,10 @@ Bool_t AliAnalysisAlien::WriteJDL(Bool_t copy) while ((os=next())) { fGridJDL->AddToInputDataCollection(Form("LF:%s,nodownload", os->GetName()), "Input xml collections"); } - fGridJDL->SetOutputDirectory(Form("%s/#alien_counter_04i#", fGridOutputDir.Data())); + if (!fOutputToRunNo) + fGridJDL->SetOutputDirectory(Form("%s/#alien_counter_04i#", fGridOutputDir.Data())); + else + fGridJDL->SetOutputDirectory(fGridOutputDir); } else { if (!fRunNumbers.Length() && !fRunRange[0]) { // One jdl with no parameters in case input data is specified by name. @@ -1477,11 +1936,17 @@ Bool_t AliAnalysisAlien::WriteJDL(Bool_t copy) if (FileExists(locjdl1)) gGrid->Rm(locjdl1); if (FileExists(locjdl2)) gGrid->Rm(locjdl2); Info("WriteJDL", "\n##### Copying JDL file <%s> to your AliEn output directory", fJDLName.Data()); - TFile::Cp(Form("file:%s",fJDLName.Data()), Form("alien://%s", locjdl.Data())); +// TFile::Cp(Form("file:%s",fJDLName.Data()), Form("alien://%s", locjdl.Data())); + if (!copyLocal2Alien("WriteJDL",fJDLName.Data(),locjdl.Data())) + Fatal("","Terminating"); if (fMergeViaJDL) { Info("WriteJDL", "\n##### Copying merging JDL files <%s> to your AliEn output directory", mergeJDLName.Data()); - TFile::Cp(Form("file:%s",mergeJDLName.Data()), Form("alien://%s", locjdl1.Data())); - TFile::Cp(Form("file:%s",finalJDL.Data()), Form("alien://%s", locjdl2.Data())); +// TFile::Cp(Form("file:%s",mergeJDLName.Data()), Form("alien://%s", locjdl1.Data())); +// TFile::Cp(Form("file:%s",finalJDL.Data()), Form("alien://%s", locjdl2.Data())); + if (!copyLocal2Alien("WriteJDL",mergeJDLName.Data(),locjdl1.Data())) + Fatal("","Terminating"); + if (!copyLocal2Alien("WriteJDL",finalJDL.Data(),locjdl2.Data())) + Fatal("","Terminating"); } } return kTRUE; @@ -1957,7 +2422,9 @@ Bool_t AliAnalysisAlien::CheckMergedFiles(const char *filename, const char *alie } // Copy the file in the output directory printf("===> Copying collection %s in the output directory %s\n", Form("Stage_%d.xml",stage), aliendir); - TFile::Cp(Form("Stage_%d.xml",stage), Form("alien://%s/Stage_%d.xml",aliendir,stage)); +// TFile::Cp(Form("Stage_%d.xml",stage), Form("alien://%s/Stage_%d.xml",aliendir,stage)); + if (!copyLocal2Alien("CheckMergedFiles", Form("Stage_%d.xml",stage), + Form("%s/Stage_%d.xml",aliendir,stage))) Fatal("","Terminating"); // Check if this is the last stage to be done. Bool_t laststage = (nfiles=fMaxMergeStages) laststage = kTRUE; @@ -1977,6 +2444,27 @@ Bool_t AliAnalysisAlien::CheckMergedFiles(const char *filename, const char *alie return kTRUE; } +//______________________________________________________________________________ +AliAnalysisManager *AliAnalysisAlien::LoadAnalysisManager(const char *fname) +{ +// Loat the analysis manager from a file. + TFile *file = TFile::Open(fname); + if (!file) { + ::Error("LoadAnalysisManager", "Cannot open file %s", fname); + return 0; + } + TIter nextkey(file->GetListOfKeys()); + AliAnalysisManager *mgr = 0; + TKey *key; + while ((key=(TKey*)nextkey())) { + if (!strcmp(key->GetClassName(), "AliAnalysisManager")) + mgr = (AliAnalysisManager*)file->Get(key->GetName()); + } + if (!mgr) + ::Error("LoadAnalysisManager", "No analysis manager found in file %s", fname); + return mgr; +} + //______________________________________________________________________________ Int_t AliAnalysisAlien::SubmitSingleJob(const char *query) { @@ -2128,7 +2616,7 @@ Bool_t AliAnalysisAlien::MergeOutput(const char *output, const char *basedir, In // Loop 'find' results and get next LFN if (countZero == nmaxmerge) { // First file in chunk - create file merger and add previous chunk if any. - fm = new TFileMerger(kFALSE); + fm = new TFileMerger(kTRUE); fm->SetFastMethod(kTRUE); if (previousChunk.Length()) fm->AddFile(previousChunk.Data()); outputChunk = outputFile; @@ -2168,7 +2656,7 @@ Bool_t AliAnalysisAlien::MergeOutput(const char *output, const char *basedir, In } // Merging stage different than 0. // Move to the begining of the requested chunk. - fm = new TFileMerger(kFALSE); + fm = new TFileMerger(kTRUE); fm->SetFastMethod(kTRUE); while ((nextfile=next())) fm->AddFile(nextfile->GetName()); delete listoffiles; @@ -2217,7 +2705,7 @@ Bool_t AliAnalysisAlien::MergeOutputs() return kFALSE; } // Get the output path - if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("/%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data()); + if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data()); if (!DirectoryExists(fGridOutputDir)) { Error("MergeOutputs", "Grid output directory %s not found. Terminate() will NOT be executed", fGridOutputDir.Data()); return kFALSE; @@ -2345,6 +2833,30 @@ void AliAnalysisAlien::SetPreferedSE(const char */*se*/) Warning("SetPreferedSE", "Setting a preferential SE is not allowed anymore via the plugin. Use SetNumberOfReplicas() and SetDefaultOutputs()"); } +//______________________________________________________________________________ +void AliAnalysisAlien::SetProofParameter(const char *pname, const char *value) +{ +// Set some PROOF special parameter. + TPair *pair = dynamic_cast(fProofParam.FindObject(pname)); + if (pair) { + TObject *old = pair->Key(); + TObject *val = pair->Value(); + fProofParam.Remove(old); + delete old; + delete val; + } + fProofParam.Add(new TObjString(pname), new TObjString(value)); +} + +//______________________________________________________________________________ +const char *AliAnalysisAlien::GetProofParameter(const char *pname) const +{ +// Returns a special PROOF parameter. + TPair *pair = dynamic_cast(fProofParam.FindObject(pname)); + if (!pair) return 0; + return pair->Value()->GetName(); +} + //______________________________________________________________________________ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEntry*/) { @@ -2357,7 +2869,8 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn } // Are we in PROOF mode ? if (mgr->IsProofMode()) { - Info("StartAnalysis", "##### Starting PROOF analysis on cluster <%s> via the plugin #####", fProofCluster.Data()); + if (testMode) Info("StartAnalysis", "##### Starting PROOF analysis with Proof Lite via the plugin #####"); + else Info("StartAnalysis", "##### Starting PROOF analysis on cluster <%s> via the plugin #####", fProofCluster.Data()); if (fProofCluster.IsNull()) { Error("StartAnalysis", "You need to specify the proof cluster name via SetProofCluster"); return kFALSE; @@ -2380,6 +2893,15 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn Info("StartAnalysis", "Stopping the analysis. Please use SetProofReset(0) to resume."); return kFALSE; } + + if (!testMode) { + // Check if there is an old active session + Long_t nsessions = gROOT->ProcessLine(Form("TProof::Mgr(\"%s\")->QuerySessions(\"\")->GetEntries();", fProofCluster.Data())); + if (nsessions) { + Error("StartAnalysis","You have to reset your old session first\n"); + return kFALSE; + } + } // Do we need to change the ROOT version ? The success of this cannot be checked. if (!fRootVersionForProof.IsNull() && !testMode) { gROOT->ProcessLine(Form("TProof::Mgr(\"%s\")->SetROOTVersion(\"%s\");", @@ -2408,6 +2930,13 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn } if (fNproofWorkersPerSlave*fNproofWorkers > 0) gROOT->ProcessLine(Form("gProof->SetParallel(%d);", fNproofWorkers)); + // Set proof special parameters if any + TIter nextpp(&fProofParam); + TObject *proofparam; + while ((proofparam=nextpp())) { + TString svalue = GetProofParameter(proofparam->GetName()); + gROOT->ProcessLine(Form("gProof->SetParameter(\"%s\",%s);", proofparam->GetName(), svalue.Data())); + } // Is dataset existing ? if (!testMode) { TString dataset = fProofDataSet; @@ -2436,7 +2965,7 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn // Check the additional libs to be loaded TString extraLibs; Bool_t parMode = kFALSE; - if (!alirootMode.IsNull()) extraLibs = "ANALYSIS:ANALYSISalice"; + if (!alirootMode.IsNull()) extraLibs = "ANALYSIS:OADB:ANALYSISalice"; // Parse the extra libs for .so if (fAdditionalLibs.Length()) { TObjArray *list = fAdditionalLibs.Tokenize(" "); @@ -2465,15 +2994,18 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn } if (list) delete list; } - if (!extraLibs.IsNull()) optionsList.Add(new TNamed("ALIROOT_EXTRA_LIBS",extraLibs.Data())); + if (!extraLibs.IsNull()) { + Info("StartAnalysis", "Adding extra libs: %s",extraLibs.Data()); + optionsList.Add(new TNamed("ALIROOT_EXTRA_LIBS",extraLibs.Data())); + } // Check extra includes if (!fIncludePath.IsNull()) { TString includePath = fIncludePath; includePath.ReplaceAll(" ",":"); - includePath.ReplaceAll("$ALICE_ROOT",""); - includePath.ReplaceAll("${ALICE_ROOT}",""); + includePath.ReplaceAll("$ALICE_ROOT/",""); + includePath.ReplaceAll("${ALICE_ROOT}/",""); includePath.ReplaceAll("-I",""); - includePath.Strip(TString::kTrailing, ':'); + includePath.Remove(TString::kTrailing, ':'); Info("StartAnalysis", "Adding extra includes: %s",includePath.Data()); optionsList.Add(new TNamed("ALIROOT_EXTRA_INCLUDES",includePath.Data())); } @@ -2496,11 +3028,13 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn return kFALSE; } } else { - if (gROOT->ProcessLine(Form("gProof->EnablePackage(\"VO_ALICE@AliRoot::%s\", (TList*)%p, kTRUE);", - fAliROOTVersion.Data(), &optionsList))) { - Error("StartAnalysis", "There was an error trying to enable package VO_ALICE@AliRoot::%s", fAliROOTVersion.Data()); - return kFALSE; - } + if ( ! fAliROOTVersion.IsNull() ) { + if (gROOT->ProcessLine(Form("gProof->EnablePackage(\"VO_ALICE@AliRoot::%s\", (TList*)%p, kTRUE);", + fAliROOTVersion.Data(), &optionsList))) { + Error("StartAnalysis", "There was an error trying to enable package VO_ALICE@AliRoot::%s", fAliROOTVersion.Data()); + return kFALSE; + } + } } // Enable first par files from fAdditionalLibs if (!parLibs.IsNull()) { @@ -2541,7 +3075,7 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn TString spkg = package->GetName(); spkg.ReplaceAll(".par", ""); gSystem->Exec(TString::Format("rm -rf %s", spkg.Data())); - if (gROOT->ProcessLine(Form("gProof->UploadPackage(\"%s\");", package->GetName()))) { + if (!gROOT->ProcessLine(Form("gProof->UploadPackage(\"%s\");", package->GetName()))) { if (gROOT->ProcessLine(Form("gProof->EnablePackage(\"%s\",kTRUE);", package->GetName()))) { Error("StartAnalysis", "There was an error trying to enable package %s", package->GetName()); return kFALSE; @@ -2560,7 +3094,7 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn TObjString *str; while((str=(TObjString*)next())) { gROOT->ProcessLine(Form("gProof->Load(\"%s+g\", kTRUE);", str->GetName())); - } + } if (list) delete list; } if (testMode) { @@ -2634,7 +3168,7 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn Error("StartAnalysis", "No data to process. Please fix %s in your plugin configuration.", serror.Data()); return kFALSE; } - WriteAnalysisFile(); + WriteAnalysisFile(); WriteAnalysisMacro(); WriteExecutable(); WriteValidationScript(); @@ -2832,7 +3366,7 @@ Bool_t AliAnalysisAlien::Submit() Bool_t AliAnalysisAlien::SubmitMerging() { // Submit all merging jobs. - if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("/%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data()); + if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data()); gGrid->Cd(fGridOutputDir); TString mergeJDLName = fExecutable; mergeJDLName.ReplaceAll(".sh", "_merge.jdl"); @@ -3014,7 +3548,8 @@ void AliAnalysisAlien::WriteAnalysisFile() workdir += fGridWorkingDir; Info("WriteAnalysisFile", "\n##### Copying file <%s> containing your initialized analysis manager to your alien workspace", analysisFile.Data()); if (FileExists(analysisFile)) gGrid->Rm(analysisFile); - TFile::Cp(Form("file:%s",analysisFile.Data()), Form("alien://%s/%s", workdir.Data(),analysisFile.Data())); + if (!copyLocal2Alien("WriteAnalysisFile",analysisFile.Data(), + Form("%s/%s", workdir.Data(),analysisFile.Data()))) Fatal("","Terminating"); } } @@ -3033,6 +3568,7 @@ void AliAnalysisAlien::WriteAnalysisMacro() Bool_t hasESD = kFALSE; Bool_t hasAOD = kFALSE; Bool_t hasANALYSIS = kFALSE; + Bool_t hasOADB = kFALSE; Bool_t hasANALYSISalice = kFALSE; Bool_t hasCORRFW = kFALSE; TString func = fAnalysisMacro; @@ -3099,6 +3635,7 @@ void AliAnalysisAlien::WriteAnalysisMacro() out << " gSystem->Load(\"libAOD\");" << endl; } out << " gSystem->Load(\"libANALYSIS\");" << endl; + out << " gSystem->Load(\"libOADB\");" << endl; out << " gSystem->Load(\"libANALYSISalice\");" << endl; out << " gSystem->Load(\"libCORRFW\");" << endl << endl; } else { @@ -3115,6 +3652,8 @@ void AliAnalysisAlien::WriteAnalysisMacro() pkgname == "AOD.par") hasAOD = kTRUE; if (pkgname == "ANALYSIS" || pkgname == "ANALYSIS.par") hasANALYSIS = kTRUE; + if (pkgname == "OADB" || + pkgname == "OADB.par") hasOADB = kTRUE; if (pkgname == "ANALYSISalice" || pkgname == "ANALYSISalice.par") hasANALYSISalice = kTRUE; if (pkgname == "CORRFW" || @@ -3129,6 +3668,8 @@ void AliAnalysisAlien::WriteAnalysisMacro() else out << " if (!" << setupPar << "(\"AOD\")) return;" << endl; if (!hasANALYSIS) out << " gSystem->Load(\"libANALYSIS\");" << endl; else out << " if (!" << setupPar << "(\"ANALYSIS\")) return;" << endl; + if (!hasOADB) out << " gSystem->Load(\"libOADB\");" << endl; + else out << " if (!" << setupPar << "(\"OADB\")) return;" << endl; if (!hasANALYSISalice) out << " gSystem->Load(\"libANALYSISalice\");" << endl; else out << " if (!" << setupPar << "(\"ANALYSISalice\")) return;" << endl; if (!hasCORRFW) out << " gSystem->Load(\"libCORRFW\");" << endl << endl; @@ -3145,6 +3686,8 @@ void AliAnalysisAlien::WriteAnalysisMacro() pkgname == "AOD.par" || pkgname == "ANALYSIS" || pkgname == "ANALYSIS.par" || + pkgname == "OADB" || + pkgname == "OADB.par" || pkgname == "ANALYSISalice" || pkgname == "ANALYSISalice.par" || pkgname == "CORRFW" || @@ -3204,25 +3747,25 @@ void AliAnalysisAlien::WriteAnalysisMacro() out << " gEnv->SetValue(\"XNet.MaxRedirectCount\",2);" << endl; out << " gEnv->SetValue(\"XNet.ReconnectTimeout\",50);" << endl; out << " gEnv->SetValue(\"XNet.FirstConnectMaxCnt\",1);" << endl << endl; + } + if (!IsLocalTest()) { + out << "// connect to AliEn and make the chain" << endl; + out << " if (!TGrid::Connect(\"alien://\")) return;" << endl; } - out << "// connect to AliEn and make the chain" << endl; - out << " if (!TGrid::Connect(\"alien://\")) return;" << endl; out << "// read the analysis manager from file" << endl; TString analysisFile = fExecutable; analysisFile.ReplaceAll(".sh", ".root"); - out << " TFile *file = TFile::Open(\"" << analysisFile << "\");" << endl; - out << " if (!file) return;" << endl; - out << " TIter nextkey(file->GetListOfKeys());" << endl; - out << " AliAnalysisManager *mgr = 0;" << endl; - out << " TKey *key;" << endl; - out << " while ((key=(TKey*)nextkey())) {" << endl; - out << " if (!strcmp(key->GetClassName(), \"AliAnalysisManager\"))" << endl; - out << " mgr = (AliAnalysisManager*)file->Get(key->GetName());" << endl; - out << " };" << endl; - out << " if (!mgr) {" << endl; - out << " ::Error(\"" << func.Data() << "\", \"No analysis manager found in file " << analysisFile <<"\");" << endl; - out << " return;" << endl; - out << " }" << endl << endl; + out << " AliAnalysisManager *mgr = AliAnalysisAlien::LoadAnalysisManager(\"" + << analysisFile << "\");" << endl; + out << " if (!mgr) return;" << endl; + if (IsLocalTest()) { + out << " AliAnalysisAlien *plugin = new AliAnalysisAlien();" << endl; + out << " plugin->SetRunMode(\"test\");" << endl; + out << " plugin->SetFileForTestMode(\"data.txt\");" << endl; + out << " mgr->SetGridHandler(plugin);" << endl; + out << " mgr->SetDebugLevel(10);" << endl; + out << " mgr->SetNSysInfo(100);" << endl; + } out << " mgr->PrintStatus();" << endl; if (AliAnalysisManager::GetAnalysisManager()) { if (AliAnalysisManager::GetAnalysisManager()->GetDebugLevel()>3) { @@ -3234,57 +3777,16 @@ void AliAnalysisAlien::WriteAnalysisMacro() out << " AliLog::SetGlobalLogLevel(AliLog::kError);" << endl; } } - if (IsUsingTags()) { - out << " TChain *chain = CreateChainFromTags(\"wn.xml\", anatype);" << endl << endl; - } else { + if (!IsLocalTest()) { out << " TChain *chain = CreateChain(\"wn.xml\", anatype);" << endl << endl; + out << " mgr->StartAnalysis(\"localfile\", chain);" << endl; + } else { + out << " mgr->StartAnalysis(\"localfile\");" << endl; } - out << " mgr->StartAnalysis(\"localfile\", chain);" << endl; out << " timer.Stop();" << endl; out << " timer.Print();" << endl; out << "}" << endl << endl; - if (IsUsingTags()) { - out << "TChain* CreateChainFromTags(const char *xmlfile, const char *type=\"ESD\")" << endl; - out << "{" << endl; - out << "// Create a chain using tags from the xml file." << endl; - out << " TAlienCollection* coll = TAlienCollection::Open(xmlfile);" << endl; - out << " if (!coll) {" << endl; - out << " ::Error(\"CreateChainFromTags\", \"Cannot create an AliEn collection from %s\", xmlfile);" << endl; - out << " return NULL;" << endl; - out << " }" << endl; - out << " TGridResult* tagResult = coll->GetGridResult(\"\",kFALSE,kFALSE);" << endl; - out << " AliTagAnalysis *tagAna = new AliTagAnalysis(type);" << endl; - out << " tagAna->ChainGridTags(tagResult);" << endl << endl; - out << " AliRunTagCuts *runCuts = new AliRunTagCuts();" << endl; - out << " AliLHCTagCuts *lhcCuts = new AliLHCTagCuts();" << endl; - out << " AliDetectorTagCuts *detCuts = new AliDetectorTagCuts();" << endl; - out << " AliEventTagCuts *evCuts = new AliEventTagCuts();" << endl; - out << " // Check if the cuts configuration file was provided" << endl; - out << " if (!gSystem->AccessPathName(\"ConfigureCuts.C\")) {" << endl; - out << " gROOT->LoadMacro(\"ConfigureCuts.C\");" << endl; - out << " ConfigureCuts(runCuts, lhcCuts, detCuts, evCuts);" << endl; - out << " }" << endl; - if (fFriendChainName=="") { - out << " TChain *chain = tagAna->QueryTags(runCuts, lhcCuts, detCuts, evCuts);" << endl; - } else { - out << " TString tmpColl=\"tmpCollection.xml\";" << endl; - out << " tagAna->CreateXMLCollection(tmpColl.Data(),runCuts, lhcCuts, detCuts, evCuts);" << endl; - out << " TChain *chain = CreateChain(tmpColl.Data(),type);" << endl; - } - out << " if (!chain || !chain->GetNtrees()) return NULL;" << endl; - out << " chain->ls();" << endl; - out << " return chain;" << endl; - out << "}" << endl << endl; - if (gSystem->AccessPathName("ConfigureCuts.C")) { - TString msg = "\n##### You may want to provide a macro ConfigureCuts.C with a method:\n"; - msg += " void ConfigureCuts(AliRunTagCuts *runCuts,\n"; - msg += " AliLHCTagCuts *lhcCuts,\n"; - msg += " AliDetectorTagCuts *detCuts,\n"; - msg += " AliEventTagCuts *evCuts)"; - Info("WriteAnalysisMacro", "%s", msg.Data()); - } - } - if (!IsUsingTags() || fFriendChainName!="") { + if (!IsLocalTest()) { out <<"//________________________________________________________________________________" << endl; out << "TChain* CreateChain(const char *xmlfile, const char *type=\"ESD\")" << endl; out << "{" << endl; @@ -3389,13 +3891,11 @@ void AliAnalysisAlien::WriteAnalysisMacro() TString workdir = gGrid->GetHomeDirectory(); workdir += fGridWorkingDir; if (FileExists(fAnalysisMacro)) gGrid->Rm(fAnalysisMacro); - if (IsUsingTags() && !gSystem->AccessPathName("ConfigureCuts.C")) { - if (FileExists("ConfigureCuts.C")) gGrid->Rm("ConfigureCuts.C"); - Info("WriteAnalysisMacro", "\n##### Copying cuts configuration macro: to your alien workspace"); - TFile::Cp("file:ConfigureCuts.C", Form("alien://%s/ConfigureCuts.C", workdir.Data())); - } Info("WriteAnalysisMacro", "\n##### Copying analysis macro: <%s> to your alien workspace", fAnalysisMacro.Data()); - TFile::Cp(Form("file:%s",fAnalysisMacro.Data()), Form("alien://%s/%s", workdir.Data(), fAnalysisMacro.Data())); +// TFile::Cp(Form("file:%s",fAnalysisMacro.Data()), Form("alien://%s/%s", workdir.Data(), fAnalysisMacro.Data())); + if (!copyLocal2Alien("WriteAnalysisMacro",fAnalysisMacro.Data(), + Form("alien://%s/%s", workdir.Data(), + fAnalysisMacro.Data()))) Fatal("","Terminating"); } } @@ -3410,7 +3910,7 @@ void AliAnalysisAlien::WriteMergingMacro() } TString mergingMacro = fExecutable; mergingMacro.ReplaceAll(".sh","_merge.C"); - if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("/%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data()); + if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data()); if (!TestBit(AliAnalysisGrid::kSubmit)) { ofstream out; out.open(mergingMacro.Data(), ios::out); @@ -3422,6 +3922,7 @@ void AliAnalysisAlien::WriteMergingMacro() Bool_t hasESD = kFALSE; Bool_t hasAOD = kFALSE; Bool_t hasANALYSIS = kFALSE; + Bool_t hasOADB = kFALSE; Bool_t hasANALYSISalice = kFALSE; Bool_t hasCORRFW = kFALSE; TString func = mergingMacro; @@ -3463,6 +3964,7 @@ void AliAnalysisAlien::WriteMergingMacro() out << " gSystem->Load(\"libAOD\");" << endl; } out << " gSystem->Load(\"libANALYSIS\");" << endl; + out << " gSystem->Load(\"libOADB\");" << endl; out << " gSystem->Load(\"libANALYSISalice\");" << endl; out << " gSystem->Load(\"libCORRFW\");" << endl << endl; } else { @@ -3480,6 +3982,8 @@ void AliAnalysisAlien::WriteMergingMacro() pkgname == "AOD.par") hasAOD = kTRUE; if (pkgname == "ANALYSIS" || pkgname == "ANALYSIS.par") hasANALYSIS = kTRUE; + if (pkgname == "OADB" || + pkgname == "OADB.par") hasOADB = kTRUE; if (pkgname == "ANALYSISalice" || pkgname == "ANALYSISalice.par") hasANALYSISalice = kTRUE; if (pkgname == "CORRFW" || @@ -3492,8 +3996,11 @@ void AliAnalysisAlien::WriteMergingMacro() else out << " if (!" << setupPar << "(\"ESD\")) return;" << endl; if (!hasAOD) out << " gSystem->Load(\"libAOD\");" << endl; else out << " if (!" << setupPar << "(\"AOD\")) return;" << endl; + out << " gSystem->Load(\"libOADB\");" << endl; if (!hasANALYSIS) out << " gSystem->Load(\"libANALYSIS\");" << endl; else out << " if (!" << setupPar << "(\"ANALYSIS\")) return;" << endl; + if (!hasOADB) out << " gSystem->Load(\"libOADB\");" << endl; + else out << " if (!" << setupPar << "(\"OADB\")) return;" << endl; if (!hasANALYSISalice) out << " gSystem->Load(\"libANALYSISalice\");" << endl; else out << " if (!" << setupPar << "(\"ANALYSISalice\")) return;" << endl; if (!hasCORRFW) out << " gSystem->Load(\"libCORRFW\");" << endl << endl; @@ -3510,6 +4017,8 @@ void AliAnalysisAlien::WriteMergingMacro() pkgname == "AOD.par" || pkgname == "ANALYSIS" || pkgname == "ANALYSIS.par" || + pkgname == "OADB" || + pkgname == "OADB.par" || pkgname == "ANALYSISalice" || pkgname == "ANALYSISalice.par" || pkgname == "CORRFW" || @@ -3606,19 +4115,9 @@ void AliAnalysisAlien::WriteMergingMacro() TString analysisFile = fExecutable; analysisFile.ReplaceAll(".sh", ".root"); out << " if (!outputDir.Contains(\"Stage\")) return;" << endl; - out << " TFile *file = TFile::Open(\"" << analysisFile << "\");" << endl; - out << " if (!file) return;" << endl; - out << " TIter nextkey(file->GetListOfKeys());" << endl; - out << " AliAnalysisManager *mgr = 0;" << endl; - out << " TKey *key;" << endl; - out << " while ((key=(TKey*)nextkey())) {" << endl; - out << " if (!strcmp(key->GetClassName(), \"AliAnalysisManager\"))" << endl; - out << " mgr = (AliAnalysisManager*)file->Get(key->GetName());" << endl; - out << " };" << endl; - out << " if (!mgr) {" << endl; - out << " ::Error(\"" << func.Data() << "\", \"No analysis manager found in file" << analysisFile <<"\");" << endl; - out << " return;" << endl; - out << " }" << endl << endl; + out << " AliAnalysisManager *mgr = AliAnalysisAlien::LoadAnalysisManager(\"" + << analysisFile << "\");" << endl; + out << " if (!mgr) return;" << endl; out << " mgr->SetRunFromPath(mgr->GetRunFromAlienPath(dir));" << endl; out << " mgr->SetSkipTerminate(kFALSE);" << endl; out << " mgr->PrintStatus();" << endl; @@ -3684,7 +4183,9 @@ void AliAnalysisAlien::WriteMergingMacro() workdir += fGridWorkingDir; if (FileExists(mergingMacro)) gGrid->Rm(mergingMacro); Info("WriteMergingMacro", "\n##### Copying merging macro: <%s> to your alien workspace", mergingMacro.Data()); - TFile::Cp(Form("file:%s",mergingMacro.Data()), Form("alien://%s/%s", workdir.Data(), mergingMacro.Data())); +// TFile::Cp(Form("file:%s",mergingMacro.Data()), Form("alien://%s/%s", workdir.Data(), mergingMacro.Data())); + if (!copyLocal2Alien("WriteMergeMacro",mergingMacro.Data(), + Form("%s/%s", workdir.Data(), mergingMacro.Data()))) Fatal("","Terminating"); } } @@ -3780,7 +4281,9 @@ void AliAnalysisAlien::WriteExecutable() TString executable = Form("%s/bin/%s", gGrid->GetHomeDirectory(), fExecutable.Data()); if (FileExists(executable)) gGrid->Rm(executable); Info("WriteExecutable", "\n##### Copying executable file <%s> to your AliEn bin directory", fExecutable.Data()); - TFile::Cp(Form("file:%s",fExecutable.Data()), Form("alien://%s", executable.Data())); +// TFile::Cp(Form("file:%s",fExecutable.Data()), Form("alien://%s", executable.Data())); + if (!copyLocal2Alien("WriteExecutable",fExecutable.Data(), + executable.Data())) Fatal("","Terminating"); } } @@ -3841,7 +4344,9 @@ void AliAnalysisAlien::WriteMergeExecutable() TString executable = Form("%s/bin/%s", gGrid->GetHomeDirectory(), mergeExec.Data()); if (FileExists(executable)) gGrid->Rm(executable); Info("WriteMergeExecutable", "\n##### Copying executable file <%s> to your AliEn bin directory", mergeExec.Data()); - TFile::Cp(Form("file:%s",mergeExec.Data()), Form("alien://%s", executable.Data())); +// TFile::Cp(Form("file:%s",mergeExec.Data()), Form("alien://%s", executable.Data())); + if (!copyLocal2Alien("WriteMergeExecutable", + mergeExec.Data(), executable.Data())) Fatal("","Terminating"); } } @@ -3877,7 +4382,9 @@ void AliAnalysisAlien::WriteProductionFile(const char *filename) const if (gGrid) { Info("WriteProductionFile", "\n##### Copying production file <%s> to your work directory", filename); if (FileExists(filename)) gGrid->Rm(filename); - TFile::Cp(Form("file:%s",filename), Form("alien://%s/%s", workdir.Data(),filename)); +// TFile::Cp(Form("file:%s",filename), Form("alien://%s/%s", workdir.Data(),filename)); + if (!copyLocal2Alien("WriteProductionFile", filename, + Form("%s/%s", workdir.Data(),filename))) Fatal("","Terminating"); } } @@ -4022,6 +4529,8 @@ void AliAnalysisAlien::WriteValidationScript(Bool_t merge) workdir += fGridWorkingDir; Info("WriteValidationScript", "\n##### Copying validation script <%s> to your AliEn working space", validationScript.Data()); if (FileExists(validationScript)) gGrid->Rm(validationScript); - TFile::Cp(Form("file:%s",validationScript.Data()), Form("alien://%s/%s", workdir.Data(),validationScript.Data())); +// TFile::Cp(Form("file:%s",validationScript.Data()), Form("alien://%s/%s", workdir.Data(),validationScript.Data())); + if (!copyLocal2Alien("WriteValidationScript", validationScript.Data(), + Form("%s/%s",workdir.Data(), validationScript.Data()))) Fatal("","Terminating"); } }