From ae1b5f19a4e1f869a4fde4449e7f1ca97c113e9f Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Wed, 15 Jun 2022 12:25:42 +0200
Subject: [PATCH 1/7] TRestAnalysisPlot. Now addFile supports filename patterns

---
 source/framework/core/src/TRestAnalysisPlot.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/framework/core/src/TRestAnalysisPlot.cxx b/source/framework/core/src/TRestAnalysisPlot.cxx
index c16440f49..6929cd767 100644
--- a/source/framework/core/src/TRestAnalysisPlot.cxx
+++ b/source/framework/core/src/TRestAnalysisPlot.cxx
@@ -66,8 +66,9 @@ void TRestAnalysisPlot::InitFromConfigFile() {
 
     TiXmlElement* ele = GetElement("addFile");
     while (ele != nullptr) {
-        TString inputfile = GetParameter("name", ele);
-        this->AddFile(inputfile);
+        std::string inputfile = GetParameter("name", ele);
+        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

From cd2b880f5eba600c46743fad9cc340514ea393b5 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Wed, 15 Jun 2022 12:59:14 +0200
Subject: [PATCH 2/7] TRestAnalysisPlot. Adding a fix when file added is http
 address

---
 source/framework/core/src/TRestAnalysisPlot.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/framework/core/src/TRestAnalysisPlot.cxx b/source/framework/core/src/TRestAnalysisPlot.cxx
index 6929cd767..e20b12a9b 100644
--- a/source/framework/core/src/TRestAnalysisPlot.cxx
+++ b/source/framework/core/src/TRestAnalysisPlot.cxx
@@ -67,8 +67,12 @@ void TRestAnalysisPlot::InitFromConfigFile() {
     TiXmlElement* ele = GetElement("addFile");
     while (ele != nullptr) {
         std::string inputfile = GetParameter("name", ele);
-        std::vector<std::string> infiles = TRestTools::GetFilesMatchingPattern(inputfile);
-        for (const auto& f : infiles) this->AddFile(f);
+        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

From b3d3afab474868fe0c977fec8e4af091288cb443 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Wed, 15 Jun 2022 13:45:15 +0200
Subject: [PATCH 3/7] .gitlab-ci.yml Removing build tests from pipeline

---
 .gitlab-ci.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a316778d..804245369 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,22 +78,22 @@ 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
-
-  artifacts:
-    name: "Testing"
-    paths:
-      - ${CI_PROJECT_DIR}/build/Testing
-    expire_in: 1 day
+#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
+#
+#  artifacts:
+#    name: "Testing"
+#    paths:
+#      - ${CI_PROJECT_DIR}/build/Testing
+#    expire_in: 1 day
 
 Build and Install:
   stage: build

From 836689dc6bfd3a0ee954a33659a26a4111765039 Mon Sep 17 00:00:00 2001
From: juanan <juanan@sultan2>
Date: Wed, 15 Jun 2022 13:48:37 +0200
Subject: [PATCH 4/7] Trying to fix gitlab pipeline by sourcing test install

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a316778d..93d8cab41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,8 +85,9 @@ Build and Test:
     - 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
+      -DREST_GARFIELD=OFF -DREST_G4=ON -DREST_WELCOME=OFF -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install-test
     - make -j2
+    - source ${CI_PROJECT_DIR}/install-test/thisREST.sh
     - ctest --output-on-failure -O ${CI_PROJECT_DIR}/build/Testing/summary.txt
 
   artifacts:

From 4318e02f2295a833a7ac2655cdc4c673397d1627 Mon Sep 17 00:00:00 2001
From: juanan <juanan@sultan2>
Date: Wed, 15 Jun 2022 14:05:58 +0200
Subject: [PATCH 5/7] Adding missing install in the pipeline

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93d8cab41..47fb1579b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,7 +86,7 @@ Build and Test:
     - 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
+    - make -j2 install
     - source ${CI_PROJECT_DIR}/install-test/thisREST.sh
     - ctest --output-on-failure -O ${CI_PROJECT_DIR}/build/Testing/summary.txt
 

From 745f28e1567300f31b44e65ecd8df4136fb585cd Mon Sep 17 00:00:00 2001
From: juanan <juanan@sultan2>
Date: Wed, 15 Jun 2022 14:25:23 +0200
Subject: [PATCH 6/7] Removal of build test in gitlab pipeline

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47fb1579b..59c69b964 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,14 +81,14 @@ Validate Code:
 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
+    #- 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"

From 9c9c35768f6ff66382a0bc24a23aa74f7d26b522 Mon Sep 17 00:00:00 2001
From: juanan <juanan@sultan2>
Date: Wed, 15 Jun 2022 14:28:50 +0200
Subject: [PATCH 7/7] Addressing yml error after change

---
 .gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59c69b964..4c6babe1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,17 +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 -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
+#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"