Uh oh!
There was an error while loading. Please reload this page.
Updated Continuous Integration DetSim configurations to refactored G4 - #896
Draft
PetrilloAtWork wants to merge 1 commit into
Draft
Updated Continuous Integration DetSim configurations to refactored G4#896PetrilloAtWork wants to merge 1 commit into
PetrilloAtWork wants to merge 1 commit into
Conversation
There was a problem hiding this comment.
Pull request overview
Updates ICARUS DetSim/CI configurations and supporting reconstruction/overlay pieces to work with the refactored G4/WireCell setup, including new calibration tag usage and updated standard FHiCL entry points.
Changes:
- Bump UPS dependency versions and retarget CI DetSim quick tests to
detsim_2d_icarus_refactored.fcl. - Update WireCell jsonnet/FHiCL configuration to use new YZ map inputs and calibration DB global tags; add overlay-specific WireCell/drifter options.
- Add/adjust reconstruction and analysis configuration (hit merging, per-plane TPC gain normalization, CAF weight labels, overlay standard configs) and reorganize standard FHiCL install layout.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
ups/product_deps | Updates dependency versions for CI/build compatibility. |
test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl | Points CI single-particle DetSim include to refactored DetSim FHiCL. |
test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl | Points CI nu+cosmics DetSim include to refactored DetSim FHiCL. |
test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl | Points CI intime-cosmic DetSim include to refactored DetSim FHiCL. |
icaruscode/TPC/SignalProcessing/HitFinder/hitfindermodules_icarus.fcl | Adds cryostat-specific HitMerger module configs. |
icaruscode/TPC/SignalProcessing/HitFinder/HitMerger_module.cc | Adds associations from recob::ChannelROI to merged hits. |
icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-yzsim-refactored.jsonnet | Switches field map inputs to “shifted” files; makes YZ map filenames configurable via extVars. |
icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-refactored.jsonnet | Adds conditional overlay drifter configuration and drifter name switching. |
icaruscode/TPC/ICARUSWireCell/icarus/sim.jsonnet | Makes DB filename/tag configurable via extVars. |
icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl | Adds calibration global tag include; sets default YZ/DB params; adjusts gains/time offsets; adds shifted-overlay config. |
icaruscode/TPC/Calorimetry/normtools_icarus.fcl | Switches to per-plane TPC gain normalization tools and updated calibration constants. |
icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl | Uses shared data calibration constants for MC calorimetry constants. |
icaruscode/TPC/Calorimetry/NormalizeTPCPerPlane_tool.cc | New per-plane HTTP-based TPC normalization tool implementation. |
icaruscode/TPC/Calorimetry/NormalizeTPCPerPlaneSQL_tool.cc | New per-plane SQL/DBFolder-based TPC normalization tool implementation. |
icaruscode/TPC/Calorimetry/CMakeLists.txt | Adds build targets for the new per-plane normalization tools. |
icaruscode/Overlays/SubRunPOTInEvent_module.cc | Adds module to copy subrun POT summary into each event (for mixing workflows). |
icaruscode/Filters/simenergydep_faketrigger_icarus.fcl | Adds FHiCL config for a SimEnergyDeposit-based “fake trigger” filter. |
icaruscode/Filters/filterMCTruthVolume.fcl | Adds FHiCL config for filtering MCTruth by vertex volume. |
icaruscode/Filters/SimEnergyDepFakeTriggerFilterICARUS_module.cc | Adds new EDFilter implementing the SimEnergyDeposit “fake trigger”. |
icaruscode/Filters/FilterMCTruthVolume_module.cc | Adds new EDFilter selecting MCTruth interactions outside a configured box and passing POT at SubRun. |
icaruscode/CRT/CRTDataAnalysis_module.cc | Adds run/subrun to CRTHit ntuple; adds trigger timestamp branch; refactors formatting/flow. |
fcl/supera/supera_icarus_MC_all_cryo_PMT_CRT_v10.fcl | Adds updated Supera configuration for MC including PMT/CRT and multi-cryo handling. |
fcl/supera/supera_icarus_MC_all_cryo_PMT_CRT_overlay.fcl | Adds overlay variant of Supera configuration. |
fcl/standard/standard_mc_intime_g4_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_mc_beamcosmics_g4_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_mc_all_stage1larcv_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_mc_all_stage1_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_mc_all_stage0_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_mc_all_detsim_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_data_stage1larcv_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_data_stage1_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/standard_data_stage0_icarus.fcl | Removes old top-level standard include (migrated to new layout). |
fcl/standard/overlay/standard_overlay_stage1_icarus.fcl | Adds standard overlay Stage1 entrypoint include. |
fcl/standard/overlay/standard_overlay_stage0_icarus.fcl | Adds standard overlay Stage0 entrypoint include. |
fcl/standard/overlay/standard_overlay_overlay_icarus.fcl | Adds standard overlay “overlay” stage entrypoint include. |
fcl/standard/overlay/standard_overlay_detsim_icarus.fcl | Adds standard overlay DetSim entrypoint include. |
fcl/standard/overlay/standard_overlay_caf_iarus.fcl | Adds standard overlay CAF entrypoint include (note filename). |
fcl/standard/overlay/CMakeLists.txt | Adds install rules for the new overlay standard FHiCL subdir. |
fcl/standard/mc/standard_mc_mpvmpr_stage1larcv_icarus.fcl | Adds MC MPVMPR stage1larcv standard entrypoint. |
fcl/standard/mc/standard_mc_intime_g4_icarus.fcl | Adds MC intime G4 standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_intime_caf_icarus.fcl | Adds MC intime CAF standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_beamcosmics_g4_icarus.fcl | Adds MC beam+cosmics G4 standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_beamcosmics_caf_icarus.fcl | Adds MC beam+cosmics CAF standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_all_stage1_icarus.fcl | Adds MC stage1 standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_all_stage0_icarus.fcl | Adds MC stage0 standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_all_larcv_icarus.fcl | Adds MC larcv standard entrypoint (new layout). |
fcl/standard/mc/standard_mc_all_detsim_icarus.fcl | Adds MC DetSim standard entrypoint (new layout). |
fcl/standard/mc/CMakeLists.txt | Adds install rules for the new mc standard FHiCL subdir. |
fcl/standard/data/standard_data_stage1larcv_icarus.fcl | Adds data stage1larcv standard entrypoint (new layout). |
fcl/standard/data/standard_data_stage1_icarus.fcl | Adds data stage1 standard entrypoint (new layout). |
fcl/standard/data/standard_data_stage0_icarus.fcl | Adds data stage0 standard entrypoint (new layout). |
fcl/standard/data/standard_data_larcv_icarus.fcl | Adds data larcv standard entrypoint (new layout). |
fcl/standard/data/standard_data_caf_icarus.fcl | Adds data CAF standard entrypoint (new layout). |
fcl/standard/data/CMakeLists.txt | Adds install rules for the new data standard FHiCL subdir. |
fcl/standard/CMakeLists.txt | Reorganizes standard FHiCL install into mc/, data/, overlay/ subdirectories. |
fcl/reco/wires/restorewires_icarus.fcl | Adds a small process config to rebuild wires from ChannelROI. |
fcl/reco/wires/CMakeLists.txt | Adds install rules for new fcl/reco/wires configs. |
fcl/reco/Stage1/overlay/stage1_run2_icarus_overlay_wiremod.fcl | Adds overlay Stage1 variant for wiremod selection. |
fcl/reco/Stage1/overlay/stage1_run2_icarus_overlay_simpledet.fcl | Adds overlay Stage1 variant for simpledet SimChannel labels. |
fcl/reco/Stage1/mc/stage1_run2_icarus_MC_wiremod.fcl | Adds MC Stage1 variant selecting T0-tagged tracks for wiremod use case. |
fcl/reco/Stage1/mc/stage1_run2_icarus_MC_simpledet.fcl | Adds MC Stage1 variant for simpledet SimChannel labels. |
fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl | Silences SimDriftElectrons message category in Stage1 MC. |
fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl | Updates Stage1 1D config to use cluster3D labels for pandora/CRTT0Tagging/caloskim. |
fcl/reco/Stage0/mc/stage0_run2_wc_icarus_mc_notriggersim.fcl | Adjusts ophit input module name for no-trigger-sim stage0 WC config. |
fcl/reco/Stage0/mc/stage0_run2_wc_icarus_mc.fcl | Updates output commands to drop overlay waveforms/shifted waveforms and keep daqPMT. |
fcl/reco/Stage0/mc/stage0_run2_icarus_mc.fcl | Removes simChannelROI from path and updates output commands similarly. |
fcl/reco/Stage0/data/stage0_run2_icarus.fcl | Stops dropping daqCRT from output commands. |
fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl | Adds service include for daqPMT drop workflow. |
fcl/reco/Stage0/data/partial/stage0_run2_icarus_opdetonly.fcl | Adds partial Stage0 config for optical-only reconstruction. |
fcl/reco/Stage0/data/partial/decodeTrigger_icarus.fcl | Adds partial config to decode trigger only. |
fcl/reco/Stage0/data/partial/decodePMT_icarus_treeonly.fcl | Adds partial config for PMT tree-only decoding and trigger dump. |
fcl/reco/Stage0/data/partial/decodePMT_icarus_standalone.fcl | Adds standalone PMT decoding config for studies. |
fcl/reco/Stage0/data/partial/decodePMT_icarus_incomplete.fcl | Adds PMT decoding config tolerating missing fragments. |
fcl/reco/Stage0/data/partial/decodePMT_icarus.fcl | Adds base PMT decoding config (new layout location). |
fcl/reco/Stage0/data/partial/CMakeLists.txt | Adds install rules for Stage0 partial configs. |
fcl/reco/Stage0/data/CMakeLists.txt | Adds subdirectory install for partial Stage0 configs. |
fcl/reco/Definitions/stage1_icarus_defs.fcl | Adds hit merging and PT hit finders; retargets pandora/CRTT0Tagging/caloskim labels; sets Supera params. |
fcl/reco/Definitions/enable_overlay_stage1.fcl | Sets overlay Supera config and keeps overlay waveform label settings. |
fcl/reco/CMakeLists.txt | Installs new wires subdirectory. |
fcl/overlays/simulation_genie_icarus_bnb_overlays_volDetEnclosure_fiducial.fcl | Adds overlay generation variant with fiducial cut. |
fcl/overlays/overlay_waveforms.fcl | Stops dropping crthit products from overlay output. |
fcl/overlays/dirt_gen_overlay_siminfomixer.fcl | Adds sim info mixing workflow for dirt overlay generation. |
fcl/gen/genie/simulation_genie_icarus_bnb_volWorld_rockbox.fcl | Adds GENIE dirt-in-world generation variant with rockbox fiducial. |
fcl/gen/genie/simulation_genie_icarus_bnb_volWorld_DetEnclosurerockbox.fcl | Adds GENIE workflow using FilterMCTruthVolume to reject interactions in det enclosure. |
fcl/gen/genie/simulation_genie_icarus_bnb_volDetEnclosure_fiducial.fcl | Adds GENIE det-enclosure fiducial variant. |
fcl/gen/corsika/prodwiremod_icarus_overlays.fcl | Adds overlay-enabled corsika wiremod production config. |
fcl/gen/corsika/prodwiremod_icarus.fcl | Adds base corsika wiremod production config. |
fcl/g4/larg4_icarus_cosmics_sce_filterwiremod.fcl | Adds G4 cosmics+sCE config with simchan filter for wiremod. |
fcl/g4/larg4_icarus_cosmics_sce_filterdirt.fcl | Adds G4 dirt filtering using SimEnergyDeposit fake trigger and subrun POT in event. |
fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl | Adds Run4 overlay detsim variant overriding YZ gain map. |
fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl | Adds Run4 detsim variant overriding YZ gain map. |
fcl/detsim/detsim_2d_icarus_refactored_overlay.fcl | Adds detsim overlay configuration wiring shifted-overlay WireCell producer. |
fcl/detsim/detsim_2d_icarus_refactored.fcl | Retargets DetSim daq producer to shifted WireCell config. |
fcl/configurations/calibration_database_TPC_TagSets_icarus.fcl | Adds Jul/Oct 2025 TPC tag sets for updated calibrations. |
fcl/configurations/calibration_database_PMT_TagSets_icarus.fcl | Adds Oct 2025 PMT global tag set. |
fcl/configurations/calibration_database_GlobalTags_icarus.fcl | Switches global tags to Oct 2025 sets. |
fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl | Adds Geant4 reweighting into CAF production path and labels. |
fcl/caf/cafmakerjob_icarus_systtools.fcl | Adds Geant4 reweighting into CAF production path and labels. |
fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl | Adds Geant4 reweighting into SCE CAF production path and labels. |
fcl/caf/cafmakerjob_icarus_sce_systtools.fcl | Adds Geant4 reweighting into SCE CAF production path and labels. |
fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl | Reworks overlay CAF job to use data preprocess producers/sequence and include overlay additions. |
fcl/caf/cafmakerjob_icarus_detsim2d_simpledet.fcl | Adds “simpledet” detsim2d CAF job variant. |
fcl/caf/cafmakerjob_icarus_detsim2d_overlay_simpledet.fcl | Adds “simpledet” overlay detsim2d CAF job variant. |
fcl/caf/cafmakerjob_icarus_detsim2d_overlay.fcl | Reworks overlay CAF job to use data preprocess producers/sequence and include overlay additions. |
fcl/caf/cafmaker_defs.fcl | Adds Geant4 eventweight config, updates sequences, and sets CAFMaker CRT SimChannel label. |
fcl/caf/cafmaker_add_overlay_icarus.fcl | Adds overlay-specific CAFMaker overrides (CRTHitLabel, OverrideRealData, etc.). |
fcl/caf/cafmaker_add_detsim2d_icarus.fcl | Simplifies detsim2d CAF additions (keeps SimChannel/backtracker label overrides only). |
CMakeLists.txt | Updates project version string for the new release iteration. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
PetrilloAtWork
marked this pull request as draft
April 17, 2026 20:37
PetrilloAtWorkforce-pushed
the
feature/gp_cidetsimfix
branch
from
April 17, 2026 20:53
56b7416 to
c815bfbComparejas1005
commented
Apr 20, 2026
Contributor
I got turned around with what CI work made it into this production branch, release/SBN2025A, versus develop. PR #873 makes all the changes this PR does and some others. I'm leaving this PR open so Vito can comment on Gianluca's question above. But we can likely close this PR since it duplicates PR #873. My apologies. I closed PR #873 in the past because I did not think it was necessary to have this work live on release/SBN2025A alongside develop. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the broken DetSim stage of the C.I. tests.
This change was tested only on the single particle tests; the other two test workflow are (almost) identical though.
This pull request is against
release/SBN2025Abranch and it was developed againstv10_06_00_06p04tag.Release managers: please duplicate, cherry-pick and change target branch as needed.
Last force-push: I adopted the changes in
develop. Still reluctant to just cherry-pick the fix indevelop(308484a) because of a statement about a discontinued parameter inMergeSimSourceswhich does not seem to have actually been discontinued. @vitodb may comment on that.