Merge pull request #66 from oglez/master

Merging changes related to some fine-tuning of plots and also checks in CI/CD comparing the python and C++ version

Author: ttedeschi

.github/workflows/resultchecks.yml

@@ -0,0 +1,54 @@
+name: Result_checks
+on:
+  workflow_run:
+    workflows: [Software_check]
+    types: [completed]
+
+jobs:
+  compare_plots:
+    runs-on: ubuntu-latest
+    container:
+      image: cmscloud/al9-cms:latest
+      options: --user root
+    steps:
+      - name: Checking_out_code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Preparing_packages
+        run: |
+          echo "python version="`python3 -V`
+          ls -la
+          pwd
+          dnf install -y root ImageMagick python3-root
+          echo "ROOT version="`root-config --version`
+      - name: Python_plots
+        run: |
+          source scripts/setup_cmstyle
+          cd tests
+          for xfch in test_cmsCanvas test_THStack test_cms2DHisto
+          do
+              python3 ${xfch}.py
+              sha256sum ${xfch}.png
+          done
+      - name: Cpp_plots
+        run: |
+          source scripts/setup_cmstyle
+          cd tests
+          for xfch in test_cmsCanvas test_THStack test_cms2DHisto
+          do
+              root -b -q ${xfch}.C
+              sha256sum ${xfch}_C.png
+          done
+      - name: Comparison_of_plots
+        run: |
+          cd tests
+          for xfch in `ls *_C.png`
+          do
+              xfch2=`echo ${xfch} | sed s%_C.png%.png%`
+              echo -n "Comparison of $xfch and $xfch2 yields "
+              # NCC metric seems to have problems in some recent versions???
+              # echo `compare -metric NCC $xfch $xfch2 /dev/null`
+              echo `compare -metric RMSE $xfch $xfch2 /dev/null`
+          done
+#

.github/workflows/softwarecheck.yml

@@ -16,8 +16,8 @@ jobs:
           fetch-depth: 0
       - name: Checking_python_3.9
         run: |
-          python3 -V
-          ls
+          echo "python version="`python3 -V`
+          ls -la
           pwd
           python3 -m py_compile src/cmsstyle/cmsstyle.py
           ls -lh src/cmsstyle/__pycache__/
@@ -27,18 +27,18 @@ jobs:
           echo '{gROOT->LoadMacro("cmsstyle.C++");}' > compiling.C
 
           dnf install -y root
-          echo 'ROOT VERSION='`root-config --version`
+          echo "ROOT version="`root-config --version`
           root -q compiling.C
           ls -lh cmsstyle_C.so
 #
   py2-job:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repository (on host)
+      - name: Checkout repository (on host) for python 2.7 check
         uses: actions/checkout@v4
 
-      - name: Run checks inside container
+      - name: Run checks inside container for python 2.7 check
         uses: addnab/docker-run-action@v3
         with:
           image: cmscloud/cc7-cms:latest
@@ -47,4 +47,5 @@ jobs:
             python -V
             find . -type f
             python -m py_compile src/cmsstyle/cmsstyle.py
-            ls -lh src/cmsstyle/cmsstyle.pyc
+            ls -lh src/cmsstyle/cmsstyle.pyc
+#