diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml index 46e7265..743460c 100644 --- a/.github/workflows/key4hep.yml +++ b/.github/workflows/key4hep.yml @@ -1,18 +1,33 @@ -name: keyh4ep -on: [push, pull_request] +name: Key4hep build +on: + push: + branches: + - main + 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"] + image: ["alma9"] + stack: ["key4hep"] + include: + - build_type: nightly + image: ubuntu24 + stack: key4hep fail-fast: false - + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: key4hep/key4hep-actions/cache-external-data@main - uses: key4hep/key4hep-actions/key4hep-build@main with: build_type: ${{ matrix.build_type }} image: ${{ matrix.image }} + stack: ${{ matrix.stack }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml deleted file mode 100644 index a24db65..0000000 --- a/.github/workflows/linux.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: linux -on: [push, pull_request] - -jobs: - centos7: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - COMPILER: [gcc11] - LCG: [104] - - steps: - - uses: actions/checkout@v4 - - 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 - ctest --output-on-failure - ninja install diff --git a/source/Refitting/src/ExtrToSIT.cc b/source/Refitting/src/ExtrToSIT.cc index 7354748..47f0499 100644 --- a/source/Refitting/src/ExtrToSIT.cc +++ b/source/Refitting/src/ExtrToSIT.cc @@ -646,9 +646,9 @@ void ExtrToSIT::processEvent(LCEvent* evt) { refittedTrack); // trackCandidates vector stores all the candidate tracks of the event } // end of the creation of the refitted track collection - } // good fit status - } // good initialisation status - } // minimum acceptable TPC hits + } // good fit status + } // good initialisation status + } // minimum acceptable TPC hits delete marlin_trk; diff --git a/source/Refitting/src/ExtrToTracker.cc b/source/Refitting/src/ExtrToTracker.cc index 5794ec5..c301e11 100644 --- a/source/Refitting/src/ExtrToTracker.cc +++ b/source/Refitting/src/ExtrToTracker.cc @@ -455,7 +455,7 @@ void ExtrToTracker::processEvent(LCEvent* evt) { delete marlinTrk; } // good fit status - } // good initialisation status + } // good initialisation status delete marlin_trk; @@ -484,8 +484,8 @@ void ExtrToTracker::processEvent(LCEvent* evt) { for (size_t iHitOnEl = 0; iHitOnEl < vecHits.size(); iHitOnEl++) { notUsedHitsVec->addElement(vecHits.at(iHitOnEl)); } // end loop on hits on each det element - } // end loop on map detEl <--> vector of hits on the detEl - } // end loops on vector of maps - one for each subdetector + } // end loop on map detEl <--> vector of hits on the detEl + } // end loops on vector of maps - one for each subdetector evt->addCollection(notUsedHitsVec, _output_not_used_col_name); @@ -638,7 +638,7 @@ TrackerHitPlane* ExtrToTracker::getSiHit(std::vector& hitsOnDe min = testChi2; index = i; } // end min chi2 - } // end loop on hits on same detector element + } // end loop on hits on same detector element streamlog_out(DEBUG2) << "-- index of the selected hit: " << index << std::endl; diff --git a/source/Refitting/src/FPCCDFullLDCTracking_MarlinTrk.cc b/source/Refitting/src/FPCCDFullLDCTracking_MarlinTrk.cc index 48aedad..1068d21 100644 --- a/source/Refitting/src/FPCCDFullLDCTracking_MarlinTrk.cc +++ b/source/Refitting/src/FPCCDFullLDCTracking_MarlinTrk.cc @@ -3988,8 +3988,8 @@ void FPCCDFullLDCTracking_MarlinTrk::AssignTPCHitsToTracks(TrackerHitExtendedVec } } } // loop over leftover TPC hits - } // groups in tracks - } // loop over all tracks + } // groups in tracks + } // loop over all tracks for (int iH = 0; iH < nHits; ++iH) { TrackerHitExtended* trkHitExt = hitVec[iH]; diff --git a/source/Refitting/src/FPCCDSiliconTracking_MarlinTrk.cc b/source/Refitting/src/FPCCDSiliconTracking_MarlinTrk.cc index f8afc59..d08bf99 100644 --- a/source/Refitting/src/FPCCDSiliconTracking_MarlinTrk.cc +++ b/source/Refitting/src/FPCCDSiliconTracking_MarlinTrk.cc @@ -1353,16 +1353,16 @@ void FPCCDSiliconTracking_MarlinTrk::ProcessOneSector(int iPhi, int iTheta) { counter++; } } // endloop over hits in the inner sector - } // endloop over hits in the middle sector - } // endloop over hits in the outer sector - } // endif nHitsInner > 0 - } // endloop over theta in the Inner - } // endloop over phi in the Inner - } // endif nHitsMiddle > 0 - } // endloop over theta in the Middle - } // endloop over phi in the Middle - } // endif nHitsOuter > 0 - } // endloop over triplets + } // endloop over hits in the middle sector + } // endloop over hits in the outer sector + } // endif nHitsInner > 0 + } // endloop over theta in the Inner + } // endloop over phi in the Inner + } // endif nHitsMiddle > 0 + } // endloop over theta in the Middle + } // endloop over phi in the Middle + } // endif nHitsOuter > 0 + } // endloop over triplets // streamlog_out( DEBUG2 ) << " process one sectector theta,phi " << iTheta << ", " << iPhi << // " number of loops : " << counter << std::endl ; @@ -1409,9 +1409,9 @@ TrackExtended* FPCCDSiliconTracking_MarlinTrk::TestTriplet(TrackerHitExtended* o } } // for inner - } // for outer - } // for middle - } // if all vectors are not empty + } // for outer + } // for middle + } // if all vectors are not empty // increase triplet count ++_ntriplets; @@ -1666,9 +1666,9 @@ int FPCCDSiliconTracking_MarlinTrk::BuildTrack_KalFit(TrackerHitExtended* /*oute } } } // end of if statement of tiltStatus //MORI - } // endloop over hits in the Inner sector - } // endloop over theta in the Inner region - } // endloop over phi in the Inner region + } // endloop over hits in the Inner sector + } // endloop over theta in the Inner region + } // endloop over phi in the Inner region if (distMin > _minDistCutAttachForVXD) { nMisAssign++; diff --git a/source/Refitting/src/FullLDCTracking_MarlinTrk.cc b/source/Refitting/src/FullLDCTracking_MarlinTrk.cc index acac40d..5c68639 100644 --- a/source/Refitting/src/FullLDCTracking_MarlinTrk.cc +++ b/source/Refitting/src/FullLDCTracking_MarlinTrk.cc @@ -3863,8 +3863,8 @@ void FullLDCTracking_MarlinTrk::AssignTPCHitsToTracks(TrackerHitExtendedVec hitV } } } // loop over leftover TPC hits - } // groups in tracks - } // loop over all tracks + } // groups in tracks + } // loop over all tracks for (int iH = 0; iH < nHits; ++iH) { TrackerHitExtended* trkHitExt = hitVec[iH]; diff --git a/source/Refitting/src/SiliconTracking_MarlinTrk.cc b/source/Refitting/src/SiliconTracking_MarlinTrk.cc index ba5379d..71eecaa 100644 --- a/source/Refitting/src/SiliconTracking_MarlinTrk.cc +++ b/source/Refitting/src/SiliconTracking_MarlinTrk.cc @@ -1399,15 +1399,15 @@ void SiliconTracking_MarlinTrk::ProcessOneSector(int iPhi, int iTheta) { counter++; } } // endloop over hits in the inner sector - } // endloop over hits in the middle sector - } // endloop over hits in the outer sector - } // endif nHitsInner > 0 - } // endloop over theta in the Inner - } // endloop over phi in the Inner - } // endif nHitsMiddle > 0 - } // endloop over theta in the Middle - } // endloop over phi in the Middle - } // endif nHitsOuter > 0 + } // endloop over hits in the middle sector + } // endloop over hits in the outer sector + } // endif nHitsInner > 0 + } // endloop over theta in the Inner + } // endloop over phi in the Inner + } // endif nHitsMiddle > 0 + } // endloop over theta in the Middle + } // endloop over phi in the Middle + } // endif nHitsOuter > 0 } // endloop over triplets @@ -1456,9 +1456,9 @@ TrackExtended* SiliconTracking_MarlinTrk::TestTriplet(TrackerHitExtended* outerH } } // for inner - } // for outer - } // for middle - } // if all vectors are not empty + } // for outer + } // for middle + } // if all vectors are not empty // float dZ = FastTripletCheck(innerHit, middleHit, outerHit); @@ -1805,8 +1805,8 @@ int SiliconTracking_MarlinTrk::BuildTrack(TrackerHitExtended* /*outerHit*/, Trac } } } // endloop over hits in the Inner sector - } // endloop over theta in the Inner region - } // endloop over phi in the Inner region + } // endloop over theta in the Inner region + } // endloop over phi in the Inner region // check if closest hit fulfills the min distance cut if (distMin < _minDistCutAttach) {