Skip to content

Commit b841d99

Browse files
nathanielerowenathanielerowe
authored
Merge pull request #875 from SBNSoftware/feature/lynnt_Fall25_pmtmetrics
MC PMT Software Trigger + Trigger Subdirectory Reorganization
2 parents 7028dbc + bc1008e commit b841d99

25 files changed

+1199
-22
lines changed

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ physics.producers.cafmaker.FlashMatchSCECryoSuffixes: [""]
155155
# Include 3D barycenter flahs matching
156156
physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching"
157157

158+
# Include MC version of PMT Software Trigger
159+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricmc"
160+
158161
# Overwrite weight_functions label:
159162
physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
160163
physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnblight.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "cafmakerjob_sbnd_data_base.fcl"
22

33
physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"
4+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnblight"

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnbzerobias.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "cafmakerjob_sbnd_data_base.fcl"
22

33
physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbzerobiasinfo"
4+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnbzero"

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_offbeamlight.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "cafmakerjob_sbnd_data_base.fcl"
22

33
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"
4+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricoffbeamlight"

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce_bnblight.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "cafmakerjob_sbnd_data_sce.fcl"
22

33
physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"
4+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnblight"

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce_bnbzerobias.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "cafmakerjob_sbnd_data_sce.fcl"
22

33
physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbzerobiasinfo"
4+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnbzero"

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce_offbeamlight.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include "cafmakerjob_sbnd_data_sce.fcl"
22

33
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"
4+
physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricoffbeamlight"

‎sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "crtsimmodules_sbnd.fcl"
3636
#include "opdetdigitizer_sbnd.fcl"
3737
#include "rootoutput_sbnd.fcl"
38+
#include "pmtmcmetricproducer.fcl"
3839

3940
process_name: DetSim
4041

@@ -62,14 +63,15 @@ physics:
6263

6364
producers:
6465
{
65-
rns: { module_type: "RandomNumberSaver" }
66-
simtpc2d: @local::sbnd_wcls_simsp_bothrois
67-
crtsim: @local::sbnd_crtsim
68-
opdaq: @local::sbnd_opdetdigitizer
66+
rns: { module_type: "RandomNumberSaver" }
67+
simtpc2d: @local::sbnd_wcls_simsp_bothrois
68+
crtsim: @local::sbnd_crtsim
69+
opdaq: @local::sbnd_opdetdigitizer
70+
pmtmetricmc: @local::sbnd_pmtmcmetricproducer
6971
}
7072

7173
#define the producer and filter modules for this path, order matters,
72-
simulate: [rns, simtpc2d, crtsim, opdaq]
74+
simulate: [rns, simtpc2d, crtsim, opdaq, pmtmetricmc]
7375

7476
#define the output stream, there could be more than one if using filters
7577
stream1: [ out1 ]

‎sbndcode/Trigger/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(
22
MODULE_LIBRARIES
33
sbndcode_OpDetSim
4-
larcorealg::Geometry
4+
larcorealg::Geometry
55
larcore::Geometry_Geometry_service
66
lardataobj::Simulation
77
lardata::Utilities
@@ -16,7 +16,7 @@ set(
1616
art::Framework_Services_Registry
1717
art_root_io::tfile_support
1818
art_root_io::TFileService_service
19-
artdaq_core::artdaq-core_Data
19+
artdaq_core::artdaq-core_Data
2020
artdaq_core::artdaq-core_Utilities
2121
sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays
2222
sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_Common
@@ -40,11 +40,10 @@ set(
4040

4141
add_subdirectory(CRT)
4242
add_subdirectory(PMT)
43+
add_subdirectory(PMTSoftware)
4344

4445
cet_build_plugin(ArtdaqFragmentProducer art::module SOURCE ArtdaqFragmentProducer_module.cc LIBRARIES ${MODULE_LIBRARIES})
4546
cet_build_plugin(MetricProducer art::module SOURCE MetricProducer_module.cc LIBRARIES ${MODULE_LIBRARIES})
46-
cet_build_plugin(MetricAnalyzer art::module SOURCE MetricAnalyzer_module.cc LIBRARIES ${MODULE_LIBRARIES})
47-
cet_build_plugin(MetricFilter art::module SOURCE MetricFilter_module.cc LIBRARIES ${MODULE_LIBRARIES})
4847

4948
install_headers()
5049
install_fhicl()

‎sbndcode/Trigger/PMT/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,4 @@ cet_build_plugin(pmtTriggerProducer art::module SOURCE pmtTriggerProducer_module
3939

4040
install_headers()
4141
install_fhicl()
42-
install_source()
43-
44-
42+
install_source()

0 commit comments

Comments
 (0)