Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions fcl/reco/Definitions/stage1_icarus_defs.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ BEGIN_PROLOG
icarus_stage1_producers:
{
### TPC hit-finder producers
gaushit1dTPCWW: @local::gausshit_sbn
gaushit1dTPCWE: @local::gausshit_sbn
gaushit1dTPCEW: @local::gausshit_sbn
gaushit1dTPCEE: @local::gausshit_sbn

gaushit2dTPCWW: @local::gausshit_sbn
gaushit2dTPCWE: @local::gausshit_sbn
gaushit2dTPCEW: @local::gausshit_sbn
gaushit2dTPCEE: @local::gausshit_sbn
gaushit1dTPCWW: @local::gaus_hitfinder_icarus
gaushit1dTPCWE: @local::gaus_hitfinder_icarus
gaushit1dTPCEW: @local::gaus_hitfinder_icarus
gaushit1dTPCEE: @local::gaus_hitfinder_icarus

gaushit2dTPCWW: @local::gaus_hitfinder_icarus
gaushit2dTPCWE: @local::gaus_hitfinder_icarus
gaushit2dTPCEW: @local::gaus_hitfinder_icarus
gaushit2dTPCEE: @local::gaus_hitfinder_icarus

### Cluster3D
cluster3DCryoW: @local::icarus_cluster3d
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// from larreco/RecoAlg:
#include "hitalgorithms.fcl"
#include "HitFinderTools_ICARUS.fcl"
#include "hitfindermodules.fcl"
#include "hitfindermodules_sbn.fcl"

BEGIN_PROLOG
Expand Down Expand Up @@ -60,18 +59,17 @@ icarus_hitmerger:
}

# Define icarus version of gaushit finder
gaus_hitfinder_icarus: @local::gaus_hitfinder
gaus_hitfinder_icarus: @local::gausshit_sbn

gaus_hitfinder_icarus.CalDataModuleLabel: "decon1droi"
gaus_hitfinder_icarus.AreaNorms: [ 1.0, 1.0, 1.0 ]
gaus_hitfinder_icarus.MaxMultiHit: 5
gaus_hitfinder_icarus.TryNplus1Fits: false
gaus_hitfinder_icarus.Chi2NDF: 500.
gaus_hitfinder_icarus.MaxMultiHit: [10, 10, 6]
gaus_hitfinder_icarus.Chi2NDF: [1967, 1200, 1350]
gaus_hitfinder_icarus.PeakFitter.MinWidth: 1
gaus_hitfinder_icarus.PeakFitter.FloatBaseline: false
gaus_hitfinder_icarus.PeakFitter.tool_type: "PeakFitterMrqdt"
gaus_hitfinder_icarus.LongMaxHits: [1, 1, 1]
gaus_hitfinder_icarus.LongPulseWidth: [10, 10, 10]
gaus_hitfinder_icarus.LongMaxHits: [5, 6, 5]
gaus_hitfinder_icarus.LongPulseWidth: [17, 13, 12]

# 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
Expand All @@ -93,28 +91,34 @@ gaus_hitfinder_icarus.LongPulseWidth:
# 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.RoiThreshold: 9.
gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 6.63
gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane0.NextADCThreshold: -0.03
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.RoiThreshold: 9.5
gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 5.74
gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane1.NextADCThreshold: -0.05
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.RoiThreshold: 9.
gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 6.16
gaus_hitfinder_icarus.HitFinderToolVec.CandidateHitsPlane2.NextADCThreshold: -0.23

# Now set parameters for the GaussHitFinderSBN
# Note these are "default" for ICARUS and will move to a fcl file in icaruscode
gausshit_sbn.PeakFitter.MinWidth: 1
gausshit_sbn.PeakFitter.FloatBaseline: false
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane0: @local::candhitfinder_standard
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane0.Plane: 0
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 9.
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane1: @local::candhitfinder_standard
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane1.Plane: 1
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 9.5
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane2: @local::candhitfinder_standard
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane2.Plane: 2
gausshit_sbn.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 9.
gausshit_sbn.LongMaxHits: [ 1, 1, 1] # disable pulse trains
# We do not modify the SBN version here (happening upstream)
# Downstram FHiCL only use gaus_hitfinder_icarus for the correct ICARUS version

# gausshit_sbn.PeakFitter.MinWidth: 1
# gausshit_sbn.PeakFitter.FloatBaseline: false
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane0: @local::candhitfinder_standard
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane0.Plane: 0
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 9.
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane1: @local::candhitfinder_standard
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane1.Plane: 1
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 9.5
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane2: @local::candhitfinder_standard
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane2.Plane: 2
# gausshit_sbn.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 9.
# gausshit_sbn.LongMaxHits: [ 1, 1, 1] # disable pulse trains

icarus_hitconverter:
{
Expand Down