From 0e6df7634c636913ef165872c299277ac9b8f598 Mon Sep 17 00:00:00 2001 From: kjplows Date: Thu, 17 Apr 2025 10:15:30 -0500 Subject: [PATCH 1/3] update signature with fSkipSimChannelTrackIDs (default false) --- sbncode/LArG4/MergeSimSourcesSBN_module.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sbncode/LArG4/MergeSimSourcesSBN_module.cc b/sbncode/LArG4/MergeSimSourcesSBN_module.cc index da84303a7..79e3b75f7 100644 --- a/sbncode/LArG4/MergeSimSourcesSBN_module.cc +++ b/sbncode/LArG4/MergeSimSourcesSBN_module.cc @@ -97,6 +97,12 @@ class sbn::MergeSimSourcesSBN : public art::EDProducer { true // default }; + fhicl::Atom SkipSimChannelTrackIDs{ + fhicl::Name{"SkipSimChannelTrackIDs"}, + fhicl::Comment{"Skip G4 track IDs in SimChannels"}, + false // default + }; + fhicl::Atom FillAuxDetSimChannels{ fhicl::Name{"FillAuxDetSimChannels"}, fhicl::Comment{"whether to merge AuxDetSimChannels"}, @@ -156,6 +162,7 @@ class sbn::MergeSimSourcesSBN : public art::EDProducer { bool const fFillMCParticlesAssociated; bool const fFillSimPhotons; bool const fFillSimChannels; + bool const fSkipSimChannelTrackIDs; bool const fFillAuxDetSimChannels; bool const fFillSimEnergyDeposits; std::vector const fEnergyDepositionInstances; @@ -198,6 +205,7 @@ sbn::MergeSimSourcesSBN::MergeSimSourcesSBN(Parameters const& params) , fFillMCParticlesAssociated(params().FillMCParticlesAssociated()) , fFillSimPhotons(params().FillSimPhotons()) , fFillSimChannels(params().FillSimChannels()) + , fSkipSimChannelTrackIDs(params().SkipSimChannelTrackIDs()) , fFillAuxDetSimChannels(params().FillAuxDetSimChannels()) , fFillSimEnergyDeposits( getOptionalValue(params().FillSimEnergyDeposits) @@ -349,7 +357,7 @@ void sbn::MergeSimSourcesSBN::produce(art::Event& e) if (fFillSimChannels) { auto const& input_scCol = e.getProduct>(input_label); - MergeUtility.MergeSimChannels(*scCol, input_scCol, i_source); + MergeUtility.MergeSimChannels(*scCol, input_scCol, i_source, !fSkipSimChannelTrackIDs); } if (fFillAuxDetSimChannels) { @@ -451,6 +459,7 @@ void sbn::MergeSimSourcesSBN::dumpConfiguration() const if (fFillMCParticlesAssociated) log << "\n - filling MCParticlesAssociated"; if (fFillSimChannels) log << "\n - filling SimChannels"; + if (fSkipSimChannelTrackIDs) log << "\n - skipping track IDs in filling SimChannels"; if (fFillAuxDetSimChannels) log << "\n - filling AuxDetSimChannels"; From d29a41cc34a266a23e4aee3ceaecc4bbf2c60c18 Mon Sep 17 00:00:00 2001 From: kjplows Date: Thu, 17 Apr 2025 10:21:44 -0500 Subject: [PATCH 2/3] fix the bool --- sbncode/LArG4/MergeSimSourcesSBN_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbncode/LArG4/MergeSimSourcesSBN_module.cc b/sbncode/LArG4/MergeSimSourcesSBN_module.cc index 79e3b75f7..19e1cbe1c 100644 --- a/sbncode/LArG4/MergeSimSourcesSBN_module.cc +++ b/sbncode/LArG4/MergeSimSourcesSBN_module.cc @@ -357,7 +357,7 @@ void sbn::MergeSimSourcesSBN::produce(art::Event& e) if (fFillSimChannels) { auto const& input_scCol = e.getProduct>(input_label); - MergeUtility.MergeSimChannels(*scCol, input_scCol, i_source, !fSkipSimChannelTrackIDs); + MergeUtility.MergeSimChannels(*scCol, input_scCol, i_source, fSkipSimChannelTrackIDs); } if (fFillAuxDetSimChannels) { From 59f21ed12df4db7f7fd2a5d66ec4f23ffd952cae Mon Sep 17 00:00:00 2001 From: kjplows Date: Fri, 18 Apr 2025 06:33:37 -0500 Subject: [PATCH 3/3] please let me run the CI --- ups/product_deps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ups/product_deps b/ups/product_deps index a2537dd84..7f73d7985 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -254,12 +254,12 @@ libdir fq_dir lib product version qual flags genie_xsec v3_04_00 - larcv2 v2_2_6 - -larsoft v10_04_08 - +larsoft v10_05_00 - sbnalg v10_04_08 - sbndaq_artdaq_core v1_10_06 - sbndata v01_07 - systematicstools v01_04_04 - -nusystematics v1_05_06 - +nusystematics v1_05_07 - cetmodules v3_24_01 - only_for_build end_product_list ####################################