Skip to content

Commit 9e5ee45

Browse files
author
Brinden Carlson
committed
Update to using cluster3dsbn which runs only spacepoint producer and reduces verbosity
2 parents 0d2eccb + fa964dc commit 9e5ee45

41 files changed

Lines changed: 102 additions & 210 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

18-
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.82.02.01)
18+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.84.00.01)
1919
find_package(cetmodules REQUIRED)
2020
project(sbndcode LANGUAGES CXX)
2121

2222
# for CI:
23-
# project(sbndcode VERSION 09.82.02.01)
23+
# project(sbndcode VERSION 09.84.00.01)
2424

2525
message(STATUS "\n")
2626
message(STATUS "================================= ${PROJECT_NAME} =================================")

sbndcode/JobConfigurations/README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,24 @@ At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the foll
66

77
- `prodoverlay_corsika_cosmics_proton_genie_rockbox_sce.fcl`
88
- `g4_sce_dirt_filter_lite.fcl` (does not include TPC electron drift simulation)
9-
- `detsim_sce_overlay_lite.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
9+
- `detsim_sce_lite.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
1010
- `reco1_sce_lite.fcl`
1111
- `reco2_sce.fcl`
1212

13-
For single generator workflows (like intrinsic neutrino samples) the workflow is the follow:
13+
The intime workflow is as follows:
14+
15+
- `prodcorsika_proton_intime_filter_sce.fcl`
16+
- `g4_sce_simphotontime_filter_lite.fcl`
17+
- `detsim_sce_lite.fcl`
18+
- `reco1_sce_lite.fcl`
19+
- `reco2_sce.fcl`
20+
21+
For single generator workflows (like intrinsic neutrino samples) the workflow is the following:
1422

1523
- `<your-gen>.fcl`
1624
- `g4_sce_lite.fcl`
1725
- `detsim_sce_lite.fcl`
18-
- `reco1_sce_no_overlay_lite.fcl`
26+
- `reco1_sce_lite.fcl`
1927
- `reco2_sce.fcl`
2028

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

sbndcode/JobConfigurations/base/prodgenie_rockbox_sbnd.fcl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#include "genie_sbnd.fcl"
3535
#include "larg4_sbnd.fcl"
36+
#include "mlreco_sbnd.fcl"
3637

3738

3839
process_name: GenieGen
@@ -84,11 +85,14 @@ physics:
8485

8586
# The geant4 step
8687
largeant: @local::sbnd_larg4
88+
89+
# Merge dropped and nominal MCParticle into separate list
90+
simplemerge: @local::sbnd_simplemerge
8791
}
8892

8993
#define the producer and filter modules for this path, order matters,
90-
simulatetpc: [ rns, generator, loader, largeant, tpcfilter ]
91-
simulatedirt: [ rns, generator, loader, largeant, "!tpcfilter", dirtfilter ]
94+
simulatetpc: [ rns, generator, loader, largeant, simplemerge, tpcfilter ]
95+
simulatedirt: [ rns, generator, loader, largeant, simplemerge, "!tpcfilter", dirtfilter ]
9296

9397
#define the output stream, there could be more than one if using filters
9498
# By deault Keep everything in one file:

sbndcode/JobConfigurations/base/reco_drops.fcl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ reco_drops: [ @sequence::detsim_drops,
2121
"drop raw::RawDigits_*_*_*",
2222
"drop raw::OpDetWaveforms_*_*_*",
2323
"drop *_cluster3d_*_*", #drop all mlreco output
24-
"drop *_simplemerge_*_*" #drop all mlreco output
24+
"drop *_simplemerge_*_*", #drop all mlreco output
25+
"drop *_sedlite_*_*" #drop all mlreco output
2526
]
2627

2728
END_PROLOG

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
#include "cafmaker_common_defs.fcl"
3232

33+
#include "eventweight_genie_systtools.fcl"
34+
3335
process_name: CAFmaker
3436

3537
services:
@@ -80,7 +82,7 @@ physics:
8082
# cosmictrack: @local::standard_cosmictrack #reco
8183
# windowtrack: @local::window_cosmictrack #reco
8284

83-
# Includes: pandoraTrackMCS, pandoraTrackRange, rns, genieweight, fluxweight
85+
# Includes: pandoraTrackMCS, pandoraTrackRange, rns, fluxweight
8486
@table::cafmaker_common_producers
8587

8688
flashtrig: @local::pmtflashtrigmaker_sbnd
@@ -100,6 +102,8 @@ physics:
100102
pandoraShowerRazzle: @local::razzle_sbnd
101103

102104
pandoraRazzled: @local::razzled_sbnd
105+
106+
systtools: @local::sbn_systtools
103107
}
104108
filters:{
105109
flashtrigfilter: @local::pmtflashtrigfilter_sbnd
@@ -139,7 +143,6 @@ physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]
139143
physics.producers.cafmaker.FlashMatchSCECryoSuffixes: [""]
140144

141145
# Overwrite weight_functions label:
142-
physics.producers.genieweight.weight_functions: @local::physics.producers.genieweight.weight_functions_genie
143146
physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
144147

145148
# input art file.

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_3drift_sce_runfmatch_geniewgt.fcl

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "cafmakerjob_sbnd_3drift_sce_runfmatch.fcl"
2+
3+
physics.runprod: [rns, systtools, @sequence::physics.runprod]
4+
physics.producers.cafmaker.SystWeightLabels: [ "systtools" ]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#include "cafmakerjob_sbnd.fcl"
22

3-
physics.runprod: [rns, genieweight, fluxweight, @sequence::physics.runprod]
4-
physics.producers.cafmaker.SystWeightLabels: ["fluxweight"]
3+
physics.runprod: [rns, fluxweight, @sequence::physics.runprod]
4+
physics.producers.cafmaker.SystWeightLabels: [ "fluxweight" ]

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_genie_and_fluxwgt.fcl

Lines changed: 0 additions & 4 deletions
This file was deleted.

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_geniewgt.fcl

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)