From a3e8405340dc096d09f048579b5486c9bb09e845 Mon Sep 17 00:00:00 2001 From: agheata Date: Tue, 7 Jul 2009 08:04:22 +0000 Subject: [PATCH] Changed production mode bit to an int. --- ANALYSIS/AliAnalysisAlien.cxx | 23 ++++++++++------------- ANALYSIS/AliAnalysisAlien.h | 5 +++-- ANALYSIS/AliAnalysisGrid.h | 3 +-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx index f338503988d..3b807f6f63a 100644 --- a/ANALYSIS/AliAnalysisAlien.cxx +++ b/ANALYSIS/AliAnalysisAlien.cxx @@ -53,6 +53,7 @@ AliAnalysisAlien::AliAnalysisAlien() fNrunsPerMaster(0), fMaxMergeFiles(0), fNsubmitted(0), + fProductionMode(0), fRunNumbers(), fExecutable(), fArguments(), @@ -97,6 +98,7 @@ AliAnalysisAlien::AliAnalysisAlien(const char *name) fNrunsPerMaster(0), fMaxMergeFiles(0), fNsubmitted(0), + fProductionMode(0), fRunNumbers(), fExecutable(), fArguments(), @@ -141,6 +143,7 @@ AliAnalysisAlien::AliAnalysisAlien(const AliAnalysisAlien& other) fNrunsPerMaster(other.fNrunsPerMaster), fMaxMergeFiles(other.fMaxMergeFiles), fNsubmitted(other.fNsubmitted), + fProductionMode(other.fProductionMode), fRunNumbers(other.fRunNumbers), fExecutable(other.fExecutable), fArguments(other.fArguments), @@ -210,6 +213,10 @@ AliAnalysisAlien &AliAnalysisAlien::operator=(const AliAnalysisAlien& other) fMaxInitFailed = other.fMaxInitFailed; fMasterResubmitThreshold = other.fMasterResubmitThreshold; fNtestFiles = other.fNtestFiles; + fNrunsPerMaster = other.fNrunsPerMaster; + fMaxMergeFiles = other.fMaxMergeFiles; + fNsubmitted = other.fNsubmitted; + fProductionMode = other.fProductionMode; fRunNumbers = other.fRunNumbers; fExecutable = other.fExecutable; fArguments = other.fArguments; @@ -911,7 +918,7 @@ Bool_t AliAnalysisAlien::WriteJDL(Bool_t copy) } else { Info("CreateJDL", "\n##### Copying JDL file <%s> to your AliEn output directory", fJDLName.Data()); TString locjdl = Form("%s/%s", fGridOutputDir.Data(),fJDLName.Data()); - if (TObject::TestBit(AliAnalysisGrid::kProductionMode)) + if (fProductionMode) locjdl = Form("%s/%s", workdir.Data(),fJDLName.Data()); if (FileExists(locjdl)) gGrid->Rm(locjdl); TFile::Cp(Form("file:%s",fJDLName.Data()), Form("alien://%s", locjdl.Data())); @@ -1098,6 +1105,7 @@ void AliAnalysisAlien::Print(Option_t *) const { // Print current plugin settings. printf("### AliEn analysis plugin current settings ###\n"); + printf("= Production mode:______________________________ %d\n", fProductionMode); printf("= Version of API requested: ____________________ %s\n", fAPIVersion.Data()); printf("= Version of ROOT requested: ___________________ %s\n", fROOTVersion.Data()); printf("= Version of AliRoot requested: ________________ %s\n", fAliROOTVersion.Data()); @@ -1343,17 +1351,6 @@ void AliAnalysisAlien::SetDefaultOutputs(Bool_t flag) TObject::SetBit(AliAnalysisGrid::kDefaultOutputs, flag); } -//______________________________________________________________________________ -void AliAnalysisAlien::SetProductionMode(Bool_t flag) -{ -// If production mode is set, all required files are produced and copied to -// AliEn but the master jobs are not submitted. A file .prod containing all -// submit parameters is copied to the work directory. - if (flag && !TObject::TestBit(AliAnalysisGrid::kProductionMode)) - Info("SetProductionMode", "Plugin in production mode. Jobs are not submitted."); - TObject::SetBit(AliAnalysisGrid::kProductionMode, flag); -} - //______________________________________________________________________________ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEntry*/) { @@ -1440,7 +1437,7 @@ Bool_t AliAnalysisAlien::StartAnalysis(Long64_t /*nentries*/, Long64_t /*firstEn return kFALSE; } // Check if submitting is managed by LPM manager - if (TObject::TestBit(AliAnalysisGrid::kProductionMode)) { + if (fProductionMode) { TString prodfile = fJDLName; prodfile.ReplaceAll(".jdl", ".prod"); WriteProductionFile(prodfile); diff --git a/ANALYSIS/AliAnalysisAlien.h b/ANALYSIS/AliAnalysisAlien.h index 9da5331a081..472acffcd65 100644 --- a/ANALYSIS/AliAnalysisAlien.h +++ b/ANALYSIS/AliAnalysisAlien.h @@ -64,7 +64,7 @@ public: virtual void SetNtestFiles(Int_t nfiles) {fNtestFiles = nfiles;} virtual void SetJDLName(const char *name="analysis.jdl") {fJDLName = name;} virtual void SetPreferedSE(const char *se) {fCloseSE = se;} - virtual void SetProductionMode(Bool_t flag=kTRUE); + virtual void SetProductionMode(Int_t mode=1) {fProductionMode = mode;} TGridJDL *GetGridJDL() {return fGridJDL;} const char *GetGridOutputDir() const {return fGridOutputDir;} @@ -108,6 +108,7 @@ private: Int_t fNrunsPerMaster; // Number of runs per masterjob Int_t fMaxMergeFiles; // Maximum number of files to be merged in one chunk Int_t fNsubmitted; // Number of jobs submitted + Int_t fProductionMode; // Production mode (0-off, 1-on) TString fRunNumbers; // List of runs to be processed TString fExecutable; // Executable script for AliEn job TString fArguments; // Arguments for the executable script @@ -135,6 +136,6 @@ private: TObjArray *fInputFiles; // List of input files to be processed by the job TObjArray *fPackages; // List of packages to be used - ClassDef(AliAnalysisAlien, 5) // Class providing some AliEn utilities + ClassDef(AliAnalysisAlien, 6) // Class providing some AliEn utilities }; #endif diff --git a/ANALYSIS/AliAnalysisGrid.h b/ANALYSIS/AliAnalysisGrid.h index 24a286ed183..64066495647 100644 --- a/ANALYSIS/AliAnalysisGrid.h +++ b/ANALYSIS/AliAnalysisGrid.h @@ -29,8 +29,7 @@ enum EPluginRunMode { kUseAOD = BIT(20), kUseMC = BIT(21), kUsePars = BIT(22), - kDefaultOutputs = BIT(23), - kProductionMode = BIT(24) + kDefaultOutputs = BIT(23) }; AliAnalysisGrid() {} -- 2.43.5