From 4d2581eba9999c93410038a966a8bc41f9232bee Mon Sep 17 00:00:00 2001 From: marian Date: Wed, 18 Apr 2012 12:35:54 +0000 Subject: [PATCH] Fix neccessary for local merge (Mikolaj) --- PWGPP/CalibMacros/CPass0/merge.C | 2 +- PWGPP/CalibMacros/CPass1/merge.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGPP/CalibMacros/CPass0/merge.C b/PWGPP/CalibMacros/CPass0/merge.C index 7484d5f3e9d..c9693b72e3a 100644 --- a/PWGPP/CalibMacros/CPass0/merge.C +++ b/PWGPP/CalibMacros/CPass0/merge.C @@ -28,7 +28,7 @@ void merge(const char* outputDir, const char* pattern, Bool_t copyLocal=kFALSE) Long_t id, size, flags, modtime; Bool_t outputDirFailure = gSystem->GetPathInfo(outputDir, &id, &size, &flags, &modtime); printf("st: %i, flags: %i, patt: %s\n",outputDirFailure,flags,patternStr.Data()); - if (!outputDirFailure && (flags==0) && patternStr.IsNull()) + if (!outputDirFailure && (flags==0)) { printf("### processing local fileList: %s\n",outputDir); listFileName=outputDir; diff --git a/PWGPP/CalibMacros/CPass1/merge.C b/PWGPP/CalibMacros/CPass1/merge.C index 90d945804fd..f105c32fa0d 100644 --- a/PWGPP/CalibMacros/CPass1/merge.C +++ b/PWGPP/CalibMacros/CPass1/merge.C @@ -28,7 +28,7 @@ void merge(const char* outputDir, const char* pattern, Bool_t copyLocal=kFALSE) Long_t id, size, flags, modtime; Bool_t outputDirFailure = gSystem->GetPathInfo(outputDir, &id, &size, &flags, &modtime); printf("st: %i, flags: %i, patt: %s\n",outputDirFailure,flags,patternStr.Data()); - if (!outputDirFailure && (flags==0) && patternStr.IsNull()) + if (!outputDirFailure && (flags==0)) { printf("### processing local fileList: %s\n",outputDir); listFileName=outputDir; -- 2.43.0