From 3310128457a2970b321e19ef1323ceddb3d84f17 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Wed, 6 Mar 2024 09:41:43 -0800 Subject: [PATCH 1/9] Setting 2D decon hits as input to cluster3d (and tracking) --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 39b3cfe81..abbcecedf 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -225,7 +225,7 @@ icarus_stage1_filters.TPCHitFilterCryoE.MaximumHits: 60000 ## Definitions for running the 3D clustering by Cryostat icarus_stage1_producers.cluster3DCryoW.MakeSpacePointsOnly: true -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.MaxHitChiSquare: 1000000. @@ -233,7 +233,7 @@ icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.MaxMythicalChiSquare: icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.OutputHistograms: false icarus_stage1_producers.cluster3DCryoE.MakeSpacePointsOnly: true -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] +icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.MaxHitChiSquare: 1000000. From ae3f4f2fdabe5131c4fc52bfaccd6d982f2d5f94 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Wed, 6 Mar 2024 09:42:22 -0800 Subject: [PATCH 2/9] Explicitly make "standard" hit finding the default with correct parameters --- .../HitFinder/hitfindermodules_icarus.fcl | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/icaruscode/TPC/SignalProcessing/HitFinder/hitfindermodules_icarus.fcl b/icaruscode/TPC/SignalProcessing/HitFinder/hitfindermodules_icarus.fcl index 2e91357e1..722f6355c 100644 --- a/icaruscode/TPC/SignalProcessing/HitFinder/hitfindermodules_icarus.fcl +++ b/icaruscode/TPC/SignalProcessing/HitFinder/hitfindermodules_icarus.fcl @@ -71,21 +71,34 @@ gaus_hitfinder_icarus.PeakFitter.FloatBaseline: gaus_hitfinder_icarus.PeakFitter.tool_type: "PeakFitterMrqdt" gaus_hitfinder_icarus.LongMaxHits: [25, 25, 25] gaus_hitfinder_icarus.LongPulseWidth: [10, 10, 10] -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0: @local::candhitfinder_morphological + +# Keeping these here even though not used in case we want to know working values for testing +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0: @local::candhitfinder_morphological +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.Plane: 0 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.MinDeltaTicks: 4 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.MinDeltaPeaks: 2.5 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.DilationThreshold: 8 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1: @local::candhitfinder_morphological +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.Plane: 1 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.MinDeltaTicks: 4 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.MinDeltaPeaks: 2.5 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.DilationThreshold: 8 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2: @local::candhitfinder_morphological +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.Plane: 2 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.MinDeltaTicks: 4 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.MinDeltaPeaks: 2.5 +#gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.DilationThreshold: 8 + +# These are default settings for production running +gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0: @local::candhitfinder_standard # Sets hit finding for plane 0 gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.Plane: 0 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.MinDeltaTicks: 4 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.MinDeltaPeaks: 2.5 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.DilationThreshold: 8 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1: @local::candhitfinder_morphological +gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 9. +gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1: @local::candhitfinder_standard # Sets hit finding for plane 1 gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.Plane: 1 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.MinDeltaTicks: 4 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.MinDeltaPeaks: 2.5 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.DilationThreshold: 8 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2: @local::candhitfinder_morphological +gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 9.5 +gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2: @local::candhitfinder_standard # Sets hit finding for plane 2 gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.Plane: 2 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.MinDeltaTicks: 4 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.MinDeltaPeaks: 2.5 -gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.DilationThreshold: 8 +gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 9. # Define icarus version of test version gausshit finder From 10e31b1119e57963e3cf20e8322f17407d00f9e7 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Wed, 6 Mar 2024 09:42:41 -0800 Subject: [PATCH 3/9] Switching from Wire to ChannelROI objects --- .../Analysis/tools/HitEfficiencyAnalysis_tool.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/icaruscode/Analysis/tools/HitEfficiencyAnalysis_tool.cc b/icaruscode/Analysis/tools/HitEfficiencyAnalysis_tool.cc index 9590b50fc..b8b078392 100755 --- a/icaruscode/Analysis/tools/HitEfficiencyAnalysis_tool.cc +++ b/icaruscode/Analysis/tools/HitEfficiencyAnalysis_tool.cc @@ -13,9 +13,9 @@ #include "larcore/Geometry/Geometry.h" #include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom() -#include "lardataobj/RecoBase/Wire.h" #include "lardataobj/RecoBase/Hit.h" #include "lardataobj/Simulation/SimChannel.h" +#include "sbnobj/ICARUS/TPC/ChannelROI.h" #include "nusimdata/SimulationBase/MCParticle.h" #include "TH1.h" @@ -346,7 +346,7 @@ void HitEfficiencyAnalysis::fillHistograms(const art::Event& event) const // Loop over entries in the two producer vectors for(size_t tpcID = 0; tpcID < fWireProducerLabelVec.size(); tpcID++) { - art::Handle< std::vector > wireHandle; + art::Handle< std::vector > wireHandle; event.getByLabel(fWireProducerLabelVec[tpcID], wireHandle); art::Handle< std::vector > hitHandle; @@ -366,7 +366,7 @@ void HitEfficiencyAnalysis::fillHistograms(const art::Event& event) const // what needs to be done? // First we should build out a straightforward channel to Wire map so we can look up a given // channel's Wire data as we loop over SimChannels. - using ChanToWireMap = std::map; + using ChanToWireMap = std::map; ChanToWireMap channelToWireMap; @@ -458,8 +458,8 @@ void HitEfficiencyAnalysis::fillHistograms(const art::Event& event) const if (wireItr != channelToWireMap.end()) { - const recob::Wire::RegionsOfInterest_t& signalROI = wireItr->second->SignalROI(); - const lar::sparse_vector::datarange_t* wireRangePtr(NULL); + const recob::ChannelROI::RegionsOfInterest_t& signalROI = wireItr->second->SignalROI(); + const lar::sparse_vector::datarange_t* wireRangePtr(NULL); // Here we need to match the range of the ROI's on the given Wire with the tick range from the SimChannel for(const auto& range : signalROI.get_ranges()) @@ -469,7 +469,7 @@ void HitEfficiencyAnalysis::fillHistograms(const art::Event& event) const // ################################################# //std::vector signal(wire->Signal()); - const std::vector& signal = range.data(); + const std::vector& signal = range.data(); raw::TDCtick_t roiFirstBinTick = range.begin_index(); raw::TDCtick_t roiLastBinTick = roiFirstBinTick + signal.size(); From ee1f9f140bef926e7737c3318626c0af544f6ca3 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Fri, 8 Mar 2024 09:58:17 -0800 Subject: [PATCH 4/9] The default is to use the wirecell 2d deconvolution so these are redundant --- fcl/reco/Stage1/Run2/stage1_run2_wc_icarus.fcl | 6 ------ fcl/reco/Stage1/Run2/stage1_run2_wc_icarus_MC.fcl | 6 ------ fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus.fcl | 9 --------- fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus_MC.fcl | 6 ------ 4 files changed, 27 deletions(-) delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_wc_icarus.fcl delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_wc_icarus_MC.fcl delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus.fcl delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus_MC.fcl diff --git a/fcl/reco/Stage1/Run2/stage1_run2_wc_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_wc_icarus.fcl deleted file mode 100644 index 4847d2839..000000000 --- a/fcl/reco/Stage1/Run2/stage1_run2_wc_icarus.fcl +++ /dev/null @@ -1,6 +0,0 @@ -# Modify to use 2D deconvolution - -#include "stage1_run2_icarus.fcl" - -physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] -physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] diff --git a/fcl/reco/Stage1/Run2/stage1_run2_wc_icarus_MC.fcl b/fcl/reco/Stage1/Run2/stage1_run2_wc_icarus_MC.fcl deleted file mode 100644 index 132693f5f..000000000 --- a/fcl/reco/Stage1/Run2/stage1_run2_wc_icarus_MC.fcl +++ /dev/null @@ -1,6 +0,0 @@ -# This extends to the 2D deconvolution - -#include "stage1_run2_icarus_MC.fcl" - -physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] -physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] diff --git a/fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus.fcl deleted file mode 100644 index 2b051e44c..000000000 --- a/fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus.fcl +++ /dev/null @@ -1,9 +0,0 @@ -# Modify to use 2D deconvolution - -#include "stage1_run2_icarus.fcl" - -physics.outana: [ @sequence::icarus_analysis_larcv_modules ] -physics.end_paths: [ outana, stream1 ] - -physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] -physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] diff --git a/fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus_MC.fcl b/fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus_MC.fcl deleted file mode 100644 index 87cd13bd9..000000000 --- a/fcl/reco/Stage1/Run2/stage1_run2_wc_larcv_icarus_MC.fcl +++ /dev/null @@ -1,6 +0,0 @@ -# This runs larcv as part of stage 1 processing for MC - -#include "stage1_run2_wc_icarus_MC.fcl" - -physics.outana: [ @sequence::icarus_analysis_modules, @sequence::icarus_analysis_superaMC ] -physics.end_paths: [ outana, stream1 ] From df293e0eabea2c109a1ffe92b75c0ffebbcc4a4b Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Fri, 8 Mar 2024 09:58:57 -0800 Subject: [PATCH 5/9] Adding explicit "1d" files for stage 1 which use hits from the 1D deconvolution --- fcl/reco/Stage1/Run2/stage1_run2_1d_icarus.fcl | 5 +++++ fcl/reco/Stage1/Run2/stage1_run2_1d_icarus_MC.fcl | 5 +++++ fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus.fcl | 7 +++++++ fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus_MC.fcl | 6 ++++++ fcl/reco/Stage1/Run2/stage1_run2_larcv_icarus.fcl | 2 +- 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 fcl/reco/Stage1/Run2/stage1_run2_1d_icarus.fcl create mode 100644 fcl/reco/Stage1/Run2/stage1_run2_1d_icarus_MC.fcl create mode 100644 fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus.fcl create mode 100644 fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus_MC.fcl diff --git a/fcl/reco/Stage1/Run2/stage1_run2_1d_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_1d_icarus.fcl new file mode 100644 index 000000000..b20d3bb0d --- /dev/null +++ b/fcl/reco/Stage1/Run2/stage1_run2_1d_icarus.fcl @@ -0,0 +1,5 @@ +# +#include "stage1_run2_icarus.fcl" + +physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] diff --git a/fcl/reco/Stage1/Run2/stage1_run2_1d_icarus_MC.fcl b/fcl/reco/Stage1/Run2/stage1_run2_1d_icarus_MC.fcl new file mode 100644 index 000000000..fd6fceb83 --- /dev/null +++ b/fcl/reco/Stage1/Run2/stage1_run2_1d_icarus_MC.fcl @@ -0,0 +1,5 @@ + +#include "stage1_run2_icarus_MC.fcl" + +physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] diff --git a/fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus.fcl new file mode 100644 index 000000000..b69427108 --- /dev/null +++ b/fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus.fcl @@ -0,0 +1,7 @@ +# This includes running larcv as part of stage 1 processing + +#include "stage1_run2_1d_icarus.fcl" + +physics.outana: [ @sequence::icarus_analysis_larcv_modules ] +physics.end_paths: [ outana, stream1 ] + diff --git a/fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus_MC.fcl b/fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus_MC.fcl new file mode 100644 index 000000000..d7f7248ef --- /dev/null +++ b/fcl/reco/Stage1/Run2/stage1_run2_1d_larcv_icarus_MC.fcl @@ -0,0 +1,6 @@ +# This runs larcv as part of stage 1 processing for MC + +#include "stage1_run2_1d_icarus_MC.fcl" + +physics.outana: [ @sequence::icarus_analysis_modules, @sequence::icarus_analysis_superaMC] +physics.end_paths: [ outana, stream1 ] diff --git a/fcl/reco/Stage1/Run2/stage1_run2_larcv_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_larcv_icarus.fcl index 8278b6823..b7752ca87 100644 --- a/fcl/reco/Stage1/Run2/stage1_run2_larcv_icarus.fcl +++ b/fcl/reco/Stage1/Run2/stage1_run2_larcv_icarus.fcl @@ -1,6 +1,6 @@ # This includes running larcv as part of stage 1 processing -#include "stage1_icarus_driver_common.fcl" +#include "stage1_run2_icarus.fcl" physics.outana: [ @sequence::icarus_analysis_larcv_modules ] physics.end_paths: [ outana, stream1 ] From 3450ab983cb6c5ddcebd684f671d012e14e1c612 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Tue, 12 Mar 2024 08:40:06 -0700 Subject: [PATCH 6/9] Updating the drop/keep lists --- .../Stage0/Run2/stage0_run2_icarus_mc.fcl | 7 ++++++- .../Stage0/Run2/stage0_run2_wc_icarus_mc.fcl | 21 +++++++------------ .../Run2/stage0_run2_wc_raw_icarus_mc.fcl | 4 ++-- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/fcl/reco/Stage0/Run2/stage0_run2_icarus_mc.fcl b/fcl/reco/Stage0/Run2/stage0_run2_icarus_mc.fcl index 7e11750bc..930ca4a7b 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_icarus_mc.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_icarus_mc.fcl @@ -27,7 +27,12 @@ physics.end_paths: [ outana, streamROOT ] # Drop data products that are no longer needed, but make sure to keep important items! # For example, we need to drop the RawDigits from the detector simulation stage but want to keep the SimChannel info from WireCell... -outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_daq*_*_*", "drop *_MCDecodeTPCROI_*_*", "drop *_decon1droi_*_*", "drop recob::Wire*_roifinder_*_*", "keep *_daq_simpleSC_*"] +outputs.rootOutput.outputCommands: ["keep *_*_*_*", + "drop *_daq*_*_*", + "drop *_MCDecodeTPCROI_*_*", + "drop *_decon1droi_*_*", + "drop recob::Wire*_roifinder_*_*", + "keep *_daq_simpleSC_*"] # Set the expected input for ophit physics.producers.ophit.InputModule: "opdaq" diff --git a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl index 03f173b4e..ecd1b6922 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl @@ -25,20 +25,6 @@ physics.trigger_paths: [ path ] physics.end_paths: [ outana, streamROOT ] # Drop the artdaq format files on output -outputs.rootOutput.outputCommands: ["keep *_*_*_*", - "drop *_daq_*_*", - "drop *_MCDecodeTPCROI_*_*", - "drop *_decon1droi_*_*", - "drop *_decon2Droi*_*_*", - "drop recob::Wire*_roifinder*_*_*", - "keep *_daq_simpleSC_*" ] - -# Drop the daq format files on output, -# Drop all output from the TPC decoder stage -# Drop all output from the 1D deconvolution stage -# Drop all ouptut for the first running of the ROI finder (on the 1Dsingularity shell --nv -B /cvmfs,/media/usher/analysis/LArSoft/ICARUS slf7-essentials_latest.sif decon) -# Drop all output from the 2D deconvolution stage -# Drop the recob::Wire output from the roifinder2d (but keep the ChannelROIs) outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_daq_*_*", "drop *_MCDecodeTPCROI_*_*", @@ -46,6 +32,13 @@ outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_decon2droi*_*_*", "drop recob::Wire*_roifinder*_*_*" ] +outputs.rootOutput.outputCommands: ["keep *_*_*_*", + "drop *_daq*_*_*", + "drop *_MCDecodeTPCROI_*_*", + "drop *_decon1droi_*_*", + "drop *_decon2droi*_*_*", + "drop recob::Wire*_roifinder*_*_*", + "keep *_daq_simpleSC*_*"] # Set the expected input for ophit physics.producers.ophit.InputModule: "opdaq" diff --git a/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl b/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl index 66894d9ab..a9a2672fe 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl @@ -10,12 +10,12 @@ # Drop all output from the 2D deconvolution stage # Drop the recob::Wire output from the roifinder2d (but keep the ChannelROIs) outputs.rootOutput.outputCommands: ["keep *_*_*_*", - #"drop *_daq_*_*", # Temporarily remove + "drop *_daq_*_*", "drop *_MCDecodeTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon2droi*_*_*", "drop recob::Wire*_roifinder*_*_*", "keep raw::RawDigit*_MCDecodeTPCROI_*_*" - #"keep *_daq_simpleSC*_*" # Temporarily remove + "keep *_daq_simpleSC*_*" ] From 203dd5430ebb0fa6d064a1c77aef9afe1dea266b Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Tue, 12 Mar 2024 14:27:25 -0700 Subject: [PATCH 7/9] Updating wirecell configuration to match Gray Putnam's PR #695 (with also a couple of updates from PR #672 for consistency) --- fcl/reco/Stage0/Run2/stage0_run2_wc_icarus.fcl | 8 ++++---- fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl | 8 ++++---- .../detsimmodules_wirecell_ICARUS.fcl | 13 +++++++++---- .../TPC/ICARUSWireCell/wcls-decode-to-sig-base.fcl | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus.fcl b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus.fcl index 873b8ae6f..9bddf4016 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus.fcl @@ -37,10 +37,10 @@ physics.analyzers.purityinfoana0.SelectEvents: [ path ] physics.analyzers.purityinfoana1.SelectEvents: [ path ] # Add below as per Gray Putnam (should we move to jsonnet files?) -physics.producers.decon2droiEE.wcls_main.structs.gain0: 10.2636323 -physics.producers.decon2droiEW.wcls_main.structs.gain0: 10.2636323 -physics.producers.decon2droiWE.wcls_main.structs.gain0: 10.2636323 -physics.producers.decon2droiWW.wcls_main.structs.gain0: 10.2636323 +physics.producers.decon2droiEE.wcls_main.structs.gain0: 17.05212 +physics.producers.decon2droiEW.wcls_main.structs.gain0: 17.05212 +physics.producers.decon2droiWE.wcls_main.structs.gain0: 17.05212 +physics.producers.decon2droiWW.wcls_main.structs.gain0: 17.05212 physics.producers.decon2droiEE.wcls_main.structs.gain1: 12.1420344 diff --git a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl index ecd1b6922..e36a752f6 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl @@ -55,10 +55,10 @@ physics.producers.decon2droiWE.wcls_main.params.raw_input_label: "MCDecodeTPCRO physics.producers.decon2droiWW.wcls_main.params.raw_input_label: "MCDecodeTPCROI:PHYSCRATEDATATPCWW" # As per Gray Putname... -physics.producers.decon2droiEE.wcls_main.structs.gain0: 10.2636323 -physics.producers.decon2droiEW.wcls_main.structs.gain0: 10.2636323 -physics.producers.decon2droiWE.wcls_main.structs.gain0: 10.2636323 -physics.producers.decon2droiWW.wcls_main.structs.gain0: 10.2636323 +physics.producers.decon2droiEE.wcls_main.structs.gain0: 17.05212 +physics.producers.decon2droiEW.wcls_main.structs.gain0: 17.05212 +physics.producers.decon2droiWE.wcls_main.structs.gain0: 17.05212 +physics.producers.decon2droiWW.wcls_main.structs.gain0: 17.05212 physics.producers.decon2droiEE.wcls_main.structs.gain1: 12.1420344 diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl index 64734aa13..632d7ca9a 100644 --- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl +++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl @@ -34,7 +34,9 @@ icarus_simwire_wirecell: ] // Make available parameters via Jsonnet's std.extVar() params: { - files_fields: "garfield-icarus-fnal-rev2.json.bz2" + // Changing this to match Gray's latest data drive field responses + //files_fields: "garfield-icarus-fnal-rev2.json.bz2" + files_fields: "icarus_fnal_fit_ks_P0nom.json.bz2" file_rcresp: "" # use the RCResponse by default } structs: { @@ -53,9 +55,12 @@ icarus_simwire_wirecell: coh_noise_scale: 1.0 # Gain and shaping time - gain0: 14.9654 # mV/fC - gain1: 14.9654 # mV/fC - gain2: 14.9654 # mV/fC + //gain0: 14.9654 # mV/fC + //gain1: 14.9654 # mV/fC + //gain2: 14.9654 # mV/fC + gain0: 17.05212 # mV/fC + gain1: 12.6181926 # mV/fC + gain2: 13.0261362 # mV/fC shaping0: 1.3 # us shaping1: 1.3 # us diff --git a/icaruscode/TPC/ICARUSWireCell/wcls-decode-to-sig-base.fcl b/icaruscode/TPC/ICARUSWireCell/wcls-decode-to-sig-base.fcl index e3c748496..0c8cfaa85 100644 --- a/icaruscode/TPC/ICARUSWireCell/wcls-decode-to-sig-base.fcl +++ b/icaruscode/TPC/ICARUSWireCell/wcls-decode-to-sig-base.fcl @@ -42,7 +42,7 @@ standard_wirecell_sigproc: // Set "data" vs. "sim". The epoch below probably should follow suit. reality: "data" // reality: "sim" - files_fields: "icarus_fnal_fit_ks.json.bz2" + files_fields: "icarus_fnal_fit_ks_P0nom.json.bz2" // if epoch is "dynamic" you MUST add // "wclsMultiChannelNoiseDB" to "inputers" and must NOT // add it if not "dynamic" From f365c59e990cb8a5a729718945fd8c823949c6b5 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Tue, 12 Mar 2024 14:47:33 -0700 Subject: [PATCH 8/9] Hopefully making the field response file change in all the necessary places. --- icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl | 2 +- icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl index 632d7ca9a..648d6bb99 100644 --- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl +++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl @@ -79,7 +79,7 @@ icarus_simwire_wirecell_fitSR: @local::icarus_simwire_wirecell # Add in the ER tail icarus_simwire_wirecell_fitSR.wcls_main.params.file_rcresp: "icarus_fnal_rc_tail.json" # Add in the tuned field responses -icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks.json.bz2" +icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks_P0nom.json.bz2" # futz with shaping+gain values (note these are really just scale factors and should not be taken literally) icarus_simwire_wirecell_fitSR.wcls_main.structs.gain0: 11.9918701 # mV/fC icarus_simwire_wirecell_fitSR.wcls_main.structs.gain1: 12.6181926 # mV/fC diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet index 10f4eac58..36ac67410 100644 --- a/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet +++ b/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet @@ -128,7 +128,7 @@ base { files: { wires: "icarus-wires-dualanode-v5.json.bz2", - fields: ["garfield-icarus-fnal-rev2.json.bz2"], + fields: ["icarus_fnal_fit_ks_P0nom.json.bz2"], // noise: ["icarus_noise_model_int_TPCEE.json.bz2","icarus_noise_model_int_TPCEW.json.bz2","icarus_noise_model_int_TPCWE.json.bz2","icarus_noise_model_int_TPCWW.json.bz2"], // coherent_noise: ["icarus_noise_model_coh_TPCEE.json.bz2","icarus_noise_model_coh_TPCEW.json.bz2","icarus_noise_model_coh_TPCWE.json.bz2","icarus_noise_model_coh_TPCWW.json.bz2"], From 7b51107e1c0d56d17fb13a34bbe31a4c7601f6c7 Mon Sep 17 00:00:00 2001 From: Tracy Usher Date: Tue, 12 Mar 2024 18:42:47 -0700 Subject: [PATCH 9/9] Fixing a couple of errors caught by the build system --- fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl | 7 ------- fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl index e36a752f6..b2c09a140 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_wc_icarus_mc.fcl @@ -25,13 +25,6 @@ physics.trigger_paths: [ path ] physics.end_paths: [ outana, streamROOT ] # Drop the artdaq format files on output -outputs.rootOutput.outputCommands: ["keep *_*_*_*", - "drop *_daq_*_*", - "drop *_MCDecodeTPCROI_*_*", - "drop *_decon1droi_*_*", - "drop *_decon2droi*_*_*", - "drop recob::Wire*_roifinder*_*_*" - ] outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_daq*_*_*", "drop *_MCDecodeTPCROI_*_*", diff --git a/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl b/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl index a9a2672fe..9531539d2 100644 --- a/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl +++ b/fcl/reco/Stage0/Run2/stage0_run2_wc_raw_icarus_mc.fcl @@ -15,7 +15,7 @@ outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_decon1droi_*_*", "drop *_decon2droi*_*_*", "drop recob::Wire*_roifinder*_*_*", - "keep raw::RawDigit*_MCDecodeTPCROI_*_*" + "keep raw::RawDigit*_MCDecodeTPCROI_*_*", "keep *_daq_simpleSC*_*" ]