Changed Docker image for GitLab CI pipeline, cmake tweaks

.github/workflows/build.yml

@@ -3,18 +3,23 @@ name: Build and Test
 on:
   workflow_dispatch:
 
+env:
+  DOCKER_IMAGE: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-25-01_Geant4-v10.4.3_Garfield-4.0
+  REST_PATH: /rest/install
+
 jobs:
   Check-Image:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-20-06_Geant4-v10.4.3_Garfield-4.0
+      image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-25-01_Geant4-v10.4.3_Garfield-4.0
 
     steps:
       - name: Check ROOT is available in non-interactive shell
         run: |
           root-config --version
           root-config --prefix
           root-config --cflags
+          root -q
       - name: Check Geant4 is available in non-interactive shell
         run: |
           geant4-config --version
@@ -43,31 +48,55 @@ jobs:
           MediumMagboltz gas;
           return 0;' -q
 
-  Build:
+  Build-and-Install:
     needs: Check-Image
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-20-06_Geant4-v10.4.3_Garfield-4.0
-    env:
-      REST_PATH: /rest/install
+      image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-25-01_Geant4-v10.4.3_Garfield-4.0
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Pull Submodules
         run: yes | python3 pull-submodules.py --clean
 
-      - name: Build
+      - name: Build and Install
         run: |
           mkdir -p build
           cd build
-          cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH } -DREST_WELCOME=OFF -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON
+          cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DREST_WELCOME=OFF -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON
           make -j$(nproc)
           make install
 
+      - uses: actions/upload-artifact@master
+        with:
+          name: framework-install
+          path: ${{ env.REST_PATH }}
+
+  Basic-Checks:
+    needs: Build-and-Install
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-25-01_Geant4-v10.4.3_Garfield-4.0
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/download-artifact@master
+        with:
+          name: framework-install
+          path: ${{ env.REST_PATH }}
+
       - name: REST config
         run: |
-          ${REST_PATH}/bin/rest-config --version
-          ${REST_PATH}/bin/rest-config --libs
-          ${REST_PATH}/bin/rest-config --flags
-          ${REST_PATH}/bin/rest-config --commit
+          . ${{ env.REST_PATH }}/thisREST.sh
+          rest-config --version
+          rest-config --libs
+          rest-config --flags
+          rest-config --commit
+
+      - name: RestRoot
+        run: |
+          . ${{ env.REST_PATH }}/thisREST.sh
+          cd /pipeline/analysistree/
+          restRoot -b -q simpleTree.cpp

.gitlab-ci.yml

@@ -1,50 +1,50 @@
-#image: lobis/root-geant4-garfieldpp:cxx14_ROOTv6-25-01_Geant4v10.4.3
-image: nkx1231/root6-geant4-garfield:0.6
+image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-26-00_Geant4-v10.4.3_Garfield-af4a1451
+# image: nkx1231/root6-geant4-garfield:0.6
 
 variables:
 #    GIT_SUBMODULE_STRATEGY: recursive
 
 stages:
-    # Basic checks to verify correctness of code
+  # Basic checks to verify correctness of code
   - pre-build
 
-    # Project compilation validation
+  # Project compilation validation
   - build
 
-    # REST libraries installed as sub-modules
+  # REST libraries installed as sub-modules
   - libraries
 
-    # Basic validation tests of installation
+  # Basic validation tests of installation
   - install
 
-    # Basic core validation tests
+  # Basic core validation tests
   - core
 
-    # Stage dedicated to validate metadata classes. gas, readout, g4Metadata, etc
+  # Stage dedicated to validate metadata classes. gas, readout, g4Metadata, etc
   - metadata
 
-    # Stage to validate restG4 package examples
+  # Stage to validate restG4 package examples
   - restG4
 
-    # Stage to validate data chain processing constructions (TREX-DM data, PandaX-III topology, etc).
+  # Stage to validate data chain processing constructions (TREX-DM data, PandaX-III topology, etc).
   - restManager_process
 
-    # Stage to validate tasks or executions over preprocessed data filesx
+  # Stage to validate tasks or executions over preprocessed data filesx
   - postProcessing
 
-    # Stage to validate other restManager tasks (metadata generation, script loading, etc).
+  # Stage to validate other restManager tasks (metadata generation, script loading, etc).
   - restManager_generate
 
-    # Scripts to launch more complete tests. TRestGas file generation, Geant4 physics validation, etc.
+  # Scripts to launch more complete tests. TRestGas file generation, Geant4 physics validation, etc.
   - deploy
 
 before_script:
   - pwd
   - export USER="test"
-    #  - export GIT_SSL_NO_VERIFY=1
+  #  - export GIT_SSL_NO_VERIFY=1
   - echo $CI_SERVER_HOST
   - echo $CRONJOB
-    # We redefine the HOME
+  # We redefine the HOME
   - export HOME=${CI_PROJECT_DIR}/install_latest/
   - if [ -d $HOME/.rest ]; then rm -Rf $HOME/.rest; fi
   - if [ -f "/opt/root/install/bin/thisroot.sh" ]; then source /opt/root/install/bin/thisroot.sh; fi
@@ -54,9 +54,12 @@ before_script:
   - if [ -d "/opt/garfieldpp/install" ]; then export GARFIELD_HOME=/opt/garfieldpp/install; fi
   - if [ -d "/opt/garfieldpp/install" ]; then export HEED_DATABASE=$GARFIELD_HOME/Heed/heed++/database; fi
   - if [ -d "/opt/garfieldpp/install" ]; then export LD_LIBRARY_PATH=$GARFIELD_HOME/lib:$LD_LIBRARY_PATH; fi
-  - ls $GARFIELD_HOME
+  - if [[ -v GARFIELD_INSTALL ]]; then export GARFIELD_HOME=$GARFIELD_INSTALL; fi
+  - echo $GARFIELD_HOME
+  - echo $GARFIELD_INSTALL
   - python3 --version
   - apt update && apt install -y wget
+  - root -q
 
 clang-format:
   stage: pre-build
@@ -73,11 +76,11 @@ clang-format:
       - $CRONJOB == "YES"
 
 validateCode:
-    stage: pre-build
-    script:
-        - cd ${CI_PROJECT_DIR}/
-        - python3 pull-submodules.py --force --dontask
-        - python3 pipeline/validateProcesses.py source/libraries/
+  stage: pre-build
+  script:
+    - cd ${CI_PROJECT_DIR}/
+    - python3 pull-submodules.py --force --dontask
+    - python3 pipeline/validateProcesses.py source/libraries/
 
 #axionLib:
 #  stage: libraries
@@ -124,7 +127,7 @@ build_latest:
     - if [ -d ${CI_PROJECT_DIR}/install_latest ]; then rm -Rf ${CI_PROJECT_DIR}/install_latest; fi
     - cmake ${CI_PROJECT_DIR} -DREST_WELCOME=OFF -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install_latest
     - make install -j2
-      #    - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
+    #    - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
   artifacts:
     paths:
       - ${CI_PROJECT_DIR}/install_latest
@@ -137,14 +140,14 @@ build_latest:
     #    - cd ${CI_PROJECT_DIR}/
     #    - python3 pull-submodules.py --force --dontask --latest
     #    - if [ -d ${CI_PROJECT_DIR}/build_latest2 ]; then rm -Rf ${CI_PROJECT_DIR}/build_latest2; fi
-      #    - mkdir ${CI_PROJECT_DIR}/build_latest2 && cd ${CI_PROJECT_DIR}/build_latest2/
-      #    - if [ -d ${CI_PROJECT_DIR}/install_latest2 ]; then rm -Rf ${CI_PROJECT_DIR}/install_latest2; fi
-      #    - cmake ${CI_PROJECT_DIR} -DREST_WELCOME=OFF -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install_latest2
-      #    - make install -j2
-      #    - . ${CI_PROJECT_DIR}/install_latest2/thisREST.sh
-      #  except:
-      #      variables:
-      #        - $CRONJOB == "YES"
+    #    - mkdir ${CI_PROJECT_DIR}/build_latest2 && cd ${CI_PROJECT_DIR}/build_latest2/
+    #    - if [ -d ${CI_PROJECT_DIR}/install_latest2 ]; then rm -Rf ${CI_PROJECT_DIR}/install_latest2; fi
+    #    - cmake ${CI_PROJECT_DIR} -DREST_WELCOME=OFF -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install_latest2
+    #    - make install -j2
+    #    - . ${CI_PROJECT_DIR}/install_latest2/thisREST.sh
+    #  except:
+    #      variables:
+    #        - $CRONJOB == "YES"
 
     #build_nkx:
     #  image: nkx1231/root6-geant4-garfield:0.6
@@ -170,6 +173,12 @@ loadRESTLibs:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - restRoot -b -q
 
+loadRESTMacros:
+  type: install
+  script:
+    - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
+    - restRoot -m 1 -b -q -v 3
+
 listRESTMacros:
   type: install
   script:
@@ -202,24 +211,24 @@ listRESTMacros:
     expire_in: 1 day
 
 LoadGas:
-  type: metadata 
+  type: metadata
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/metadata/gas/
     - restRoot -b -q LoadGasFromServerAndValidate.C
   only:
-      variables:
-        - $CI_SERVER_HOST == "lfna.unizar.es"
+    variables:
+      - $CI_SERVER_HOST == "lfna.unizar.es"
 
 GenerateGas:
-  type: metadata 
+  type: metadata
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/metadata/gas/
     - restRoot -b -q GenerateDummyGas.C
   only:
-      variables:
-        - $CI_SERVER_HOST == "lfna.unizar.es"
+    variables:
+      - $CI_SERVER_HOST == "lfna.unizar.es"
 
 AnalysisTree:
   type: core
@@ -229,17 +238,17 @@ AnalysisTree:
     - restRoot -b -q simpleTree.cpp
 
 GenerateReadout:
-  type: metadata 
+  type: metadata
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/metadata/readout/
     - restManager --c generateReadout.rml --o readout.root
     - restRoot -b -q PrintReadout.C'("readout.root")' > /dev/null
-      # We need to introduce basic validation here
-      #    - diff validation.txt print.txt
+    # We need to introduce basic validation here
+    #    - diff validation.txt print.txt
 
 BasicReadout:
-  type: metadata 
+  type: metadata
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/projects/basic-readouts/
@@ -260,7 +269,7 @@ testMeta:
       - ${CI_PROJECT_DIR}/install_latest/examples/meta.root
     expire_in: 1 day
 
-trexDM_data_latest: 
+trexDM_data_latest:
   type: restManager_process
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
@@ -279,7 +288,7 @@ trexDM_data_latest:
       - ${CI_PROJECT_DIR}/pipeline/trex/Hits_01928.root
     expire_in: 1 day
 
-pandaXIII_Topological: 
+pandaXIII_Topological:
   type: restManager_process
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
@@ -293,7 +302,7 @@ pandaXIII_Topological:
       - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/trackParameter.png
     expire_in: 1 week
 
-pandaXIII_Topological_fromG4: 
+pandaXIII_Topological_fromG4:
   type: restManager_process
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
@@ -307,7 +316,7 @@ pandaXIII_Topological_fromG4:
       - ${CI_PROJECT_DIR}/pipeline/pandaxiii_MC/testOutput.root
     expire_in: 1 week
 
-pandaXIII_data: 
+pandaXIII_data:
   type: restManager_process
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
@@ -319,16 +328,16 @@ pandaXIII_data:
     paths:
       - ${CI_PROJECT_DIR}/pipeline/pandaxiii_data/TriggerRate.png
     expire_in: 1 week
-        
-EventSelection: 
+
+EventSelection:
   type: restManager_process
   script:
     - . ${CI_PROJECT_DIR}/install_latest/thisREST.sh
     - cd ${CI_PROJECT_DIR}/pipeline/selection
     - restManager --c g4Analysis.rml --f "${CI_PROJECT_DIR}/install_latest/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root"
     - restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root
     - restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")'
-    
+
   artifacts:
     paths:
       - ${CI_PROJECT_DIR}/pipeline/selection/IDs.txt

CMakeLists.txt

@@ -56,7 +56,26 @@ set(CMAKE_MACOSX_RPATH 1)
 
 # ROOT libs and includes
 
-find_package(ROOT REQUIRED)
+set(ROOT_REQUIRED_LIBRARIES Core RIO Geom Gdml Minuit Spectrum)
+# Switch to enable ROOT Eve functionality.
+if (NOT DEFINED REST_EVE)
+    set(REST_EVE ON)
+endif ()
+if (${REST_EVE} MATCHES "ON")
+    add_definitions(-DUSE_Eve)
+    list(APPEND rest_features "Eve")
+    set(ROOT_REQUIRED_LIBRARIES ${ROOT_REQUIRED_LIBRARIES} Eve RGL)
+else ()
+    set(excludes ${excludes} TRestEveEventViewer)
+endif (${REST_EVE} MATCHES "ON")
+
+find_package(ROOT REQUIRED COMPONENTS ${ROOT_REQUIRED_LIBRARIES})
+
+message(STATUS "ROOT LIBRARIES: ${ROOT_LIBRARIES}")
+
+set(external_libs "${external_libs};${ROOT_LIBRARIES}")
+
+set(ROOTCINT_EXECUTABLE ${ROOT_rootcint_CMD})
 
 execute_process(COMMAND root-config --has-cxx20 OUTPUT_VARIABLE HASCXX20)
 execute_process(COMMAND root-config --has-cxx17 OUTPUT_VARIABLE HASCXX17)
@@ -76,19 +95,6 @@ elseif (${HASCXX11} MATCHES "yes")
 endif ()
 
 set(external_include_dirs ${external_include_dirs} ${ROOT_INCLUDE_DIRS})
-set(external_libs ${external_libs} "${ROOT_LIBRARIES} -lGui -lGeom -lGdml -lMinuit -lSpectrum")
-
-# Switch to enable ROOT Eve functionality.
-if (NOT DEFINED REST_EVE)
-    set(REST_EVE ON)
-endif ()
-if (${REST_EVE} MATCHES "ON")
-    add_definitions(-DUSE_Eve)
-    list(APPEND rest_features "Eve")
-    set(external_libs "${external_libs} -lEve -lRGL")
-else ()
-    set(excludes ${excludes} TRestEveEventViewer)
-endif (${REST_EVE} MATCHES "ON")
 
 # This is to enable linking of SQL libraries. I.e. for process TRestSQLToAnalysisProccess.
 if (NOT DEFINED SQL)