Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major Update to SBND FHiCL Files #663

Merged
merged 50 commits into from
Mar 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
aa06b9a
Spacecharge on in main services fhicl
marcodeltutto Feb 25, 2025
ebb9fec
Rename rockbox fhicls
marcodeltutto Feb 25, 2025
f33d25b
Remove old configs
marcodeltutto Feb 25, 2025
8a2b555
Inverte dependecies of bnb cosmic fhicls
marcodeltutto Feb 25, 2025
ea9cf03
Rename bnb plus cosmics fhicls
marcodeltutto Feb 25, 2025
ddd40dd
Use standard_g4_rockbox_sbnd.fcl for rockbox
marcodeltutto Feb 25, 2025
3d282eb
Update intime g4 fhicls
marcodeltutto Feb 25, 2025
49c20ea
Update g4 fhicls
marcodeltutto Feb 25, 2025
eab66df
Move standard_g4_intime_sbnd.fcl one directory up
marcodeltutto Feb 25, 2025
26a6154
Update corsika intime fhicls
marcodeltutto Feb 25, 2025
6d1c0b7
Reinstate standard_detsim_sbnd.fcl as the detsim fhicl
marcodeltutto Feb 25, 2025
a850156
Forgot one drop
marcodeltutto Feb 25, 2025
55c5cf6
Update readme
marcodeltutto Feb 25, 2025
45bc1be
Rename overlay folder to genie_corsika
marcodeltutto Feb 25, 2025
2d4a39e
Rename overlay folder to genie_corsika
marcodeltutto Feb 25, 2025
2237790
Reorganized fcl files in subdirectories, also updated all rhl the rec…
marcodeltutto Feb 25, 2025
c4d8465
Reorganized fcl files in subdirectories, also updated all rhl the rec…
marcodeltutto Feb 25, 2025
2271830
Better organization
marcodeltutto Feb 25, 2025
6fff83d
Better organize optical g4 fcls
marcodeltutto Feb 25, 2025
5c79638
Update fcl README file
marcodeltutto Feb 25, 2025
150b7be
Remove outdated detsim variation fcls
marcodeltutto Feb 25, 2025
ebaa20d
Fix wrong include
marcodeltutto Feb 25, 2025
0a3603c
Fix spelling mistake
marcodeltutto Feb 25, 2025
a3a1bb8
Remove outdate include
marcodeltutto Feb 25, 2025
e0b6498
Fix larg4 include
marcodeltutto Feb 25, 2025
146cec4
Remove outdated fhicls
marcodeltutto Feb 25, 2025
e68621c
Remove outdated fhicls
marcodeltutto Feb 25, 2025
9164917
Make fhicls dumpable
marcodeltutto Feb 25, 2025
e7f3e8c
Update fcls used in ci testing
marcodeltutto Feb 25, 2025
a18c1c4
Updated fhicls used in cmake tests
marcodeltutto Feb 25, 2025
6032cb6
Reviewed and updated list of fhicls to be skipped from testing
marcodeltutto Feb 25, 2025
d982dcf
Re-add trackfinderalgorithms_sbnd.fcl, deleted by mistake
marcodeltutto Feb 25, 2025
bd45119
Tests with new fhicls
marcodeltutto Feb 25, 2025
00879ea
Remove sce files, sce is now on by default
marcodeltutto Feb 27, 2025
d4f05e8
Append _sbnd to file name
marcodeltutto Feb 27, 2025
6aae20d
Remove sce files, sce is now on by default
marcodeltutto Feb 27, 2025
7fca5b3
Append _sbnd to file name
marcodeltutto Feb 27, 2025
73189b1
Append _sbnd to file name
marcodeltutto Feb 27, 2025
d6b8746
Use @local::detsim_drops
marcodeltutto Feb 27, 2025
217c8ac
Append _sbnd to file name and fix mistakes
marcodeltutto Feb 27, 2025
3084163
Enable sbnd_spacecharge.EnableCalSpatialSCE and sbnd_spacecharge.Enab…
marcodeltutto Mar 3, 2025
546443c
Remove EnableSimEfield as it is not a possible conguration parameter …
marcodeltutto Mar 3, 2025
024a482
Remove inclusion of enable_spacecharge_services_sbnd.fcl as they are …
marcodeltutto Mar 3, 2025
64295f8
Fix local->sequence
marcodeltutto Mar 5, 2025
2be95dd
Add _sbnd to corsika only gen fcls
marcodeltutto Mar 5, 2025
609063a
Fix mistake in file name
marcodeltutto Mar 5, 2025
cee4105
Update ci fcl list
marcodeltutto Mar 6, 2025
e6e7fce
Remove spurious space
marcodeltutto Mar 14, 2025
0584258
Set space charge is2DdriftSimHack to false by default, expect for the…
marcodeltutto Mar 14, 2025
762d08f
Remove fcl with sce
marcodeltutto Mar 17, 2025
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
25 changes: 14 additions & 11 deletions sbndcode/JobConfigurations/README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
# SBND Core FHiCL Files

4th October 2024 (Dom Brailsford)
- 25th February 2025 (Marco Del Tutto)
`standard_g4_[rockbox_,intime_]sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow. SCE services are enabled by default.
`standard_detsim_sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow. SCE services are enabled by default.
- 4th October 2024 (Dom Brailsford)
`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
15th July 2024 (Dom Brailsford)
- 15th July 2024 (Dom Brailsford)
`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.


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).
The intended operation of the fcl workflows is that the `standard-*` fcls run the standard workflow. The WireCell 2D TPC simulation/signal processing workflow has now been implemented into the `standard-*` fcls, and the 1D simulation is now deprecated. The *standard* workflow also includes the dropping of some heavy data products.

At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the following:

- `prodoverlay_corsika_cosmics_proton_genie_rockbox_sce.fcl`
- `g4_sce_dirt_filter_lite.fcl` (does not include TPC electron drift simulation)
- `detsim_sce_lite.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
- `prodgenie_corsika_proton_rockbox_sbnd.fcl`
- `standard_g4_rockbox_sbnd.fcl` (does not include TPC electron drift simulation)
- `standard_detsim_sbnd.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
- `standard_reco1_sbnd.fcl`
- `standard_reco2_sbnd.fcl`

The intime workflow is as follows:

- `prodcorsika_proton_intime_filter_sce.fcl`
- `g4_sce_simphotontime_filter_lite.fcl`
- `detsim_sce_lite.fcl`
- `prodcorsika_proton_intime_sbnd.fcl`
- `standard_g4_intime_sbnd.fcl`
- `standard_detsim_sbnd.fcl`
- `standard_reco1_sbnd.fcl`
- `standard_reco2_sbnd.fcl`

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

- `<your-gen>.fcl`
- `g4_sce_lite.fcl`
- `detsim_sce_lite.fcl`
- `standard_g4_sbnd.fcl`
- `standard_detsim_sbnd.fcl`
- `standard_reco1_sbnd.fcl`
- `standard_reco2_sbnd.fcl`

Expand Down
1 change: 0 additions & 1 deletion sbndcode/JobConfigurations/base/prodgenie_sbnd_proj.fcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "simulationservices_sbnd.fcl"
#include "largeantmodules_sbnd.fcl"
#include "detsimmodules_sbnd.fcl"

process_name: GenieGen
Expand Down
5 changes: 3 additions & 2 deletions sbndcode/JobConfigurations/base/prodmarley_sbnd_1event.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#

#include "singles_sbnd.fcl"
#include "largeantmodules_sbnd.fcl"
#include "larg4_sbnd.fcl"
#include "detsimmodules_sbnd.fcl"


Expand Down Expand Up @@ -75,7 +75,8 @@ physics:
rns: { module_type: "RandomNumberSaver" }
generator: @local::standard_marley # marley events
# generator: @local::sbnd_singlep
largeant: @local::sbnd_largeant
loader: { module_type: "PhysListLoader" }
largeant: @local::sbnd_larg4
daq: @local::sbnd_simwire
}

Expand Down
137 changes: 0 additions & 137 deletions sbndcode/JobConfigurations/base/prodsingle_fastoptical2.fcl

This file was deleted.

125 changes: 0 additions & 125 deletions sbndcode/JobConfigurations/base/prodsingle_fastoptical_sbnd.fcl

This file was deleted.

23 changes: 0 additions & 23 deletions sbndcode/JobConfigurations/base/prodsingle_sbnd_crt.fcl

This file was deleted.

7 changes: 4 additions & 3 deletions sbndcode/JobConfigurations/base/sbnd_buildopticallibrary.fcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "simulationservices_sbnd.fcl"
#include "singles_sbnd.fcl"
#include "largeantmodules_sbnd.fcl"
#include "larg4_sbnd.fcl"
#include "detsimmodules_sbnd.fcl"
#include "opticaldetectormodules_sbnd.fcl"
#include "photpropservices_sbnd.fcl"
Expand Down Expand Up @@ -61,8 +61,9 @@ physics:

producers:
{
generator: @local::sbnd_lightsource
largeant: @local::sbnd_largeant
generator: @local::sbnd_lightsource
loader: { module_type: "PhysListLoader" }
largeant: @local::sbnd_larg4
}

analyzers:
Expand Down
1 change: 0 additions & 1 deletion sbndcode/JobConfigurations/standard/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ add_subdirectory(workshops)
add_subdirectory(deprecated)
add_subdirectory(ana)
add_subdirectory(scrubs)
add_subdirectory(detvar_downstream)

install_fhicl()
6 changes: 0 additions & 6 deletions sbndcode/JobConfigurations/standard/README

This file was deleted.

Loading