for (Int_t ilib=0; ilib<list->GetEntriesFast(); ilib++) {
lib = list->At(ilib)->GetName();
lib.ReplaceAll(".so","");
+ lib.ReplaceAll(".dylib","");
lib.ReplaceAll(" ","");
if (lib.BeginsWith("lib")) lib.Remove(0, 3);
lib.Prepend("lib");
workdir += fGridWorkingDir;
if (generate) {
TObjString *os;
- if (!fInputFiles) {
+ if (!fInputFiles && !fMCLoop) {
Error("CreateJDL()", "Define some input files for your analysis.");
error = kTRUE;
}
if (!fUser.IsNull()) {
fGridJDL->SetValue("User", Form("\"%s\"", fUser.Data()));
fMergingJDL->SetValue("User", Form("\"%s\"", fUser.Data()));
- }
- fGridJDL->SetExecutable(fExecutable, "This is the startup script");
- TString mergeExec = fExecutable;
+ }
+ TString executable = fExecutable;
+ if (!executable.BeginsWith("/"))
+ executable.Prepend(Form("%s/", workdir.Data()));
+ fGridJDL->SetExecutable(executable, "This is the startup script");
+ TString mergeExec = executable;
mergeExec.ReplaceAll(".sh", "_merge.sh");
fMergingJDL->SetExecutable(mergeExec, "This is the startup script");
mergeExec.ReplaceAll(".sh", ".C");
- fMergingJDL->AddToInputSandbox(Form("LF:%s/%s", workdir.Data(),mergeExec.Data()), "List of input files to be uploaded to workers");
+ fMergingJDL->AddToInputSandbox(Form("LF:%s", mergeExec.Data()), "List of input files to be uploaded to workers");
if (!fArguments.IsNull())
fGridJDL->SetArguments(fArguments, "Arguments for the executable command");
if (IsOneStageMerging()) fMergingJDL->SetArguments(fGridOutputDir);
fGridJDL->SetValue("MaxInitFailed", Form("\"%d\"",fMaxInitFailed));
fGridJDL->SetDescription("MaxInitFailed", "Maximum number of first failing jobs to abort the master job");
}
- if (fSplitMaxInputFileNumber > 0) {
+ if (fSplitMaxInputFileNumber > 0 && !fMCLoop) {
fGridJDL->SetValue("SplitMaxInputFileNumber", Form("\"%d\"", fSplitMaxInputFileNumber));
fGridJDL->SetDescription("SplitMaxInputFileNumber", "Maximum number of input files to be processed per subjob");
}
}
delete arr;
}
- fGridJDL->SetInputDataListFormat(fInputFormat, "Format of input data");
- fGridJDL->SetInputDataList("wn.xml", "Collection name to be processed on each worker node");
+ if (!fMCLoop) {
+ fGridJDL->SetInputDataListFormat(fInputFormat, "Format of input data");
+ fGridJDL->SetInputDataList("wn.xml", "Collection name to be processed on each worker node");
+ }
fMergingJDL->SetInputDataListFormat(fInputFormat, "Format of input data");
fMergingJDL->SetInputDataList("wn.xml", "Collection name to be processed on each worker node");
fGridJDL->AddToInputSandbox(Form("LF:%s/%s", workdir.Data(), fAnalysisMacro.Data()), "List of input files to be uploaded to workers");
arr = fAdditionalLibs.Tokenize(" ");
TIter next(arr);
while ((os=(TObjString*)next())) {
- if (os->GetString().Contains(".so")) continue;
+ if (os->GetString().Contains(".so") ||
+ os->GetString().Contains(".dylib")) continue;
fGridJDL->AddToInputSandbox(Form("LF:%s/%s", workdir.Data(), os->GetString().Data()));
fMergingJDL->AddToInputSandbox(Form("LF:%s/%s", workdir.Data(), os->GetString().Data()));
}
if (TestBit(AliAnalysisGrid::kDefaultOutputs)) {
outputArchive = "log_archive.zip:std*@disk=1 ";
// Add normal output files, extra files + terminate files
- TString files = GetListOfFiles("outextter");
+ TString files;
+ if (IsMergeAOD()) files = GetListOfFiles("outaodextter");
+ else files = GetListOfFiles("outextter");
// Do not register files in fRegisterExcludes
if (!fRegisterExcludes.IsNull()) {
arr = fRegisterExcludes.Tokenize(" ");
TObjString *os;
TIter next(arr);
while ((os=(TObjString*)next())) {
- if (os->GetString().Contains(".so")) continue;
+ if (os->GetString().Contains(".so") ||
+ os->GetString().Contains(".dylib")) 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()));
// Writes one or more JDL's corresponding to findex. If findex is negative,
// all run numbers are considered in one go (jdl). For non-negative indices
// they correspond to the indices in the array fInputFiles.
- if (!fInputFiles) return kFALSE;
+ if (!fInputFiles && !fMCLoop) return kFALSE;
TObject *os;
TString workdir;
if (!fProductionMode && !fGridWorkingDir.BeginsWith("/alice")) workdir = gGrid->GetHomeDirectory();
fGridJDL->SetOutputDirectory(Form("#alienfulldir#/../%s",fOutputSingle.Data()), "Output directory");
else {
fGridJDL->SetOutputDirectory(Form("%s/#alien_counter_03i#", fGridOutputDir.Data()), "Output directory");
- fMergingJDL->SetOutputDirectory(fGridOutputDir);
+// fMergingJDL->SetOutputDirectory(fGridOutputDir);
}
} else {
// One jdl to be submitted with 2 input parameters: data collection name and output dir prefix
Bool_t AliAnalysisAlien::DirectoryExists(const char *dirname)
{
// Returns true if directory exists. Can be also a path.
+// Since there is not API in TAlien, we use the Cd trick:
if (!gGrid) return kFALSE;
- // Check if dirname is a path
- TString dirstripped = dirname;
- dirstripped = dirstripped.Strip();
- dirstripped = dirstripped.Strip(TString::kTrailing, '/');
- TString dir = gSystem->BaseName(dirstripped);
- dir += "/";
- TString path = gSystem->DirName(dirstripped);
- TGridResult *res = gGrid->Ls(path, "-F");
- if (!res) return kFALSE;
- TIter next(res);
- TMap *map;
- TObject *obj;
- while ((map=dynamic_cast<TMap*>(next()))) {
- obj = map->GetValue("name");
- if (!obj) break;
- if (dir == obj->GetName()) {
- delete res;
- return kTRUE;
- }
+ // Backup current path
+ TString cpath = gGrid->Pwd();
+ TString command = "cd ";
+ TString sdir(dirname);
+ sdir.ReplaceAll("alien://", "");
+ command += sdir;
+ TGridResult *res = gGrid->Command(command);
+ if (!res) {
+ gGrid->Cd(cpath);
+ return kFALSE;
+ }
+ TMap *map = (TMap*)res->At(0);
+ if (!map) {
+ gGrid->Cd(cpath);
+ delete res;
+ return kFALSE;
}
+ TString sval = map->GetValue("__result__")->GetName();
+ Bool_t retval = (Bool_t)sval.Atoi();
+ gGrid->Cd(cpath);
delete res;
- return kFALSE;
-}
+ return retval;
+}
//______________________________________________________________________________
void AliAnalysisAlien::CheckDataType(const char *lfn, Bool_t &isCollection, Bool_t &isXml, Bool_t &useTags)
fFriendLibs = libnames;
if (fFriendLibs.Length()) {
- if(!fFriendLibs.Contains(".so"))
+ if(!fFriendLibs.Contains(".so") &&
+ !fFriendLibs.Contains(".dylib"))
Fatal("SetFriendChainName()", "You should provide explicit library names (with extension)");
fFriendLibs.ReplaceAll(",", " ");
fFriendLibs.Strip();
fOutputArchive = list;
}
-//______________________________________________________________________________
-void AliAnalysisAlien::SetPreferedSE(const char */*se*/)
-{
-// Setting a prefered output SE is not allowed anymore.
- 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)
{
TString extraLibs;
Bool_t parMode = kFALSE;
if (!alirootMode.IsNull()) extraLibs = "ANALYSIS:OADB:ANALYSISalice";
- // Parse the extra libs for .so
+ // Parse the extra libs for .so or .dylib
if (fAdditionalLibs.Length()) {
TString additionalLibs = fAdditionalLibs;
additionalLibs.Strip();
TIter next(list);
TObjString *str;
while((str=(TObjString*)next())) {
- if (str->GetString().Contains(".so")) {
+ if (str->GetString().Contains(".so") ||
+ str->GetString().Contains(".dylib") ) {
if (parMode) {
Warning("StartAnalysis", "Plugin does not support loading libs after par files in PROOF mode. Library %s and following will not load on workers", str->GetName());
break;
TString stmp = str->GetName();
if (stmp.BeginsWith("lib")) stmp.Remove(0,3);
stmp.ReplaceAll(".so","");
+ stmp.ReplaceAll(".dylib","");
if (!extraLibs.IsNull()) extraLibs += ":";
extraLibs += stmp;
continue;
if (list) delete list;
}
} else {
- if (fAdditionalLibs.Contains(".so") && !testMode) {
+ if ((fAdditionalLibs.Contains(".so") || fAdditionalLibs.Contains(".dylib")) &&
+ !testMode) {
Error("StartAnalysis", "You request additional libs to be loaded but did not enabled any AliRoot mode. Please refer to: \
\n http://aaf.cern.ch/node/83 and use a parameter for SetAliRootMode()");
return kFALSE;
return files.Data();
}
if (mgr->GetOutputEventHandler()) {
- aodfiles = mgr->GetOutputEventHandler()->GetOutputFileName();
- TString extraaod = mgr->GetOutputEventHandler()->GetExtraOutputs();
- if (!extraaod.IsNull()) {
- aodfiles += ",";
+ aodfiles = "";
+ if (mgr->GetOutputEventHandler()->GetFillAOD())
+ aodfiles = mgr->GetOutputEventHandler()->GetOutputFileName();
+ TString extraaod = mgr->GetOutputEventHandler()->GetExtraOutputs(kTRUE);
+ if (!extraaod.IsNull() && mgr->GetOutputEventHandler()->GetFillExtension()) {
+ if (!aodfiles.IsNull()) aodfiles += ",";
aodfiles += extraaod;
}
}
if (!(strcmp(filename, "default"))) continue;
if (outputfiles.Contains(filename)) continue;
if (aodfiles.Contains(filename)) continue;
- if (!outputfiles.IsNull()) outputfiles += ",";
+ if (!outputfiles.IsNull() && strlen(filename)) outputfiles += ",";
outputfiles += filename;
}
if (stype.Contains("out")) {
- if (!files.IsNull()) files += ",";
+ if (!files.IsNull() && !outputfiles.IsNull()) files += ",";
files += outputfiles;
if (stype == "out") return files.Data();
}
}
delete fextra;
if (stype.Contains("ext")) {
- if (!files.IsNull()) files += ",";
+ if (!files.IsNull() && !sextra.IsNull()) files += ",";
files += sextra;
}
}
TIter next(list);
TObjString *str;
while((str=(TObjString*)next())) {
- if (str->GetString().Contains(".so"))
+ if (str->GetString().Contains(".so") || str->GetString().Contains(".dylib"))
out << " gSystem->Load(\"" << str->GetString().Data() << "\");" << endl;
}
if (list) delete list;
TIter next(list);
TObjString *str;
while((str=(TObjString*)next())) {
- if (str->GetString().Contains(".so"))
+ if (str->GetString().Contains(".so") || str->GetString().Contains(".dylib"))
out << " gSystem->Load(\"" << str->GetString().Data() << "\");" << endl;
if (str->GetString().Contains(".par"))
out << " if (!" << setupPar << "(\"" << str->GetString() << "\")) return;" << endl;
TIter next(list);
TObjString *str;
while((str=(TObjString*)next())) {
- if (str->GetString().Contains(".so"))
+ if (str->GetString().Contains(".so") || str->GetString().Contains(".dylib"))
out << " gSystem->Load(\"" << str->GetString().Data() << "\");" << endl;
}
if (list) delete list;
if (fIncludePath.Length()) out << " gSystem->AddIncludePath(\"" << fIncludePath.Data() << "\");" << endl;
out << " gROOT->ProcessLine(\".include $ALICE_ROOT/include\");" << endl;
out << " printf(\"Include path: %s\\n\", gSystem->GetIncludePath());" << endl << endl;
+ if (fMCLoop && !fGeneratorLibs.IsNull()) {
+ out << "// MC generator libraries" << endl;
+ TObjArray *list = fGeneratorLibs.Tokenize(" ");
+ TIter next(list);
+ TObjString *str;
+ while((str=(TObjString*)next())) {
+ out << " gSystem->Load(\"" << str->GetName() << "\");" << endl;
+ }
+ delete list;
+ }
if (fAdditionalLibs.Length()) {
out << "// Add aditional AliRoot libraries" << endl;
TString additionalLibs = fAdditionalLibs;
TIter next(list);
TObjString *str;
while((str=(TObjString*)next())) {
- if (str->GetString().Contains(".so"))
+ if (str->GetString().Contains(".so") || str->GetString().Contains(".dylib"))
out << " gSystem->Load(\"" << str->GetString().Data() << "\");" << endl;
}
if (list) delete list;
out << "// Set temporary compilation directory to current one" << endl;
out << " gSystem->SetBuildDir(gSystem->pwd(), kTRUE);" << endl << endl;
out << " TString outputDir = dir;" << endl;
- out << " TString outputFiles = \"" << GetListOfFiles("out") << "\";" << endl;
+ if (IsMergeAOD())
+ out << " TString outputFiles = \"" << GetListOfFiles("outaod") << "\";" << endl;
+ else
+ out << " TString outputFiles = \"" << GetListOfFiles("out") << "\";" << endl;
out << " TString mergeExcludes = \"" << fMergeExcludes << " " << fRegisterExcludes << "\";" << endl;
out << " TObjArray *list = outputFiles.Tokenize(\",\");" << endl;
out << " TIter *iter = new TIter(list);" << endl;
out << " return;" << endl;
out << " }" << endl;
if (IsLocalTest()) {
- out << " printf(\"===================================\n\");" << endl;
+ out << " printf(\"===================================\\n\");" << endl;
out << " printf(\"Testing merging...\\n\");" << endl;
- out << " printf(\"===================================\n\");" << endl;
+ out << " printf(\"===================================\\n\");" << endl;
}
out << " while((str=(TObjString*)iter->Next())) {" << endl;
out << " outputFile = str->GetString();" << endl;
out << " out.close();" << endl;
out << " // read the analysis manager from file" << endl;
if (IsLocalTest()) {
- out << " printf(\"===================================\n\");" << endl;
+ out << " printf(\"===================================\\n\");" << endl;
out << " printf(\"Testing Terminate()...\\n\");" << endl;
- out << " printf(\"===================================\n\");" << endl;
+ out << " printf(\"===================================\\n\");" << endl;
} else {
out << " if (!outputDir.Contains(\"Stage\")) return;" << endl;
}
if (copy) {
CdWork();
TString workdir = gGrid->GetHomeDirectory();
- TString bindir = Form("%s/bin", workdir.Data());
- if (!DirectoryExists(bindir)) gGrid->Mkdir(bindir,"-p");
workdir += fGridWorkingDir;
- TString executable = Form("%s/bin/%s", gGrid->GetHomeDirectory(), fExecutable.Data());
+ TString executable = TString::Format("%s/%s", workdir.Data(), 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()));
if (!copyLocal2Alien("WriteExecutable",fExecutable.Data(),
executable.Data())) Fatal("","Terminating");
}
if (copy) {
CdWork();
TString workdir = gGrid->GetHomeDirectory();
- TString bindir = Form("%s/bin", workdir.Data());
- if (!DirectoryExists(bindir)) gGrid->Mkdir(bindir,"-p");
workdir += fGridWorkingDir;
- TString executable = Form("%s/bin/%s", gGrid->GetHomeDirectory(), mergeExec.Data());
+ TString executable = TString::Format("%s/%s", workdir.Data(), 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()));
- if (!copyLocal2Alien("WriteMergeExecutable",
- mergeExec.Data(), executable.Data())) Fatal("","Terminating");
+ if (!copyLocal2Alien("WriteMergeExecutable",mergeExec.Data(),
+ executable.Data())) Fatal("","Terminating");
}
}
TString outputFiles = fOutputFiles;
if (merge && !fTerminateFiles.IsNull()) {
- outputFiles += ",";
+ if (!outputFiles.IsNull()) outputFiles += ",";
outputFiles += fTerminateFiles;
}
TObjArray *arr = outputFiles.Tokenize(",");
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff