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
7 changes: 6 additions & 1 deletion fcl/configurations/cluster_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,10 @@ icarus_cluster3d.ClusterPathAlg.ClusterAlg.MinPairPts: 1
icarus_cluster3d.ClusterPathAlg.ClusterAlg.kdTree.PairSigmaPeakTime: 3.0
icarus_cluster3d.ClusterPathAlg.ClusterAlg.kdTree.RefLeafBestDist: 0.75


icarus_cluster3d.MakeSpacePointsOnly: true
icarus_cluster3d.Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25
icarus_cluster3d.Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20.
icarus_cluster3d.Hit3DBuilderAlg.MaxHitChiSquare: 1000000.
icarus_cluster3d.Hit3DBuilderAlg.MaxMythicalChiSquare: 30.
icarus_cluster3d.Hit3DBuilderAlg.OutputHistograms: false
END_PROLOG
110 changes: 82 additions & 28 deletions fcl/reco/Definitions/stage1_icarus_defs.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,14 @@ icarus_stage1_producers:
gaushit2dTPCEW: @local::gaus_hitfinder_icarus
gaushit2dTPCEE: @local::gaus_hitfinder_icarus

### Cluster3D
### Cluster3D / SPINE version (using gaushitPT2dTPC* input tags for the hits)
cluster3DCryoW: @local::icarus_cluster3d
cluster3DCryoE: @local::icarus_cluster3d

### Cluster3D / Pandora + NG2 + Pandora version (using gaushit2dTPC* input tags for the hits)
pandoraCluster3DCryoW: @local::icarus_cluster3d
pandoraCluster3DCryoE: @local::icarus_cluster3d

### Hit combiner
combineHitsCryoE: @local::icarus_hitmerger_cryoE
combineHitsCryoW: @local::icarus_hitmerger_cryoW
Expand Down Expand Up @@ -251,6 +255,8 @@ icarus_filter1D_cluster3D: [
@sequence::icarus_WestHits_TPC,
cluster3DCryoE,
cluster3DCryoW,
pandoraCluster3DCryoE,
pandoraCluster3DCryoW,
TPCHitFilterCryoE,
TPCHitFilterCryoW
]
Expand All @@ -260,6 +266,8 @@ icarus_filter2D_cluster3D: [
@sequence::icarus_WestHits2d_TPC,
cluster3DCryoE,
cluster3DCryoW,
pandoraCluster3DCryoE,
pandoraCluster3DCryoW,
TPCHitFilterCryoE,
TPCHitFilterCryoW
]
Expand All @@ -269,6 +277,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 ]
Expand Down Expand Up @@ -320,12 +332,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
]

Expand Down Expand Up @@ -373,14 +387,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"]
Expand All @@ -389,27 +454,16 @@ 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
## Cluster3D changes
icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"]
icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"]

icarus_stage1_producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"]
icarus_stage1_producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"]

### 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"]

Expand Down
10 changes: 8 additions & 2 deletions fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D,
physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]

physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "cluster3DCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "cluster3DCryoW"
# Also 1D hits for pandoraCluster3D*
physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]

# Pandora w/ 1D signal processing is using cluster3D* modules
# (using updatold, not updated, cluster3D instance)
physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW"

physics.producers.CRTT0Tagging.HitLabel: ["cluster3DCryoE", "cluster3DCryoW"]

Expand Down
5 changes: 5 additions & 0 deletions fcl/reco/Stage1/data/stage1_run2_1d_icarus_NuGraphReco.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D,

physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]

physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]


4 changes: 4 additions & 0 deletions fcl/reco/Stage1/data/stage1_run2_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ outputs.out1.outputCommands: [
physics.analyzers.caloskimE.SelectEvents: [reco]
physics.analyzers.caloskimW.SelectEvents: [reco]

# Pandora only chain should be still using the combineHits* modules
physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "combineHitsCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "combineHitsCryoW"

# Disabled Space-Charge service for calorimetry
services.SpaceChargeService: {
EnableCalEfieldSCE: false
Expand Down
5 changes: 5 additions & 0 deletions fcl/reco/Stage1/data/stage1_run2_icarus_NuGraphReco.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ outputs.out1.outputCommands: [
"drop *_caloskimCalorimetryCryoW_*_*"
]

# Pandora + NG2 + Pandora is required to have cluster3D* modules
# (using updated, pandora-specific, cluster3D instance)
physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW"

# Redefine TPCPMTBarycenterMatch producers with the different Pandora label
physics.producers.tpcpmtbarycentermatchCryoE.PandoraLabel: "pandoraGausNuGraphReco"
physics.producers.tpcpmtbarycentermatchCryoW.PandoraLabel: "pandoraGausNuGraphReco"
Expand Down
9 changes: 9 additions & 0 deletions fcl/reco/Stage1/mc/stage1_run2_1d_icarus_MC.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@ physics.reco: [

physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]

# Also 1D hits for pandoraCluster3D*
physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]

# Pandora w/ 1D signal processing is using cluster3D* modules
# (using updatold, not updated, cluster3D instance)
physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW"
4 changes: 4 additions & 0 deletions fcl/reco/Stage1/mc/stage1_run2_1d_icarus_NuGraphReco_MC.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ physics.reco: [

physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]

# Also 1D hits for pandoraCluster3D*
physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"]
physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"]
4 changes: 4 additions & 0 deletions fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ outputs.out1.outputCommands: [
"drop *_caloskimCalorimetryCryoW_*_*"
]

# Pandora only chain should be still using the combineHits* modules
physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "combineHitsCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "combineHitsCryoW"

# Redefine TPCPMTBarycenterMatch producers with MC parameters
physics.producers.tpcpmtbarycentermatchCryoE: @local::mc_tpcpmtbarycentermatchproducer_east
physics.producers.tpcpmtbarycentermatchCryoW: @local::mc_tpcpmtbarycentermatchproducer_west
Expand Down
5 changes: 5 additions & 0 deletions fcl/reco/Stage1/mc/stage1_run2_icarus_NuGraphReco_MC.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ outputs.out1.outputCommands: [
"drop *_caloskimCalorimetryCryoW_*_*"
]

# Pandora + NG2 + Pandora is required to have cluster3D* modules
# (using updated, pandora-specific, cluster3D instance)
physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE"
physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW"

# Redefine TPCPMTBarycenterMatch producers with MC parameters and with the different Pandora label
# Also, relax a bit the allowed charge-to-light time overlap
physics.producers.tpcpmtbarycentermatchCryoE: @local::mc_tpcpmtbarycentermatchproducer_east
Expand Down
20 changes: 10 additions & 10 deletions icaruscode/TPC/NuGraph/nugraph_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
NGMultiSliceCryoW.LoaderTool.hitInput: "nuslhitsCryoW"
NGMultiSliceCryoW.LoaderTool.spsInput: "nuslhitsCryoW"

Expand Down