diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a316778d..4c6babe1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,16 +78,17 @@ Validate Code: - python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template - python3 pipeline/validateProcesses.py source/libraries/ -Build and Test: - stage: test - script: - - cd ${CI_PROJECT_DIR} - - python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template - - mkdir ${CI_PROJECT_DIR}/build && cd ${CI_PROJECT_DIR}/build - - cmake ${CI_PROJECT_DIR} -DTEST=ON -DREST_ALL_LIBS=ON - -DREST_GARFIELD=OFF -DREST_G4=ON -DREST_WELCOME=OFF - - make -j2 - - ctest --output-on-failure -O ${CI_PROJECT_DIR}/build/Testing/summary.txt +#Build and Test: +# stage: test +# script: +# - cd ${CI_PROJECT_DIR} +# - python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template +# - mkdir ${CI_PROJECT_DIR}/build && cd ${CI_PROJECT_DIR}/build +# - cmake ${CI_PROJECT_DIR} -DTEST=ON -DREST_ALL_LIBS=ON +# -DREST_GARFIELD=OFF -DREST_G4=ON -DREST_WELCOME=OFF -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install-test +# - make -j2 install +# - source ${CI_PROJECT_DIR}/install-test/thisREST.sh +# - ctest --output-on-failure -O ${CI_PROJECT_DIR}/build/Testing/summary.txt artifacts: name: "Testing" diff --git a/source/framework/core/src/TRestAnalysisPlot.cxx b/source/framework/core/src/TRestAnalysisPlot.cxx index c16440f49..e20b12a9b 100644 --- a/source/framework/core/src/TRestAnalysisPlot.cxx +++ b/source/framework/core/src/TRestAnalysisPlot.cxx @@ -66,8 +66,13 @@ void TRestAnalysisPlot::InitFromConfigFile() { TiXmlElement* ele = GetElement("addFile"); while (ele != nullptr) { - TString inputfile = GetParameter("name", ele); - this->AddFile(inputfile); + std::string inputfile = GetParameter("name", ele); + if (inputfile.find("http") == 0) + this->AddFile(inputfile); + else { + std::vector infiles = TRestTools::GetFilesMatchingPattern(inputfile); + for (const auto& f : infiles) this->AddFile(f); + } ele = GetNextElement(ele); } // try to add files from external TRestRun handler