Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 21 additions & 25 deletions .github/workflows/key4hep.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
name: keyh4ep
on: [push, pull_request]
name: Key4hep build

on:
push:
branches:
- master
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-and-test:
runs-on: ubuntu-latest
build:
strategy:
matrix:
build_type: ["release", "nightly"]
image: ["alma9", "ubuntu22"]
fail-fast: false

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cvmfs-contrib/github-action-cvmfs@v3
- uses: aidasoft/run-lcg-view@v4
- uses: actions/checkout@v4
- uses: key4hep/key4hep-actions/key4hep-build@main
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::Run Tests"
ctest --output-on-failure
echo "::endgroup::" && echo "::group::Install"
ninja install
build_type: ${{ matrix.build_type }}
image: ${{ matrix.image }}
25 changes: 0 additions & 25 deletions .github/workflows/linux.yml

This file was deleted.

2 changes: 1 addition & 1 deletion WWZZSeparation/processor/src/WWZZProcessor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void WWZZProcessor::processEvent( LCEvent * evt ) {
try{
colIsoleps = evt->getCollection( _colIsoleps );
}
catch( lcio::DataNotAvailableException e )
catch( lcio::DataNotAvailableException& e )
{
streamlog_out(WARNING) << _colIsoleps << " collection not available" << std::endl;
colIsoleps = NULL;
Expand Down
15 changes: 9 additions & 6 deletions tracking/src/DDDiagnostics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ struct invWSort { // sort track segments wtr to higher inverse relative weight

//======================================================================================================
//
#define APPLY_CUT( LEVEL, Cut, Exp ) if( (Exp) == false ) { if ( Cut ) \
streamlog_out( LEVEL ) << " ***** failed cut: [ " << #Exp \
<< " ] in evt: " << evt->getEventNumber() \
<< " run: " << evt->getRunNumber() << std::endl ; \
Cut = false ; }

#define APPLY_CUT(LEVEL, Cut, Exp) \
if ((Exp) == false) { \
if (Cut) { \
streamlog_out(LEVEL) << " ***** failed cut: [ " << #Exp \
<< " ] in evt: " << evt->getEventNumber() \
<< " run: " << evt->getRunNumber() << std::endl; \
} \
Cut = false; \
}
//======================================================================================================

DDDiagnostics aDDDiagnostics ;
Expand Down
Loading