Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRestAnalysisPlot. Now addFile supports filename patterns #251

Merged
merged 8 commits into from
Jun 15, 2022
Merged

TRestAnalysisPlot. Now addFile supports filename patterns #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae1b5f1
TRestAnalysisPlot. Now addFile supports filename patterns
jgalan Jun 15, 2022
cd2b880
TRestAnalysisPlot. Adding a fix when file added is http address
jgalan Jun 15, 2022
b3d3afa
.gitlab-ci.yml Removing build tests from pipeline
jgalan Jun 15, 2022
836689d
Trying to fix gitlab pipeline by sourcing test install
Jun 15, 2022
b255ae1
Merge branch 'jgalan_analysis_plots' of github.com:rest-for-physics/f…
Jun 15, 2022
4318e02
Adding missing install in the pipeline
Jun 15, 2022
745f28e
Removal of build test in gitlab pipeline
Jun 15, 2022
9c9c357
Addressing yml error after change
Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions source/framework/core/src/TRestAnalysisPlot.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> infiles = TRestTools::GetFilesMatchingPattern(inputfile);
for (const auto& f : infiles) this->AddFile(f);
}
ele = GetNextElement(ele);
}
// try to add files from external TRestRun handler
Expand Down