Skip to content

Feature/recaf prod updates #903

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

Open
gputnam wants to merge 28 commits into
base: release/SBN2025A
Choose a base branch
from
Open

Feature/recaf prod updates #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d4d3aee
add WireMod in X vs theta_XW
hausnerh Jan 13, 2026
75cf9d7
add ratio file
hausnerh Jan 13, 2026
987c35b
reintroduce shifted Edep handling
hausnerh Jan 16, 2026
0174432
use WireToChanROI module
hausnerh Jan 28, 2026
a890bf7
drop dropables
hausnerh Jan 29, 2026
2b4a732
reorder some ops
hausnerh Feb 5, 2026
2fdb040
Better ratio file handling
hausnerh Mar 9, 2026
aeae91a
Add handling for non-global x coordinate
hausnerh Mar 9, 2026
4288084
Get an offset from the difference in the BackTracker and the Detector…
hausnerh Mar 30, 2026
4af0c9b
Add dummy scaling to WireModXXW
hausnerh Mar 31, 2026
040f61b
Add fhicls
hausnerh May 7, 2026
1c00a49
add WireModifierXXW.fcl
hausnerh May 8, 2026
09d85d3
give optional YZ correction to XXW modifications
hausnerh May 11, 2026
c8db028
Add optionality to TGraphs per plane
hausnerh May 13, 2026
58e7d3c
New fcl configurations and modules to enable Dirt Overlay configurati…
gputnam Apr 13, 2026
99aca7c
Add in double ampersand, add a few fixes.
gputnam Apr 17, 2026
38f05ad
Fixes to SimInfoMixer.
gputnam Apr 28, 2026
e4ab9c2
Add catch blocks for depositions without a TPC or Wire
gputnam Apr 1, 2026
0185c79
Update icaruscode hit finder default to utilize bad channel exclusion.
gputnam May 26, 2026
f216457
Update wiremod fcls
gputnam May 26, 2026
8b0aa53
Update WireMod asserts to exceptions
gputnam May 26, 2026
02d749e
Remove stale config.
gputnam May 26, 2026
c63bee1
Merge branch 'feature/gputnam-systematic-productions' into feature/re…
gputnam May 26, 2026
02614f7
Update ratio .root files.
gputnam May 26, 2026
7e6587a
Merge branch 'feature/gputnam-systematic-productions' into feature/re…
gputnam May 26, 2026
61c8226
Add in SCE variation fcls
gputnam May 26, 2026
270a8a1
Merge branch 'feature/gputnam-systematic-productions' into feature/re…
gputnam May 26, 2026
6fd7ba6
Update CAF blinding scheme.
gputnam May 26, 2026
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
6 changes: 6 additions & 0 deletions fcl/caf/cafmakerjob_icarus_2Xsce_detsim2d_overlay.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include "cafmakerjob_icarus_sce.fcl"
#include "cafmaker_add_detsim2d_icarus.fcl"
#include "cafmaker_add_overlay_icarus.fcl"


services.SpaceChargeService.InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_DoubleCharge_voxelTH3.root"
3 changes: 3 additions & 0 deletions fcl/caf/cafmakerjob_icarus_data.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ physics.producers.cafmaker.SystWeightLabels: []
physics.producers.cafmaker.SaveGENIEEventRecord: false

physics.producers.cafmaker.TriggerLabel: "daqTrigger" # the general configuration, for MC, has a different one (see also https://github.com/SBNSoftware/icaruscode/issues/556)

# Disble old blinding scheme-- switch to decimated datasets
physics.producers.cafmaker.CreateBlindedCAF: false
3 changes: 3 additions & 0 deletions fcl/caf/cafmakerjob_icarus_sce_detsim2d_overlay.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "cafmakerjob_icarus_sce.fcl"
#include "cafmaker_add_detsim2d_icarus.fcl"
#include "cafmaker_add_overlay_icarus.fcl"
7 changes: 7 additions & 0 deletions fcl/reco/Definitions/stage1_icarus_defs.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,13 @@ icarus_stage1_producers.gaushit2dTPCWE.CalDataModuleLabel:
icarus_stage1_producers.gaushit2dTPCEW.CalDataModuleLabel: "wire2channelroi2d:PHYSCRATEDATATPCEW"
icarus_stage1_producers.gaushit2dTPCEE.CalDataModuleLabel: "wire2channelroi2d:PHYSCRATEDATATPCEE"

# Exclude input ChannelROIs on channels flagged bad by the channel-status database
# (ICARUS bad-channel DB, tag configured via TPC_CalibrationTags global tag).
icarus_stage1_producers.gaushit2dTPCWW.ExcludeBadChannels: true
icarus_stage1_producers.gaushit2dTPCWE.ExcludeBadChannels: true
icarus_stage1_producers.gaushit2dTPCEW.ExcludeBadChannels: true
icarus_stage1_producers.gaushit2dTPCEE.ExcludeBadChannels: true

# Lower thresholds for tighter filter width
icarus_stage1_producers.gaushit2dTPCEE.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 5.
icarus_stage1_producers.gaushit2dTPCEE.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 5.
Expand Down
1 change: 1 addition & 0 deletions icaruscode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ add_subdirectory(RecoUtils)
add_subdirectory(TPC)
add_subdirectory(Utilities)
add_subdirectory(Overlays)
add_subdirectory(WireMod)
#add_subdirectory(Supera)
248 changes: 248 additions & 0 deletions icaruscode/WireMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
set(EXCLUDED_PLUGINS WireModMakeHists_plugin.cc ROICounter_module.cc HitComp_plugin.cc HitTTreeMaker_plugin.cc WireModifier_module.cc WireModifierXXW_module.cc)

art_make(
LIB_LIBRARIES
${ART_FRAMEWORK_CORE}
art_Utilities canvas
${MF_MESSAGELOGGER}

cetlib cetlib_except
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
MODULE_LIBRARIES
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
lardata::Utilities
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
EXCLUDE ${EXCLUDED_PLUGINS}
#WireMod_Utilities.hh
#WireMod_Utilities.cc
)

find_library( sbncode::sbncode_WireMod_Utility_LIBRARY NAMES sbncode::sbncode_WireMod_Utility )

simple_plugin(WireModMakeHists "plugin"
${ART_FRAMEWORK_CORE}
${MF_MESSAGELOGGER}
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
BASENAME_ONLY
)

simple_plugin(HitComp "plugin"
${ART_FRAMEWORK_CORE}
${MF_MESSAGELOGGER}
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
BASENAME_ONLY
)

simple_plugin(HitTTreeMaker "plugin"
${ART_FRAMEWORK_CORE}
${MF_MESSAGELOGGER}
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
BASENAME_ONLY
)

cet_build_plugin(ROICounter art::module
LIBRARIES
${ART_FRAMEWORK_CORE}
${MF_MESSAGELOGGER}
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
)

simple_plugin(WireModifier "module"
${ART_FRAMEWORK_CORE}
${MF_MESSAGELOGGER}
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
larcore::Geometry_Geometry_service
larcorealg::Geometry
lardataalg::DetectorInfo
lardata::Utilities
lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
sbnobj::ICARUS_TPC
sbncode::WireMod_Utility
BASENAME_ONLY
)

simple_plugin(WireModifierXXW "module"
${ART_FRAMEWORK_CORE}
${MF_MESSAGELOGGER}
${Boost_SYSTEM_LIBRARY}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
art_root_io::TFileService_service
lardataobj::AnalysisBase
lardataobj::RawData
lardataobj::RecoBase
lardata::RecoObjects
larreco::RecoAlg
${LARRECO_LIB}
${LARDATA_LIB}
${ART_FRAMEWORK_CORE}
${ART_FRAMEWORK_PRINCIPAL}
${ART_FRAMEWORK_SERVICES_REGISTRY}
${ART_FRAMEWORK_SERVICES_OPTIONAL}
${ART_FRAMEWORK_SERVICES_OPTIONAL_RANDOMNUMBERGENERATOR_SERVICE}
${ART_FRAMEWORK_SERVICES_OPTIONAL_TFILESERVICE_SERVICE}
${MF_MESSAGELOGGER}
${FHICLCPP}
${CLHEP}
${ROOT_GEOM}
${ROOT_XMLIO}
${ROOT_GDML}
${ROOT_BASIC_LIB_LIST}
${ROOT_HIST}
larcore::Geometry_Geometry_service
larcorealg::Geometry
lardataalg::DetectorInfo
lardata::Utilities
lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
sbnobj::ICARUS_TPC
sbncode::WireMod_Utility
BASENAME_ONLY
)

install_headers()
install_fhicl()
install_source()
FILE(GLOB ratios *.root )
install(FILES ${ratios} DESTINATION root/WireMod)
10 changes: 10 additions & 0 deletions icaruscode/WireMod/HitComp.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
BEGIN_PROLOG

standard_hitcomp:
{
plugin_type: "HitComp"
Label: "gaushit1dTPCEE"
Process: "MCstage0Var"
}

END_PROLOG
Loading