Switch to dd4hep::CellID and update CI

.github/workflows/coverity.yml

@@ -0,0 +1,21 @@
+name: coverity
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  run-coverity:
+    runs-on: ubuntu-latest
+    if: github.repository == 'iLCSoft/CLICPerformance'
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
+      with:
+        coverity-cmake-command: 'cmake -C $ILCSOFT/ILCSoft.cmake ..'
+        coverity-project: 'iLCSoft%2FCLICPerformance'
+        coverity-project-token: ${{ secrets.CLICPERFORMANCE_COVERITY_TOKEN }}
+        github-pat: ${{ secrets.READ_COVERITY_IMAGE }}
+        view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/100/nightly/x86_64-centos7-gcc10-opt"
+        setup-script: "init_ilcsoft.sh"

.github/workflows/key4hep.yml

@@ -0,0 +1,31 @@
+name: keyh4ep
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
+      with:
+        container: centos7
+        view-path: /cvmfs/sw-nightlies.hsf.org/key4hep
+        run: |
+          mkdir build
+          cd build
+          echo "::group::Run CMake"
+          cmake -GNinja \
+            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " \
+            -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_INSTALL_PREFIX=../install \
+            ..
+          echo "::endgroup::" && echo "::group::Build"
+          ninja -k0
+          echo "::endgroup::" && echo "::group::Install"
+          ninja install
+          echo "::endgroup::" && echo "::group::Run Tests"
+          ctest --output-on-failure

.github/workflows/linux.yml

@@ -0,0 +1,26 @@
+name: linux
+on: [push, pull_request]
+
+jobs:
+  centos7:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        COMPILER: [gcc10, clang11]
+        LCG: [100]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
+      with:
+        view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/${{ matrix.LCG }}/nightly/x86_64-centos7-${{ matrix.COMPILER }}-opt"
+        setup-script: "init_ilcsoft.sh"
+        run: |
+          mkdir build
+          cd build
+          cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " ..
+          ninja -k0
+          ninja install
+          ctest --output-on-failure

CMakeLists.txt

@@ -37,6 +37,8 @@ INCLUDE_DIRECTORIES( SYSTEM ${Marlin_INCLUDE_DIRS} )
 LINK_LIBRARIES( ${Marlin_LIBRARIES} )
 ADD_DEFINITIONS( ${Marlin_DEFINITIONS} )
 
+INCLUDE_DIRECTORIES( BEFORE SYSTEM ${LCIO_INCLUDE_DIRS} )
+
 FIND_PACKAGE( MarlinTrk REQUIRED )
 INCLUDE_DIRECTORIES( SYSTEM ${MarlinTrk_INCLUDE_DIRS} )
 LINK_LIBRARIES( ${MarlinTrk_LIBRARIES} )
@@ -55,7 +57,7 @@ if(DD4HEP_USE_XERCESC)
 	find_package(XercesC)
 endif()
 include(DD4hep_XML_setup)
-INCLUDE_DIRECTORIES( SYSTEM ${DD4hep_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( BEFORE SYSTEM ${DD4hep_INCLUDE_DIRS} )
 LINK_LIBRARIES( ${DD4hep_LIBRARIES} ${DD4hep_COMPONENT_LIBRARIES} )
 
 OPTION( MARLINRECO_AIDA "Set to ON to build MarlinReco with AIDA" ON )

README.md

@@ -1,5 +1,5 @@
 # CLICPerformance
-[![Build Status](https://travis-ci.org/iLCSoft/CLICPerformance.svg?branch=master)](https://travis-ci.org/iLCSoft/CLICPerformance)
+[![linux](https://github.com/iLCSoft/CLICPerformance/actions/workflows/linux.yml/badge.svg)](https://github.com/iLCSoft/CLICPerformance/actions/workflows/linux.yml)
 [![Build Status](https://scan.coverity.com/projects/12340/badge.svg)](https://scan.coverity.com/projects/ilcsoft-clicperformance)
 
 Package containing processors and configurations to determine the performance of the CLIC detector model

Tracking/include/fpcompare.h

@@ -122,102 +122,6 @@ bool less_equal (float a, float b)
 
 
 } // namespace fpcompare
-
-
-namespace fpcompare_fn {
-
-
-struct equal
-  : public std::binary_function<double, double, bool>
-{
-  bool
-  operator()(double a, double b) const
-  { return fpcompare::equal (a, b); }
-};
-
-
-struct equalf
-  : public std::binary_function<float, float, bool>
-{
-  bool
-  operator()(float a, float b) const
-  { return fpcompare::equal (a, b); }
-};
-
-
-struct greater
-  : public std::binary_function<double, double, bool>
-{
-  bool
-  operator()(double a, double b) const
-  { return fpcompare::greater (a, b); }
-};
-
-
-struct greaterf
-  : public std::binary_function<float, float, bool>
-{
-  bool
-  operator()(float a, float b) const
-  { return fpcompare::greater (a, b); }
-};
-
-
-struct less
-  : public std::binary_function<double, double, bool>
-{
-  bool
-  operator()(double a, double b) const
-  { return fpcompare::less (a, b); }
-};
-
-
-struct lessf
-  : public std::binary_function<float, float, bool>
-{
-  bool
-  operator()(float a, float b) const
-  { return fpcompare::less (a, b); }
-};
-
-
-struct greater_equal
-  : public std::binary_function<double, double, bool>
-{
-  bool
-  operator()(double a, double b) const
-  { return fpcompare::greater_equal (a, b); }
-};
-
-
-struct greater_equalf
-  : public std::binary_function<float, float, bool>
-{
-  bool
-  operator()(float a, float b) const
-  { return fpcompare::greater_equal (a, b); }
-};
-
-
-struct less_equal
-  : public std::binary_function<double, double, bool>
-{
-  bool
-  operator()(double a, double b) const
-  { return fpcompare::less_equal (a, b); }
-};
-
-
-struct less_equalf
-  : public std::binary_function<float, float, bool>
-{
-  bool
-  operator()(float a, float b) const
-  { return fpcompare::less_equal (a, b); }
-};
-
-
-} // namespace fpcompare_fn
 } // namespace CxxUtils
 
 

Tracking/src/HitResiduals.cc

@@ -218,7 +218,7 @@ void HitResiduals::processEvent( LCEvent * evt ) {
 
       for( EVENT::TrackerHitVec::iterator it = trkHits.begin(); it != trkHits.end(); ++it ){
 
-	dd4hep::long64 id = (*it)->getCellID0() ;
+	const dd4hep::CellID id = (*it)->getCellID0() ;
 	cellid_decoder.setValue( id ) ;
 	streamlog_out(DEBUG1) << "id = " << id << std::endl;