Skip to content

Commit 8d2c31c

Browse files
bear-is-asleepbear-is-asleep
authored
Merge branch 'develop' into feature/twester_prod_fcls
2 parents 8a7fd3c + d104bcc commit 8d2c31c

17 files changed

Lines changed: 405 additions & 53 deletions

‎sbndcode/Commissioning/HitDumper_module.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,9 +584,11 @@ void Hitdumper::analyze(const art::Event& evt)
584584
art::fill_ptr_vector(crtStripHitVector, crtStripHitHandle);
585585
_n_crt_strip_hits = crtStripHitVector.size();
586586
}
587-
else
587+
else {
588588
std::cout << "Failed to get sbnd::crt::CRTStripHit data product ("<<fCRTStripHitModuleLabel<<")." << std::endl;
589-
589+
_n_crt_strip_hits = 0;
590+
}
591+
590592
if (_n_crt_strip_hits > _max_crt_strip_hits) _n_crt_strip_hits = _max_crt_strip_hits;
591593

592594
ResetCRTStripHitVars();

sbndcode/Commissioning/fcls/reco2_sce_comm.fcl renamed to sbndcode/Commissioning/fcls/reco2_comm.fcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "reco2_sce.fcl"
1+
#include "standard_reco2_sbnd.fcl"
22

33
process_name: Reco2Comm
44

@@ -9,4 +9,4 @@ outputs.out1.outputCommands: [ "keep *_*_*_*"
99
# , "drop sim::OpDetBacktrackerRecords_*_*_*"
1010
, "drop *_linecluster_*_*"
1111
# , "drop *_fasthit_*_*"
12-
]
12+
]

‎sbndcode/Decoders/TPC/SBNDTPCDecoderDefaults.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SBNDTPCDecoderDefaults: {
44
module_type: SBNDTPCDecoder
55
produce_header: true
66
baseline_calc: true
7-
timesize: 2559 // for computing timestamps
7+
timesize: 1143 // for computing timestamps
88
frame_to_dt: 0.5 // produce timestamps in units of microseconds
99
min_slot_no: 3 // channel mapping -- 16 slots don't start at 1 but this number
1010
channel_per_slot: 64

‎sbndcode/JobConfigurations/README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# SBND Core FHiCL Files
22

3+
4th October 2024 (Dom Brailsford)
4+
`standard_reco2_sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow. SCE services are enabled by default
35
15th July 2024 (Dom Brailsford)
46
`standard_reco1_sbnd.fcl` has been promoted back to an up-to-date fcl so can be used as part of any standard workflow. The below suggested workflows have been updated to include this information.
57

8+
69
The intended operation of the fcl workflows is that the `standard-*` fcls run the standard workflow. This isn't currently true and should be acknowledged here. The WireCell 2D TPC simulation/signal processing workflow has now been implemented into the `standard-*` fcls, and the 1D simulation is now deprecated. The main deviation of the *core* workflow (described below) from the `standard-*` fcls is the inclusion of the space charge simulation. The *core* workflow also includes the dropping of some heavy data products (hence the `lite` suffix).
710

811
At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the following:
@@ -11,23 +14,23 @@ At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the foll
1114
- `g4_sce_dirt_filter_lite.fcl` (does not include TPC electron drift simulation)
1215
- `detsim_sce_lite.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
1316
- `standard_reco1_sbnd.fcl`
14-
- `reco2_sce.fcl`
17+
- `standard_reco2_sbnd.fcl`
1518

1619
The intime workflow is as follows:
1720

1821
- `prodcorsika_proton_intime_filter_sce.fcl`
1922
- `g4_sce_simphotontime_filter_lite.fcl`
2023
- `detsim_sce_lite.fcl`
2124
- `standard_reco1_sbnd.fcl`
22-
- `reco2_sce.fcl`
25+
- `standard_reco2_sbnd.fcl`
2326

2427
For single generator workflows (like intrinsic neutrino samples) the workflow is the following:
2528

2629
- `<your-gen>.fcl`
2730
- `g4_sce_lite.fcl`
2831
- `detsim_sce_lite.fcl`
2932
- `standard_reco1_sbnd.fcl`
30-
- `reco2_sce.fcl`
33+
- `standard_reco2_sbnd.fcl`
3134

3235
This may well change over the coming months, and this README should be updated to reflect this.
3336

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

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
#include "CAFMaker.fcl"
2+
3+
#include "services_sbnd.fcl"
4+
#include "geometry_sbnd.fcl"
5+
#include "simulationservices_sbnd.fcl"
6+
7+
#include "larproperties.fcl"
8+
#include "backtrackerservice.fcl"
9+
#include "detectorproperties_sbnd.fcl"
10+
#include "particleinventoryservice.fcl"
11+
#include "photonbacktrackerservice.fcl"
12+
#include "mccheatermodules.fcl"
13+
14+
#include "calorimetry_sbnd.fcl"
15+
16+
# WARNING: CNN module only built for e26 compiler
17+
#include "sbn_cnnid.fcl"
18+
19+
#include "trackscatterclosestapproach.fcl"
20+
#include "trackstoppingchi2fitter.fcl"
21+
#include "showerselectionvarsproducer.fcl"
22+
#include "showercosmicdistanceproducer.fcl"
23+
#include "sbn_pid.fcl"
24+
#include "sbn_crumbs_producer.fcl"
25+
26+
#include "pmtflashtrigger_producer.fcl"
27+
28+
#include "flashmatch_sbnd.fcl"
29+
#include "sbn_stub.fcl"
30+
31+
#include "cafmaker_common_defs.fcl"
32+
33+
#include "eventweight_genie_systtools.fcl"
34+
35+
process_name: CAFmaker
36+
37+
services:
38+
{
39+
# Load the service that manages root files for histograms.
40+
# scheduler: {wantTracer : false wantSummary : false}
41+
TimeTracker: {}
42+
RandomNumberGenerator: {} #ART native random number generator
43+
TFileService: { fileName: "%ifb_fullchain_production_hist_prod5.root" closeFileFast: false }
44+
# scheduler: { wantTracer: false wantSummary: true }
45+
message: { destinations: { debugmsg:{type: "cout" threshold: "INFO"} } }
46+
TimeTracker: { printSummary: true }
47+
# # @table::standard_services
48+
49+
AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
50+
ExptGeoHelperInterface: @local::sbnd_geometry_helper
51+
GeometryConfigurationWriter: {}
52+
Geometry: @local::sbnd_geo
53+
AuxDetGeometry: @local::sbnd_auxdetgeo
54+
LArPropertiesService: @local::standard_properties
55+
DetectorClocksService: @local::sbnd_services.DetectorClocksService
56+
DetectorPropertiesService: @local::sbnd_detproperties
57+
ChannelStatusService: @local::sbnd_channelstatus
58+
SpaceCharge: @local::sbnd_spacecharge
59+
NuRandomService: {
60+
policy: perEvent
61+
}
62+
}
63+
64+
# services.IFBeam: {}
65+
# services.BackTracker: @local::standard_backtracker
66+
67+
# Define and configure some modules to do work on each event.
68+
# First modules are defined; they are scheduled later.
69+
# Modules are grouped by type.
70+
physics:
71+
{
72+
producers:{
73+
# dq: @local::standard_daqheadersummary #dq
74+
# exposure: @local::standard_cosmicexposureinfo #calib
75+
# ifdbspillinfo: @local::standard_ifdbspillinfo #beam
76+
# calhit: @local::standard_calhit #calib
77+
# slicer: @local::standard_slicer4d #reco
78+
# slicertd: @local::standard_td #reco
79+
# slicer: @local::standard_slicemergeviews
80+
# cosmictrack: @local::standard_cosmictrack #reco
81+
# windowtrack: @local::window_cosmictrack #reco
82+
83+
# Includes: pandoraTrackMCS, pandoraTrackRange, rns, fluxweight
84+
@table::cafmaker_common_producers
85+
86+
flashtrig: @local::pmtflashtrigmaker_sbnd
87+
88+
vertexCharge: @local::vertex_charge_sbnd
89+
vertexStub: @local::vertex_stub_sbnd
90+
crumbs: @local::crumbs_sbnd
91+
92+
cnnid: @local::cnnid_sbnd
93+
94+
pandoraTrackClosestApproach: @local::trackscatterclosestapproach_sbn
95+
pandoraTrackStoppingChi2: @local::trackstoppingchi2fitter_sbn
96+
pandoraTrackDazzle: @local::dazzle_sbnd
97+
98+
pandoraShowerSelectionVars: @local::showerSelectionVars_sbn
99+
pandoraShowerCosmicDist: @local::showerCosmicDist_sbn
100+
pandoraShowerRazzle: @local::razzle_sbnd
101+
102+
pandoraRazzled: @local::razzled_sbnd
103+
104+
systtools: @local::sbn_systtools
105+
}
106+
filters:{
107+
flashtrigfilter: @local::pmtflashtrigfilter_sbnd
108+
}
109+
analyzers:
110+
{
111+
# metadata: @local::standard_metadata #prod
112+
}
113+
runprod: [ pandoraTrackMCS, pandoraTrackRange, pandoraShowerSelectionVars,
114+
vertexCharge, vertexStub,
115+
pandoraTrackClosestApproach, pandoraTrackStoppingChi2,
116+
pandoraShowerCosmicDist, cnnid,
117+
cafmaker ]
118+
# makecaf: [cafmaker] #list the modules for this path, order matters, filters reject all following items
119+
# stream1: [metadata]
120+
stream1: [ ]
121+
trigger_paths: [ runprod ]
122+
end_paths: [ stream1 ]
123+
}
124+
125+
# change tools in sbn to have 2D TPC sim/sp input
126+
physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:gauss"
127+
physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:gauss"
128+
129+
physics.producers.cnnid.WireLabel: "sptpc2d:gauss"
130+
131+
### Calorimetry for data
132+
physics.producers.cnnid.PointIdAlg.CalorimetryAlg: @local::sbnd_calorimetryalgdata
133+
physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgdata
134+
physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgdata
135+
136+
physics.producers.crumbs.CalorimetryModuleLabel: "pandoraCaloData"
137+
physics.producers.crumbs.Chi2FitParams.CaloLabel: "pandoraCaloData"
138+
139+
physics.producers.pandoraRazzled.CaloLabel: "pandoraCaloData"
140+
physics.producers.pandoraRazzled.Chi2Label: "pandoraPidData"
141+
physics.producers.pandoraTrackDazzle.CaloLabel: "pandoraCaloData"
142+
physics.producers.pandoraTrackDazzle.Chi2Label: "pandoraPidData"
143+
144+
physics.producers.pandoraTrackStoppingChi2.CaloLabel: "pandoraCaloData"
145+
146+
physics.producers.cafmaker: @local::standard_cafmaker
147+
physics.producers.cafmaker.CosmicGenLabel: "corsika"
148+
physics.producers.cafmaker.TrackHitFillRRStartCut: 1000
149+
physics.producers.cafmaker.TrackHitFillRREndCut: 1000
150+
physics.producers.cafmaker.TrackCaloLabel: "pandoraCaloData"
151+
physics.producers.cafmaker.TrackChi2PidLabel: "pandoraPidData"
152+
153+
# Blinding not needed for MC
154+
physics.producers.cafmaker.CreateBlindedCAF: false
155+
156+
# Save GENIE event record for MC
157+
# Turn this to false for data CAFMaker
158+
# More details can be found in here: https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=36869
159+
physics.producers.cafmaker.SaveGENIEEventRecord: false #comment to get CI to run on v09_90_00. This should be uncommented in v09_91_01 and later.
160+
161+
# Include Simple/OpFlashes for PMT/XARAPUCA
162+
physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]
163+
physics.producers.cafmaker.FlashMatchSCECryoSuffixes: [""]
164+
165+
# Overwrite weight_functions label:
166+
#physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
167+
168+
# input art file.
169+
physics.producers.cafmaker.SystWeightLabels: []
170+

‎sbndcode/JobConfigurations/standard/reco/config/drops_reco1.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
BEGIN_PROLOG
66

77
sbnd_reco1_ml_drops: [
8-
"drop *_cluster3d_*_*" #drop all mlreco output
8+
# "drop *_cluster3d_*_*" #drop all mlreco output
99
, "drop *_sedlite_*_*" #drop all mlreco output
10-
# , "drop *_simplemerge_*_*" #drop all mlreco output
10+
, "drop *_simplemerge_*_*" #drop all mlreco output
1111
]
1212
sbnd_reco1_drops: [
1313
@sequence::detsim_drops

‎sbndcode/JobConfigurations/standard/reco/config/drops_reco2.fcl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#outputs configuration
2+
#
3+
#include "drops_reco1.fcl"
4+
5+
BEGIN_PROLOG
6+
7+
sbnd_reco2_drops: [
8+
@sequence::sbnd_reco1_drops
9+
]
10+
11+
END_PROLOG

0 commit comments

Comments
 (0)