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.

Sign up for GitHub

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

Enable reco for ILD_FCCee_v01/2 #150

Merged
merged 6 commits into from
Nov 18, 2024
Merged

Enable reco for ILD_FCCee_v01/2 #150

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81500a1
style: sort inputs
Victor-Schwan Sep 26, 2024
81db8e0
enable reco w/ ILD_FCCee_v01/2
Victor-Schwan Sep 26, 2024
95c42dd
replace v11 CI with ILD_FCCee_v01/2 CI
Victor-Schwan Oct 22, 2024
4f1e3a3
replace k4geo_DIR env var w/ K4GEO to stick with previous UI
Victor-Schwan Oct 22, 2024
175e302
add explanation of different tuples of FCCee models
Victor-Schwan Oct 22, 2024
38cc6fb
outsource compact file path building to function
Victor-Schwan Nov 18, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/key4hep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ jobs:
--outputFileBase=bbudsc_3evt_GaudiRec \
--detectorModel=${{ matrix.detector_model }}

# Reconstruction with the v11 model (FCCee) using EDM4hep inputs and outputs
gaudi-v11-reco:
# Reconstruction with the ILD@FCCee models using EDM4hep inputs and outputs
gaudi-ILDatFCCee-reco:
tmadlener marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
detector_model: [ILD_l5_v11]
detector_model: [ILD_FCCee_v01, ILD_FCCee_v02]
key4hep_build: [sw-nightlies.hsf.org]
os: [ubuntu2204, el9]

Expand All @@ -109,7 +109,7 @@ jobs:
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 \
--compactFile $lcgeo_DIR/FCCee/ILD_FCCee/compact/${{ matrix.detector_model }}/${{ matrix.detector_model }}.xml \
--steeringFile ddsim_steer.py
echo "::endgroup::"
echo "::group::Run reconstruction"
Expand Down
1 change: 1 addition & 0 deletions StandardConfig/production/Calibration/Calibration_ILD_FCCee_v01.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Calibration_ILD_l5_v11.cfg
1 change: 1 addition & 0 deletions StandardConfig/production/Calibration/Calibration_ILD_FCCee_v02.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Calibration_ILD_l5_v11.cfg
17 changes: 12 additions & 5 deletions StandardConfig/production/ILDReconstruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
k4DataSvc,
)
from Gaudi.Configuration import INFO

from py_utils import import_from, SequenceLoader, parse_collection_patch_file

from k4FWCore.parseArgs import parser
from k4MarlinWrapper.parseConstants import parseConstants

from py_utils import SequenceLoader, import_from, parse_collection_patch_file

# only non-FCCMDI models
DETECTOR_MODELS = (
"ILD_l2_v02",
Expand All @@ -46,9 +45,14 @@
"ILD_s5_o4_v02",
)
# only FCCMDI
FCCeeMDI_DETECTOR_MODELS = (
FCCeeMDI_DETECTOR_MODELS_common_MDI = ( # only models located in $K4GEO/FCCee/ILD_FCCee/
"ILD_FCCee_v01",
"ILD_FCCee_v02",
)
FCCeeMDI_DETECTOR_MODELS = ( # only add models located in $K4GEO/ILD/ here
"ILD_l5_o1_v09",
"ILD_l5_v11",
*FCCeeMDI_DETECTOR_MODELS_common_MDI,
)

REC_COLLECTION_CONTENTS_FILE = "collections_rec_level.txt"
Expand Down Expand Up @@ -137,7 +141,10 @@
if reco_args.compactFile:
compact_file = reco_args.compactFile
else:
compact_file = f"{os.environ['K4GEO']}/ILD/compact/{det_model}/{det_model}.xml"
if det_model in FCCeeMDI_DETECTOR_MODELS_common_MDI:
compact_file = f"{os.path.normpath(os.environ['K4GEO'])}/FCCee/ILD_FCCee/compact/{det_model}/{det_model}.xml"
else:
compact_file = f"{os.path.normpath(os.environ['K4GEO'])}/ILD/compact/{det_model}/{det_model}.xml"

geoSvc = GeoSvc("GeoSvc")
geoSvc.detectors = [compact_file]
Expand Down