Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e172c70
Updated producer, changed fcls
Oct 23, 2023
a2ea98b
Expand on fcl configurations
Oct 25, 2023
989202a
Move TTree behind a fcl parameter, start cleaning up comments
Oct 26, 2023
06b4598
Make cryo loop more generic, don't shift data times here, generally c…
Oct 26, 2023
003aea6
Fix typo
Oct 26, 2023
a64b8b7
Fix sbnobj naming convention
Oct 26, 2023
4c3cc12
Update fcls
Oct 27, 2023
97f63af
Replace getByLabel for trigger
JackSmedley Nov 17, 2023
2118571
Replace getByLabel for OpFlashes
JackSmedley Nov 17, 2023
f62e5f2
Replace getByLabel for slices
JackSmedley Nov 17, 2023
91cad5d
Don't copy trigger product
JackSmedley Nov 17, 2023
28167d1
Don't copy inputTag
JackSmedley Nov 17, 2023
091ec68
Get flashPtr from handle
JackSmedley Nov 17, 2023
9a4a951
Remove flashVector
JackSmedley Nov 17, 2023
6725702
Use unchecked access for opflash
JackSmedley Nov 17, 2023
2b199fb
Get slcPtr from handle
JackSmedley Nov 17, 2023
cc1eec1
Remove sliceVector
JackSmedley Nov 17, 2023
7c35319
Remove FindOneP include
JackSmedley Nov 17, 2023
04e37c5
Include suggested documentation
JackSmedley Nov 17, 2023
c381d04
Add several includes
JackSmedley Nov 17, 2023
5602894
Add consumes<> statements
JackSmedley Nov 17, 2023
4c3ef9e
Add spactime.h include for microseconds
JackSmedley Nov 17, 2023
acfbd1d
Remove extraneous class definition
JackSmedley Nov 17, 2023
06c6ed2
Remove extra lines in data fcl, pt.1
JackSmedley Nov 17, 2023
c6e4b22
Remove extra lines in data fcl, the sequel
JackSmedley Nov 17, 2023
d227951
Remove extra lines from MC fcl
JackSmedley Nov 17, 2023
7ace536
Add DeltaY and Radius for trigger match, flip NominalTrigTime to Trig…
Nov 17, 2023
d333143
Move TVector initializers
JackSmedley Nov 17, 2023
2206119
Initialize TVectors here, reference by dimension method rather than i…
JackSmedley Nov 17, 2023
308da0a
Merge remote-tracking branch 'jsmedley/feature/jsmedley_Barycenter_de…
Nov 17, 2023
d47b5ce
Adding some comments so Git sees the chnages on these lines, will del…
Nov 17, 2023
506c9fc
Clean up trigger flash determination
Nov 18, 2023
c78a226
Change name to be more descriptive
Nov 18, 2023
27abcb8
Update brief to accomodate sign change in fTriggerDelay
Nov 18, 2023
9926f06
Add producers to stage1, redefine label in cafmaker_defs
Nov 21, 2023
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
1 change: 1 addition & 0 deletions fcl/caf/cafmaker_defs.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ cafmaker.TriggerLabel: "emuTrigger"
cafmaker.FlashTrigLabel: "" # unavailable
cafmaker.SimChannelLabel: "largeant"
cafmaker.SystWeightLabels: ["genieweight", "fluxweight"]
cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatch"
cafmaker.TrackHitFillRREndCut: 30 # include entire PID region

# Add CAFMaker to the list of producers
Expand Down
9 changes: 9 additions & 0 deletions fcl/reco/Definitions/stage1_icarus_defs.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
## The below can be found from the softlink to Supera in sbncode
#include "supera_modules.fcl"
#include "crtpmtmatching_parameters.fcl"
#include "tpcpmtbarycentermatch_config.fcl"

BEGIN_PROLOG

Expand Down Expand Up @@ -65,6 +66,9 @@ icarus_stage1_producers:
CRTT0Matching: @local::standard_crtt0producer
CRTT0MatchingW: @local::standard_crtt0producerW
CRTT0MatchingE: @local::standard_crtt0producerE

tpcpmtbarycentermatchCryoE: @local::data_tpcpmtbarycentermatchproducer_east
tpcpmtbarycentermatchCryoW: @local::data_tpcpmtbarycentermatchproducer_west
}

icarus_stage1_filters:
Expand Down Expand Up @@ -191,6 +195,11 @@ icarus_pandora_Gauss: [
icarus_reco_fm: [ fmatchCryoE,
fmatchCryoW ]

icarus_tpcpmtbarycentermatch: [
tpcpmtbarycentermatchCryoE,
tpcpmtbarycentermatchCryoW
]

icarus_crttrack: [crttrack]

icarus_crtt0match: [CRTT0Matching]
Expand Down
1 change: 1 addition & 0 deletions fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ process_name: stage1
physics.reco: [ @sequence::icarus_filter_cluster3D,
@sequence::icarus_pandora_Gauss,
@sequence::icarus_reco_fm,
@sequence::icarus_tpcpmtbarycentermatch,
@sequence::icarus_crttrack,
@sequence::icarus_crtt0match,
caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]
Expand Down
5 changes: 5 additions & 0 deletions fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ physics.producers: {
mcassociationsGausCryoW: @local::standard_mcparticlehitmatching
}

#Redefine TPCPMTBarycenterMatch producers with MC parameters
physics.producers.tpcpmtbarycentermatchCryoE: @local::mc_tpcpmtbarycentermatchproducer_east
physics.producers.tpcpmtbarycentermatchCryoW: @local::mc_tpcpmtbarycentermatchproducer_west

physics.reco: [
@sequence::icarus_reco_Gauss_CryoE ,
@sequence::icarus_reco_Gauss_CryoW ,
@sequence::icarus_reco_fm,
@sequence::icarus_tpcpmtbarycentermatch,
caloskimCalorimetryCryoE, caloskimCalorimetryCryoW,
mcassociationsGausCryoE, mcassociationsGausCryoW
]
Expand Down
2 changes: 2 additions & 0 deletions icaruscode/PMT/OpReco/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cet_build_plugin(ICARUSOpHitFinder art::module


set( MODULE_LIBRARIES
icarusalg::Utilities
sbnobj::Common_Trigger
larcorealg::Geometry
larcore::Geometry_Geometry_service
Expand Down Expand Up @@ -59,6 +60,7 @@ cet_build_plugin(ICARUSOpFlashAna art::module LIBRARIES ${MODULE_LIBRARIES})
cet_build_plugin(ICARUSOpHitAna art::module LIBRARIES ${MODULE_LIBRARIES})
cet_build_plugin(ICARUSOpHitTuple art::module LIBRARIES ${MODULE_LIBRARIES})
cet_build_plugin(ICARUSParticleAna art::module LIBRARIES ${MODULE_LIBRARIES})
cet_build_plugin(TPCPMTBarycenterMatchProducer art::module LIBRARIES ${MODULE_LIBRARIES})


install_headers()
Expand Down
720 changes: 720 additions & 0 deletions icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer_module.cc

Large diffs are not rendered by default.

98 changes: 98 additions & 0 deletions icaruscode/PMT/OpReco/fcl/tpcpmtbarycentermatch_config.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
BEGIN_PROLOG

#Common paramters for the barycenter matching
tpcpmtbarycentermatch_common_params:
{
OpFlashLabel: "opflash"
PandoraLabel: "pandoraGaus"
CollectionOnly: true
UseTimeRange: true
Verbose: false
FillMatchTree: false
TriggerTolerance: 0.15
TimeRangeMargin: 35.
}


#Parameters specific to data and Monte Carlo separately
######

tpcpmtbarycentermatch_data_params:
{
TriggerLabel: "daqTrigger"
TriggerDelay: 0.6
}

tpcpmtbarycentermatch_mc_params:
{
TriggerLabel: "emuTrigger"
TriggerDelay: 0.02
}

######


#Separate configurations for data or MC for running the matching over BOTH cryostats
######

data_tpcpmtbarycentermatchproducer:
{
module_type: "icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer"
@table::tpcpmtbarycentermatch_common_params
@table::tpcpmtbarycentermatch_data_params
InputTags: ["CryoE","CryoW"]
}

mc_tpcpmtbarycentermatchproducer:
{
module_type: "icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer"
@table::tpcpmtbarycentermatch_common_params
@table::tpcpmtbarycentermatch_mc_params
InputTags: ["CryoE","CryoW"]
}

######

#Separate configurations for data or MC for running the matching over the east cryostat
######

data_tpcpmtbarycentermatchproducer_east:
{
module_type: "icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer"
@table::tpcpmtbarycentermatch_common_params
@table::tpcpmtbarycentermatch_data_params
InputTags: ["CryoE"]
}

mc_tpcpmtbarycentermatchproducer_east:
{
module_type: "icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer"
@table::tpcpmtbarycentermatch_common_params
@table::tpcpmtbarycentermatch_mc_params
InputTags: ["CryoE"]
}

######

#Separate configurations for data or MC for running the matching over the west cryostat
######

data_tpcpmtbarycentermatchproducer_west:
{
module_type: "icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer"
@table::tpcpmtbarycentermatch_common_params
@table::tpcpmtbarycentermatch_data_params
InputTags: ["CryoW"]
}

mc_tpcpmtbarycentermatchproducer_west:
{
module_type: "icaruscode/PMT/OpReco/TPCPMTBarycenterMatchProducer"
@table::tpcpmtbarycentermatch_common_params
@table::tpcpmtbarycentermatch_mc_params
InputTags: ["CryoW"]
}

######

END_PROLOG
59 changes: 59 additions & 0 deletions icaruscode/PMT/OpReco/fcl/tpcpmtbarycentermatch_data.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# A script to run the producer module: TPCPMTBarycenterMatchProducer

#include "tpcpmtbarycentermatch_config.fcl"

#include "services_icarus_simulation.fcl"
#include "services_common_icarus.fcl"

process_name: TPCPMTBarycenterMatchProducer

services:
{
# Load the service that manages root files for histograms.
TFileService: { fileName: "tpcpmtmatchingana.root" }
# This constrols the display in the output of how long each job step takes for each event.
TimeTracker: {}



# This parameter controls the level of descriptive output from various LArSoft modules.
message: @local::icarus_message_services_prod_debug
@table::icarus_common_services

} # services


outputs:
{
out1:
{
module_type: RootOutput
fileName: "%ifb_%tc_TPCPMTBarycenterMatch.root"
dataTier: "reconstructed"
saveMemoryObjectThreshold: 0
compressionLevel: 1
fastCloning: true
}
}

# The 'physics' section defines and configures some modules to do work on each event.
physics:
{
producers:
{
tpcpmtbarycentermatchCryoE: @local::data_tpcpmtbarycentermatchproducer_east
tpcpmtbarycentermatchCryoW: @local::data_tpcpmtbarycentermatchproducer_west
}

# Schedule job step(s) for execution by defining the analysis module for this job.
reco: [ tpcpmtbarycentermatchCryoE, tpcpmtbarycentermatchCryoW ]

stream1: [ out1 ]

trigger_paths: [reco]

# "end_paths" is a keyword and contains the modules that do not modify the art::Event;
# i.e., analyzers and output streams.
end_paths: [ stream1 ]

}
58 changes: 58 additions & 0 deletions icaruscode/PMT/OpReco/fcl/tpcpmtbarycentermatch_mc.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# A script to run the producer module: TPCPMTBarycenterMatchProducer

#include "tpcpmtbarycentermatch_config.fcl"

#include "services_icarus_simulation.fcl"
#include "services_common_icarus.fcl"

process_name: TPCPMTBarycenterMatchProducer

services:
{
# Load the service that manages root files for histograms.
TFileService: { fileName: "tpcpmtmatchingana.root" }
# This constrols the display in the output of how long each job step takes for each event.
TimeTracker: {}



# This parameter controls the level of descriptive output from various LArSoft modules.
message: @local::icarus_message_services_prod_debug
@table::icarus_common_services

} # services

outputs:
{
out1:
{
module_type: RootOutput
fileName: "%ifb_%tc_TPCPMTBarycenterMatch.root"
dataTier: "reconstructed"
saveMemoryObjectThreshold: 0
compressionLevel: 1
fastCloning: true
}
}

# The 'physics' section defines and configures some modules to do work on each event.
physics:
{
producers:
{
tpcpmtbarycentermatchCryoE: @local::mc_tpcpmtbarycentermatchproducer_east
tpcpmtbarycentermatchCryoW: @local::mc_tpcpmtbarycentermatchproducer_west
}

# Schedule job step(s) for execution by defining the analysis module for this job.
reco: [ tpcpmtbarycentermatchCryoE, tpcpmtbarycentermatchCryoW ]

stream1: [ out1 ]

trigger_paths: [reco]

# "end_paths" is a keyword and contains the modules that do not modify the art::Event;
# i.e., analyzers and output streams.
end_paths: [ stream1 ]

}