X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FAliAnalysisAlien.h;h=c5e031d02bbfde79d7c32cd62e047f48c7af1d5c;hb=b37b954695b5c13427ef10ffb58e6d3e2127a39e;hp=46c862fa71a742c8ed3c3fc237cb99fda2f28d6c;hpb=27734f0eaa7fc0a81d7971d7901256a5cd46a542;p=u%2Fmrichter%2FAliRoot.git diff --git a/ANALYSIS/AliAnalysisAlien.h b/ANALYSIS/AliAnalysisAlien.h index 46c862fa71a..c5e031d02bb 100644 --- a/ANALYSIS/AliAnalysisAlien.h +++ b/ANALYSIS/AliAnalysisAlien.h @@ -37,6 +37,7 @@ public: virtual void AddIncludePath(const char *path); virtual void AddRunNumber(Int_t run); virtual void AddRunNumber(const char *run); + virtual void AddRunList(const char *runList); virtual void AddDataFile(const char *lfn); virtual void AddExternalPackage(const char *name); virtual void SetExecutable(const char *name="analysis.sh") {fExecutable = name;} @@ -45,6 +46,7 @@ public: virtual void SetExecutableArgs(const char *name="") {fExecutableArgs = name;} virtual void SetAnalysisMacro(const char *name="myAnalysis.C") {fAnalysisMacro = name;} virtual void SetAnalysisSource(const char *name="myAnalysisClass.cxx") {fAnalysisSource = name;} + virtual void SetValidationScript(const char *name="validation.sh") {fValidationScript = name;} virtual void SetAdditionalLibs(const char *list) {fAdditionalLibs = list;} virtual void SetAdditionalRootLibs(const char *list) {fAdditionalRootLibs = list;} virtual void SetPrice(Int_t price=1) {fPrice = price;} @@ -52,6 +54,7 @@ public: virtual void SetJobTag(const char *tag="") {fJobTag = tag;} virtual void SetNrunsPerMaster(Int_t nruns=1) {fNrunsPerMaster = nruns;} virtual void SetMaxMergeFiles(Int_t nfiles) {fMaxMergeFiles = nfiles;} + virtual void SetMaxMergeStages(Int_t nstages) {fMaxMergeStages = nstages;} virtual void SetSplitMode(const char *type="se") {fSplitMode = type;} virtual void SetSplitMaxInputFileNumber(Int_t nfiles=100) {fSplitMaxInputFileNumber = nfiles;} virtual void SetAPIVersion(const char *version) {fAPIVersion = version;} @@ -70,15 +73,17 @@ public: virtual void SetOutputToRunNo(Int_t mode=1) {fOutputToRunNo = mode;} virtual void SetInputFormat(const char *format="xml-single") {fInputFormat = format;} virtual void SetMaxInitFailed(Int_t nfail=5) {fMaxInitFailed = nfail;} + virtual void SetTerminateFiles(const char *list) {fTerminateFiles = list;} virtual void SetMergeExcludes(const char *list) {fMergeExcludes = list;}; virtual void SetMergeViaJDL(Bool_t on=kTRUE) {fMergeViaJDL = on ? 1 : 0;} + virtual void SetMergeDirName(const char *name) {fMergeDirName = name;} virtual void SetMasterResubmitThreshold(Int_t percentage) {fMasterResubmitThreshold = percentage;} virtual void SetNtestFiles(Int_t nfiles) {fNtestFiles = nfiles;} virtual void SetNumberOfReplicas(Int_t ncopies) {fNreplicas = TMath::Min(ncopies,4);} virtual void SetJDLName(const char *name="analysis.jdl") {fJDLName = name;} virtual void SetPreferedSE(const char *se); virtual void SetProductionMode(Int_t mode=1) {fProductionMode = mode;} - virtual void SetRunPrefix(const char *prefix) {fRunPrefix = prefix;} + virtual void SetRunPrefix(const char *prefix); virtual void SetOutputSingleFolder(const char *folder) {fOutputSingle = folder; fSplitMode="file"; fSplitMaxInputFileNumber=1;} virtual void SetFastReadOption(Bool_t on=kTRUE) {fFastReadOption = on ? 1 : 0;} virtual void SetOverwriteMode(Bool_t on=kTRUE) {fOverwriteMode = on ? 1 : 0;} @@ -94,8 +99,9 @@ public: static Bool_t DirectoryExists(const char *lfn); static Bool_t FileExists(const char *lfn); static const char *GetJobStatus(Int_t jobidstart, Int_t lastid, Int_t &nrunning, Int_t &nwaiting, Int_t &nerror, Int_t &ndone); - static Bool_t CheckMergedFiles(const char *filename, const char *aliendir, Int_t nperchunk, Bool_t submit=kTRUE, const char *jdl=""); - static Bool_t MergeOutput(const char *output, const char *basedir, Int_t nmaxmerge, Int_t stage=0, Int_t ichunk=0); + const char *GetListOfFiles(const char *type); + Bool_t CheckMergedFiles(const char *filename, const char *aliendir, Int_t nperchunk, const char *jdl=""); + static Bool_t MergeOutput(const char *output, const char *basedir, Int_t nmaxmerge, Int_t stage=0); virtual Bool_t MergeOutputs(); virtual void Print(Option_t *option="") const; virtual Bool_t StartAnalysis(Long64_t nentries=123456789, Long64_t firstentry=0); @@ -149,6 +155,7 @@ private: Int_t fRunRange[2]; // Run range Int_t fNrunsPerMaster; // Number of runs per masterjob Int_t fMaxMergeFiles; // Maximum number of files to be merged in one chunk + Int_t fMaxMergeStages; // Maximum number of merging stages Int_t fNsubmitted; // Number of jobs submitted Int_t fProductionMode; // Production mode (0-off, 1-on) Int_t fOutputToRunNo; // Use run number as output directory @@ -166,6 +173,7 @@ private: TString fExecutableArgs; // arguments added to the executable script after the analysis macro TString fAnalysisMacro; // Root macro steering the analysis TString fAnalysisSource; // User analysis implementation (.cxx) file(s) + TString fValidationScript; // Name of the validation script TString fAdditionalRootLibs; // List (separated by blacs) of additional libraries needed for/before analysis libs/par file compilation TString fAdditionalLibs; // List (separated by blacs) of additional libraries needed for the analysis loaded AFTER all par files TString fSplitMode; // Job split mode @@ -183,6 +191,7 @@ private: TString fInputFormat; // Input format (xml-single) TString fDatasetName; // Dataset xml file to be created TString fJDLName; // JDL file to be generated + TString fTerminateFiles; // List of output files produced during Terminate TString fMergeExcludes; // List of output files excluded from merging TString fIncludePath; // Include path TString fCloseSE; // Preffered storage element. Taken from alien_CLOSE_SE environment. @@ -195,9 +204,10 @@ private: TString fFileForTestMode; // .txt file for the chain to be used in PROOF test mode TString fRootVersionForProof; // ROOT version to be used in PROOF mode. The default one taken if empty. TString fAliRootMode; // AliRoot mode among the list supported by the proof cluster + TString fMergeDirName; // Name of the directory that should be added to the output directory TObjArray *fInputFiles; // List of input files to be processed by the job TObjArray *fPackages; // List of packages to be used - ClassDef(AliAnalysisAlien, 14) // Class providing some AliEn utilities + ClassDef(AliAnalysisAlien, 17) // Class providing some AliEn utilities }; #endif