Skip to content

Commit

Permalink
Merge branch 'master' into cpid-calibration
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener authored Sep 5, 2024
2 parents e7d7aec + 93e79c2 commit dec42f1
Show file tree
Hide file tree
Showing 55 changed files with 4,505 additions and 136 deletions.
121 changes: 121 additions & 0 deletions .github/workflows/key4hep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
name: smoke-tests

on:
push:
branches:
- master
pull_request:
workflow_dispatch:
schedule:
- cron: "19 6 * * *"

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

jobs:
marlin-std-reco:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
detector_model: [ILD_l5_o1_v02]
key4hep_build: [sw.hsf.org, sw-nightlies.hsf.org]
os: [ubuntu2204, el9]
steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v4
- uses: aidasoft/run-lcg-view@v4
with:
container: ${{ matrix.os }}
view-path: /cvmfs/${{ matrix.key4hep_build }}/key4hep
run: |
echo "::group::Run Simulation"
cd StandardConfig/production
ddsim --inputFiles Examples/bbudsc_3evt/bbudsc_3evt.stdhep \
--outputFile bbudsc_3evt_SIM.slcio \
--compactFile $lcgeo_DIR/ILD/compact/${{ matrix.detector_model }}/${{ matrix.detector_model }}.xml \
--steeringFile ddsim_steer.py
echo "::endgroup::"
echo "::group::Run Reconstruction"
Marlin MarlinStdReco.xml \
--constant.lcgeo_DIR=$lcgeo_DIR \
--constant.DetectorModel=${{ matrix.detector_model }} \
--constant.OutputBaseName=bbudsc_3evt \
--global.LCIOInputFiles=bbudsc_3evt_SIM.slcio
echo "::endgroup::"
echo "::group::Run LCTuple"
Marlin MarlinStdRecoLCTuple.xml \
--global.LCIOInputFiles=bbudsc_3evt_DST.slcio \
--MyAIDAProcessor.FileName=bbudsc_3evt_LCTuple
echo "::endgroup::"
echo "::group::Run MiniDST production"
Marlin MarlinStdRecoMiniDST.xml \
--global.LCIOInputFiles=bbudsc_3evt_DST.slcio \
--constant.OutputFile=bbudsc_3evt_miniDST.slcio \
--constant.lcgeo_DIR=$lcgeo_DIR
echo "::endgroup::"
# Reconstruction using EDM4hep inputs and outputs
gaudi-std-reco:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
detector_model: [ILD_l5_o1_v02]
key4hep_build: [sw.hsf.org, sw-nightlies.hsf.org]
os: [ubuntu2204, el9]

steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v4
- uses: aidasoft/run-lcg-view@v4
with:
container: ${{ matrix.os }}
view-path: /cvmfs/${{ matrix.key4hep_build }}/key4hep
run: |
echo "::group::Run simulation"
cd StandardConfig/production
ddsim --inputFiles Examples/bbudsc_3evt/bbudsc_3evt.stdhep \
--outputFile bbudsc_3evt_SIM.edm4hep.root \
--compactFile $lcgeo_DIR/ILD/compact/${{ matrix.detector_model }}/${{ matrix.detector_model }}.xml \
--steeringFile ddsim_steer.py
echo "::endgroup::"
echo "::group::Run reconstruction"
k4run ILDReconstruction.py \
--inputFiles=bbudsc_3evt_SIM.edm4hep.root \
--outputFileBase=bbudsc_3evt_GaudiRec \
--detectorModel=${{ matrix.detector_model }}
# Reconstruction with the v11 model (FCCee) using EDM4hep inputs and outputs
gaudi-v11-reco:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
detector_model: [ILD_l5_v11]
key4hep_build: [sw-nightlies.hsf.org]
os: [ubuntu2204, el9]

steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v4
- uses: aidasoft/run-lcg-view@v4
with:
container: ${{ matrix.os }}
view-path: /cvmfs/${{ matrix.key4hep_build }}/key4hep
run: |
echo "::group::Run simulation"
cd StandardConfig/production
ddsim --inputFiles Examples/bbudsc_3evt/bbudsc_3evt.stdhep \
--outputFile bbudsc_3evt_SIM.edm4hep.root \
--compactFile $lcgeo_DIR/ILD/compact/${{ matrix.detector_model }}/${{ matrix.detector_model }}.xml \
--steeringFile ddsim_steer.py
echo "::endgroup::"
echo "::group::Run reconstruction"
k4run ILDReconstruction.py \
--inputFiles=bbudsc_3evt_SIM.edm4hep.root \
--outputFileBase=bbudsc_3evt_GaudiRec \
--detectorModel=${{ matrix.detector_model }} \
--noBeamCalRec \
--trackingOnly
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
**/__pycache__/

# Common outputs of the standard workflow
*.out
*_SIM.slcio
*_REC.slcio
*_DST.slcio
*_miniDST.slcio
*_PfoAnalysis.root
*_AIDA.root
*_LCTuple.root

*_REC.edm4hep.root
*_SIM.edm4hep.root

# Side product of running Marlin
MarlinStdRecoParsed.xml

# Output for ranlux
Ranlux.coonf
78 changes: 0 additions & 78 deletions .travis-ci.d/test.sh

This file was deleted.

55 changes: 0 additions & 55 deletions .travis.yml

This file was deleted.

57 changes: 57 additions & 0 deletions StandardConfig/production/BgOverlay/BgOverlay.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

BgOverlayWW = MarlinProcessorWrapper("BgOverlayWW")
BgOverlayWW.OutputLevel = INFO
BgOverlayWW.ProcessorType = "Overlay"
BgOverlayWW.Parameters = {
"InputFileNames": ["undefined.slcio"],
"NumberOverlayEvents": ["0"],
"expBG": [cms_energy_config["ExpectedBgWW"]],
}

BgOverlayWB = MarlinProcessorWrapper("BgOverlayWB")
BgOverlayWB.OutputLevel = INFO
BgOverlayWB.ProcessorType = "Overlay"
BgOverlayWB.Parameters = {
"InputFileNames": ["undefined.slcio"],
"NumberOverlayEvents": ["0"],
"expBG": [cms_energy_config["ExpectedBgWB"]],
}

BgOverlayBW = MarlinProcessorWrapper("BgOverlayBW")
BgOverlayBW.OutputLevel = INFO
BgOverlayBW.ProcessorType = "Overlay"
BgOverlayBW.Parameters = {
"InputFileNames": ["undefined.slcio"],
"NumberOverlayEvents": ["0"],
"expBG": [cms_energy_config["ExpectedBgBW"]],
}

BgOverlayBB = MarlinProcessorWrapper("BgOverlayBB")
BgOverlayBB.OutputLevel = INFO
BgOverlayBB.ProcessorType = "Overlay"
BgOverlayBB.Parameters = {
"InputFileNames": ["undefined.slcio"],
"NumberOverlayEvents": ["0"],
"expBG": [cms_energy_config["ExpectedBgBB"]],
}

PairBgOverlay = MarlinProcessorWrapper("PairBgOverlay")
PairBgOverlay.OutputLevel = INFO
PairBgOverlay.ProcessorType = "Overlay"
PairBgOverlay.Parameters = {
"ExcludeCollections": ["BeamCalCollection"],
"InputFileNames": ["undefined.slcio"],
"NumberOverlayEvents": ["0"],
}

BgOverlaySequence = [
BgOverlayWW,
BgOverlayWB,
BgOverlayBW,
BgOverlayBB,
PairBgOverlay,
]
Loading

0 comments on commit dec42f1

Please sign in to comment.