From 88bf44d4f7630fe4250841231c2fd74f8a53dafb Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Thu, 29 Oct 2026 09:03:59 -0500 Subject: [PATCH 1/3] Reintroduced old hit finder parameters for SPINE reconstruction --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 67 ++++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 404a9847a..e0b1a229b 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -373,14 +373,65 @@ icarus_stage1_producers.gaushit2dTPCEW.CalDataModuleLabel: icarus_stage1_producers.gaushit2dTPCEE.CalDataModuleLabel: "wire2channelroi2d:PHYSCRATEDATATPCEE" # Setup version of hit finder's with Pulse Trains ("PT"s) enabled -icarus_stage1_producers.gaushitPT2dTPCEE: @local::icarus_stage1_producers.gaushit2dTPCEE -icarus_stage1_producers.gaushitPT2dTPCEE.LongMaxHits: [10, 10, 10] -icarus_stage1_producers.gaushitPT2dTPCEW: @local::icarus_stage1_producers.gaushit2dTPCEW -icarus_stage1_producers.gaushitPT2dTPCEW.LongMaxHits: [10, 10, 10] -icarus_stage1_producers.gaushitPT2dTPCWE: @local::icarus_stage1_producers.gaushit2dTPCWE -icarus_stage1_producers.gaushitPT2dTPCWE.LongMaxHits: [10, 10, 10] -icarus_stage1_producers.gaushitPT2dTPCWW: @local::icarus_stage1_producers.gaushit2dTPCWW -icarus_stage1_producers.gaushitPT2dTPCWW.LongMaxHits: [10, 10, 10] + +# Using default values +spine_hit_candidate_tool_parameters: +{ + RoiThreshold: 5. + NextADCThreshold: 0. +} + +# Using default values +spine_gaushit_parameters: +{ + LongMaxHits: [10, 10, 10] + MaxMultiHit: 5 + Chi2NDF: 500. + LongPulseWidth: [10, 10, 10] + HitFinderToolVec: + { + CandidateHitsPlane0: + { + @table::spine_hit_candidate_tool_parameters + Plane: 0 + } + CandidateHitsPlane1: + { + @table::spine_hit_candidate_tool_parameters + Plane: 1 + } + CandidateHitsPlane2: + { + @table::spine_hit_candidate_tool_parameters + Plane: 2 + } + } +} + +icarus_stage1_producers.gaushitPT2dTPCEE: +{ + @table::icarus_stage1_producers.gaushit2dTPCEE + @table::spine_gaushit_parameters +} + +icarus_stage1_producers.gaushitPT2dTPCEW: +{ + @table::icarus_stage1_producers.gaushit2dTPCEW + @table::spine_gaushit_parameters +} + +icarus_stage1_producers.gaushitPT2dTPCWE: +{ + @table::icarus_stage1_producers.gaushit2dTPCWE + @table::spine_gaushit_parameters +} + +icarus_stage1_producers.gaushitPT2dTPCWW: +{ + @table::icarus_stage1_producers.gaushit2dTPCWW + @table::spine_gaushit_parameters +} + ## Overrides for filtering of cluster3D hits icarus_stage1_filters.TPCHitFilterCryoW.HitDataLabelVec: ["cluster3DCryoW"] From fbb7e624ca3ef813dfc3c605afc869f38bbad0ab Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Wed, 11 Nov 2026 04:32:26 -0600 Subject: [PATCH 2/3] Implementing SBN-DocDB-50214 --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 83 +++++++++++++++------ icaruscode/TPC/NuGraph/nugraph_icarus.fcl | 20 ++--- 2 files changed, 70 insertions(+), 33 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index e0b1a229b..9491d22cb 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -41,9 +41,54 @@ icarus_stage1_producers: gaushit2dTPCEW: @local::gaus_hitfinder_icarus gaushit2dTPCEE: @local::gaus_hitfinder_icarus - ### Cluster3D - cluster3DCryoW: @local::icarus_cluster3d - cluster3DCryoE: @local::icarus_cluster3d + ### Cluster3D / SPINE version (using gaushitPT2dTPC* input tags for the hits) + cluster3DCryoW: + { + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } + + cluster3DCryoE: + { + @local::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } + + ### Cluster3D / Pandora + NG2 + Pandora version (using gaushit2dTPC* input tags for the hits) + pandoraCluster3DCryoW: + { + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } + pandoraCluster3DCryoE: + { + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } ### Hit combiner combineHitsCryoE: @local::icarus_hitmerger_cryoE @@ -251,6 +296,8 @@ icarus_filter1D_cluster3D: [ @sequence::icarus_WestHits_TPC, cluster3DCryoE, cluster3DCryoW, + pandoraCluster3DCryoE, + pandoraCluster3DCryoW, TPCHitFilterCryoE, TPCHitFilterCryoW ] @@ -260,6 +307,8 @@ icarus_filter2D_cluster3D: [ @sequence::icarus_WestHits2d_TPC, cluster3DCryoE, cluster3DCryoW, + pandoraCluster3DCryoE, + pandoraCluster3DCryoW, TPCHitFilterCryoE, TPCHitFilterCryoW ] @@ -269,6 +318,10 @@ icarus_reco_cluster3DCryoW: [ cluster3DCryoW ] icarus_reco_cluster3DCryoE: [ cluster3DCryoE ] +icarus_reco_pandoraCluster3DCryoW: [ pandoraCluster3DCryoW ] + +icarus_reco_pandoraCluster3DCryoE: [ pandoraCluster3DCryoE ] + icarus_reco_pandoraGausCryoW: [ pandoraGausCryoW ] icarus_reco_pandoraGausCryoE: [ pandoraGausCryoE ] @@ -320,12 +373,14 @@ icarus_reco_Gauss1D_CryoE: [ icarus_reco_Gauss2D_CryoW: [ @sequence::icarus_WestHits2d_TPC, @sequence::icarus_reco_cluster3DCryoW, + @sequence::icarus_reco_pandoraCluster3DCryoW, @sequence::icarus_reco_pandoraGausCryoW ] icarus_reco_Gauss2D_CryoE: [ @sequence::icarus_EastHits2d_TPC, @sequence::icarus_reco_cluster3DCryoE, + @sequence::icarus_reco_pandoraCluster3DCryoE, @sequence::icarus_reco_pandoraGausCryoE ] @@ -440,27 +495,9 @@ icarus_stage1_filters.TPCHitFilterCryoW.MaximumHits: 60000 icarus_stage1_filters.TPCHitFilterCryoE.HitDataLabelVec: ["cluster3DCryoE"] icarus_stage1_filters.TPCHitFilterCryoE.MaximumHits: 60000 -## Definitions for running the 3D clustering by Cryostat -icarus_stage1_producers.cluster3DCryoW.MakeSpacePointsOnly: true -# use the "PT" (pulse train) hits as input to cluster3D -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] -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. -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.MaxMythicalChiSquare: 30. -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.OutputHistograms: false - -icarus_stage1_producers.cluster3DCryoE.MakeSpacePointsOnly: true -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] -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. -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.MaxMythicalChiSquare: 30. -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.OutputHistograms: false - ### Definitions for Pandora by cryostat -icarus_stage1_producers.pandoraGausCryoE.HitFinderModuleLabel: "cluster3DCryoE" -icarus_stage1_producers.pandoraGausCryoW.HitFinderModuleLabel: "cluster3DCryoW" +icarus_stage1_producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" +icarus_stage1_producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW" # icarus_stage1_producers.pandoraGausCryoW.HitCollectionTool.OverrhideHitLabels: ["gaushit2dTPCWW", "gaushit2dTPCWE"] # icarus_stage1_producers.pandoraGausCryoE.HitCollectionTool.OverrhideHitLabels: ["gaushit2dTPCEW", "gaushit2dTPCEE"] diff --git a/icaruscode/TPC/NuGraph/nugraph_icarus.fcl b/icaruscode/TPC/NuGraph/nugraph_icarus.fcl index d13d1d0a6..79d8484b8 100644 --- a/icaruscode/TPC/NuGraph/nugraph_icarus.fcl +++ b/icaruscode/TPC/NuGraph/nugraph_icarus.fcl @@ -6,26 +6,26 @@ nuslhitsCryoE: { module_type: "ICARUSNuSliceHitsProducer" BaryMatchLabel: "tpcpmtbarycentermatchCryoE" SliceLabel: "pandoraGausCryoE" - SpsLabel: "cluster3DCryoE" + SpsLabel: "pandoraCluster3DCryoE" } nuslhitsCryoW: { module_type: "ICARUSNuSliceHitsProducer" BaryMatchLabel: "tpcpmtbarycentermatchCryoW" SliceLabel: "pandoraGausCryoW" - SpsLabel: "cluster3DCryoW" + SpsLabel: "pandoraCluster3DCryoW" } NCCSlices: { module_type: "ICARUSNCCSlicesProducer" PandoraLabel: "pandoraGausCryoE" - ClusterLabel: "cluster3DCryoE" + ClusterLabel: "pandoraCluster3DCryoE" } NCCSlicesCryoE: @local::NCCSlices NCCSlicesCryoW: @local::NCCSlices NCCSlicesCryoW.PandoraLabel: "pandoraGausCryoW" -NCCSlicesCryoW.ClusterLabel: "cluster3DCryoW" +NCCSlicesCryoW.ClusterLabel: "pandoraCluster3DCryoW" NuGraphCryoE: @local::NuGraphLibTorch NuGraphCryoE.LoaderTool.tool_type: "ICARUSNuGraphLoader" @@ -56,18 +56,18 @@ NGMultiSliceCryoE.debug: false NGMultiSliceCryoE.LoaderTool.tool_type: "ICARUSNuGraphMultiLoader" NGMultiSliceCryoE.LoaderTool.PandoraLabel: "pandoraGausCryoE" NGMultiSliceCryoE.LoaderTool.SlicesLabel: "NCCSlicesCryoE" -NGMultiSliceCryoE.LoaderTool.ClusterLabel: "cluster3DCryoE" -NGMultiSliceCryoE.DecoderTools.FilterDecoderTool.hitInput: "cluster3DCryoE" -NGMultiSliceCryoE.DecoderTools.SemanticDecoderTool.hitInput: "cluster3DCryoE" +NGMultiSliceCryoE.LoaderTool.ClusterLabel: "pandoraCluster3DCryoE" +NGMultiSliceCryoE.DecoderTools.FilterDecoderTool.hitInput: "pandoraCluster3DCryoE" +NGMultiSliceCryoE.DecoderTools.SemanticDecoderTool.hitInput: "pandoraCluster3DCryoE" NGMultiSliceCryoW: @local::NGMultiSliceCryoE NGMultiSliceCryoW.SlicesLabel: "NCCSlicesCryoW" NGMultiSliceCryoW.HitLabel: "pandoraGausCryoW" NGMultiSliceCryoW.LoaderTool.PandoraLabel: "pandoraGausCryoW" NGMultiSliceCryoW.LoaderTool.SlicesLabel: "NCCSlicesCryoW" -NGMultiSliceCryoW.LoaderTool.ClusterLabel: "cluster3DCryoW" -NGMultiSliceCryoW.DecoderTools.FilterDecoderTool.hitInput: "cluster3DCryoW" -NGMultiSliceCryoW.DecoderTools.SemanticDecoderTool.hitInput: "cluster3DCryoW" +NGMultiSliceCryoW.LoaderTool.ClusterLabel: "pandoraCluster3DCryoW" +NGMultiSliceCryoW.DecoderTools.FilterDecoderTool.hitInput: "pandoraCluster3DCryoW" +NGMultiSliceCryoW.DecoderTools.SemanticDecoderTool.hitInput: "pandoraCluster3DCryoW" ngfilteredhitsCryoE: { module_type: "ICARUSFilteredNuSliceHitsProducer" From 915ff4444ae54585f0e790dd8adaaa123bc05f26 Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Thu, 12 Nov 2026 03:48:06 -0600 Subject: [PATCH 3/3] Ooops typo --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 75 +++++++++++++-------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 9491d22cb..a7be32735 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -45,49 +45,66 @@ icarus_stage1_producers: cluster3DCryoW: { @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } cluster3DCryoE: { - @local::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } ### Cluster3D / Pandora + NG2 + Pandora version (using gaushit2dTPC* input tags for the hits) pandoraCluster3DCryoW: { @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } + pandoraCluster3DCryoE: { @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } ### Hit combiner