Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to central Key4hep build workflows #15

Merged
merged 4 commits into from
Jan 13, 2025
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
47 changes: 20 additions & 27 deletions .github/workflows/key4hep.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,27 @@
name: key4hep
name: Key4hep build

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
workflow_dispatch:

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

jobs:
linux:
runs-on: ubuntu-latest
build:
strategy:
fail-fast: false
matrix:
include:
- release: "sw.hsf.org/key4hep"
CXX_STANDARD: 17
- release: "sw-nightlies.hsf.org/key4hep"
CXX_STANDARD: 20
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/${{ matrix.release }}
run: |
mkdir build install
cd build
cmake -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
-DCMAKE_CXX_FLAGS="-fdiagnostics-color=always " \
-DCMAKE_INSTALL_PREFIX=../install \
-DINSTALL_DOC=ON \
-GNinja \
..
ninja -k0
ctest --output-on-failure
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 README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# GEAR
[![linux](https://github.com/iLCSoft/GEAR/actions/workflows/linux.yml/badge.svg)](https://github.com/iLCSoft/GEAR/actions/workflows/linux.yml)
[![Key4hep build](https://github.com/iLCSoft/GEAR/actions/workflows/key4hep.yml/badge.svg?branch=master)](https://github.com/iLCSoft/GEAR/actions/workflows/key4hep.yml)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/12369/badge.svg)](https://scan.coverity.com/projects/ilcsoft-gear)

GEAR: GEometry Api for Reconstruction
Expand Down
7 changes: 5 additions & 2 deletions src/gearimpl/TPCModuleImpl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <cmath>
#include <complex>
#include <iostream>
#include <limits>

namespace gear {
/* Transforms a point from the global coordinates to Layout2D coordinates.*/
Expand Down Expand Up @@ -464,7 +465,8 @@ namespace gear {
// first check if the two origins are identical (to avoid divide by zero)
if (_offset[0]==0) // r is 0, no offset
{
double phiMin, phiMax;
double phiMin = std::numeric_limits<double>::max();
double phiMax = std::numeric_limits<double>::min();

if ( _zPosition > 0 )
{
Expand Down Expand Up @@ -649,7 +651,8 @@ namespace gear {

// phiMin and phiMax

double phiMin, phiMax;
double phiMin = std::numeric_limits<double>::max();
double phiMax = std::numeric_limits<double>::min();

// r > rMax
// If the global origin is outside of local rMax, the tangents on the rMax-circle are
Expand Down
Loading