Merge branch 'fileListDF' of github.com:rest-for-physics/framework in…

…to fileListDF
rest-for-physics · Apr 12, 2024 · 6dd9735 · 6dd9735
2 parents b788e50 + 0b81d37
commit 6dd9735
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/source/framework/core/src/TRestDataSet.cxx b/source/framework/core/src/TRestDataSet.cxx
@@ -389,11 +389,15 @@ std::vector<std::string> TRestDataSet::FileSelection() {
         return fFileSelection;
     }
 
+<<<<<<< HEAD
     std::vector<std::string> fileList;
       for(const auto &pattern : fFilePatternList){
         auto list = TRestTools::GetFilesMatchingPattern(pattern);
         fileList.insert(end(fileList), begin(list), end(list));
       }
+=======
+    if (fFileList.empty()) fFileList = TRestTools::GetFilesMatchingPattern(fFilePattern);
+>>>>>>> 0b81d3761936c020e7cfa432c980a57974368ea5
 
     RESTInfo << "TRestDataSet::FileSelection. Starting file selection." << RESTendl;
     RESTInfo << "Total files : " << fileList.size() << RESTendl;