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.

Sign up for GitHub

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

added sbnd recomb and diffusion fcls #366

Merged
merged 16 commits into from
Jul 13, 2023
Merged

added sbnd recomb and diffusion fcls #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
132e1b1
added sbnd recomb and diffusion fcls
Jul 10, 2023
5724821
added fix to match with proposed workflow by production team
Jul 11, 2023
3d6015f
Clean up variation fcls and add scrubs stage
henrylay97 Jul 12, 2023
52c6571
Correct include
henrylay97 Jul 12, 2023
34b0b5a
new detsim + reco1 fcls to accomodate wc 2d sim
lynnt20 Jul 12, 2023
8596922
reference the original detsim fcl instead of defining a new one
lynnt20 Jul 12, 2023
cd3c852
change name to 1d to specify 1d decon
lynnt20 Jul 13, 2023
d5cd990
rename file
lynnt20 Jul 13, 2023
a494d5b
Update reco1_sce_lite_wc1d.fcl
lynnt20 Jul 13, 2023
5ca1acd
delete drops line
lynnt20 Jul 13, 2023
a5c0ace
adding 2dsim+2d deconvolution input to reco1
lynnt20 Jul 13, 2023
fa371dd
Merge branch 'isafa/detvar' of https://github.com/SBNSoftware/sbndcod…
lynnt20 Jul 13, 2023
d6434b2
change scaling factor to be consistent with input to hitfinder
lynnt20 Jul 13, 2023
415b402
Last minute fix - the wirecell fcl being used has been changed since …
henrylay97 Jul 13, 2023
77fe2f8
update unified workflow jsonnet to have proper scaling
lynnt20 Jul 13, 2023
954dfa0
Merge branch 'develop' into isafa/detvar
fjnicolas Jul 13, 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
3 changes: 1 addition & 2 deletions sbndcode/JobConfigurations/base/g4_drops.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@

BEGIN_PROLOG

g4_drops: [ "drop sim::SimEnergyDeposits_*_*_*",
"drop sim::OpDetBacktrackerRecords_*_*_*" ]
g4_drops: [ "drop sim::OpDetBacktrackerRecords_*_*_*" ]

END_PROLOG

1 change: 1 addition & 0 deletions sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ install_fhicl()
FILE(GLOB fcl_files *.fcl)
install_source(EXTRAS ${fcl_files} )

add_subdirectory(diffusion_variations)
add_subdirectory(legacy)

8 changes: 8 additions & 0 deletions sbndcode/JobConfigurations/standard/detsim/detsim_sce_lite_wc.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# File: detsim_sce_lite_wc.fcl
# Purpose: Simulates readout response to induced and collected charge
# ****DROPS 1D TPC SIM, includes optical+crt simulation ONLY ****
#

#include "detsim_sce_lite.fcl"

physics.simulate: [rns, crtsim, crt, opdaq] # removes the "daq" producer
1 change: 1 addition & 0 deletions sbndcode/JobConfigurations/standard/detsim/diffusion_variations/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
install_fhicl()
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff-10.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "wirecell_sim_sp_sbnd.fcl"

physics.producers.simtpc2d.wcls_main.structs.DL: 3.6
physics.producers.simtpc2d.wcls_main.structs.DT: 8.8
4 changes: 4 additions & 0 deletions ...de/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff10.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "wirecell_sim_sp_sbnd.fcl"

physics.producers.simtpc2d.wcls_main.structs.DL: 4.4
physics.producers.simtpc2d.wcls_main.structs.DT: 8.8
2 changes: 1 addition & 1 deletion sbndcode/JobConfigurations/standard/g4/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ install_fhicl()
FILE(GLOB fcl_files *.fcl)
install_source(EXTRAS ${fcl_files} )

add_subdirectory(recomb_variations)
add_subdirectory(legacy)

1 change: 1 addition & 0 deletions sbndcode/JobConfigurations/standard/g4/recomb_variations/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
install_fhicl()
4 changes: 4 additions & 0 deletions ...JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-1-1.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.91
services.LArG4Parameters.ModBoxB: 0.21
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-10.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.91
services.LArG4Parameters.ModBoxB: 0.212
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-11.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.91
services.LArG4Parameters.ModBoxB: 0.214
4 changes: 4 additions & 0 deletions ...JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-3-3.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.87
services.LArG4Parameters.ModBoxB: 0.205
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-30.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.87
services.LArG4Parameters.ModBoxB: 0.212
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-33.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.86
services.LArG4Parameters.ModBoxB: 0.218
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-1.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.93
services.LArG4Parameters.ModBoxB: 0.21
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-3.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.93
services.LArG4Parameters.ModBoxB: 0.206
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb01.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.93
services.LArG4Parameters.ModBoxB: 0.214
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb03.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.93
services.LArG4Parameters.ModBoxB: 0.218
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb1-1.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.95
services.LArG4Parameters.ModBoxB: 0.21
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb10.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.95
services.LArG4Parameters.ModBoxB: 0.212
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb11.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.95
services.LArG4Parameters.ModBoxB: 0.214
4 changes: 4 additions & 0 deletions .../JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb3-3.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.999
services.LArG4Parameters.ModBoxB: 0.206
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb30.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.999
services.LArG4Parameters.ModBoxB: 0.212
4 changes: 4 additions & 0 deletions ...e/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb33.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "g4_sce_dirt_filter_lite_wc.fcl"

services.LArG4Parameters.ModBoxA: 0.999
services.LArG4Parameters.ModBoxB: 0.222
15 changes: 15 additions & 0 deletions sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc1d.fcl
View file
Open in desktop
lynnt20 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#-------------------------------------------------------------------
#
# Name: reco1_sce_lite_wc1d.fcl
#
# Purpose: Lite version of reco1_sce.fcl,
# *** takes wirecell 2DSIM as input, performs 1D deconvolution ***
#
#
#-------------------------------------------------------------------

#include "reco1_sce_lite.fcl"

physics.producers.caldata.DigitModuleLabel: "simtpc2d:daq"
physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
physics.producers.gaushit.CalDataModuleLabel: "caldata:daq"
33 changes: 33 additions & 0 deletions sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc2d.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#-------------------------------------------------------------------
#
# Name: reco1_sce_lite_wc2d.fcl
#
# Purpose: Lite version of reco1_sce.fcl,
# *** takes wirecell 2DSIM as input, 2d sim + 2D deconvolution ***
# *** DOES NOT RUN fasthit MODULE ***
#
#
#-------------------------------------------------------------------

#include "reco1_sce_lite.fcl"

physics.reco1: [ rns
, opdecopmt
, opdecoxarapuca
, ophitpmt
, ophitxarapuca
, opflashtpc0
, opflashtpc1
, opflashtpc0xarapuca
, opflashtpc1xarapuca
# , caldata
, gaushit
# , fasthit
# , linecluster
, gaushitTruthMatch
# , rffhit
# , corner
# , fuzzycluster
]

physics.producers.gaushit.CalDataModuleLabel: "simtpc2d:gauss"
1 change: 1 addition & 0 deletions sbndcode/JobConfigurations/standard/scrubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
install_fhicl()
32 changes: 32 additions & 0 deletions sbndcode/JobConfigurations/standard/scrubs/scrub_g4_wcls_detsim_reco1.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This fcl purely removes products made in the G4, WCLS, DetSim & Reco1 processes.
# This allows for keeping the identical simulated event on the file and running
# a variation of the downstream detector simulation / reconstruction.
#
# Author Henry Lay ([email protected])

#include "rootoutput_sbnd.fcl"

source:
{
module_type: RootInput
inputCommands: [ "keep *_*_*_*",
"drop *_*_*_G4",
"drop *_*_*_WCLS",
"drop *_*_*_DetSim",
"drop *_*_*_Reco1" ]
}

outputs:
{
out1:
{
@table::sbnd_rootoutput
dataTier: "simulated"
}
}

physics:
{
stream1: [ out1 ]
end_paths: [ stream1 ]
}
9 changes: 1 addition & 8 deletions sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,7 @@ outputs:
{
@table::sbnd_rootoutput
dataTier: "simulated"
outputCommands: [ "keep *_*_*_*"
# Drop the SimEnergyDeposits made by LArG4
, "drop sim::SimEnergyDeposits_largeant_*_*"
# Drop the IonAndScint w/ SCE offsets applied
, "drop *_ionandscint__*"
# Drop LArG4 AuxDetHits, now replaced by AuxDetSimChannels
, "drop sim::AuxDetHits_*_*_*"
]
Comment on lines -126 to -133
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! Sorry I saw this PR was merged already, but I just noticed that this PR changes the standard g4 fcl. Is this intentional? This way, it's keeping all data products, with many copies of SimEnergyDeposits. @fjnicolas @lynnt-uchicago @henrylay97

Copy link
Contributor Author

@ibsafa ibsafa Jul 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi! yes, the reason is that g4_drops.fcl was created for the lite version. it was decided that sim energy deposits would be dropped as part of the lite workflow but should be available by default since a few people have needed those sim energy deposits recently

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarifying @ibsafa! LArG4 makes three copies of SimEnergyDeposits, two of them can be dropped without loss (but people can correct me!). The reason why all three were dropped was a mistake, and was fixed by @fjnicolas with PR #368. My suggestion would be to keep that block above in the standard fcl, and add more drops commands in the g4_drops.fcl for production purposes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcodeltutto thanks for the suggestion! A conservative solution was finally adopted prioritizing having a working tag for the workshop production. I also agree we are probably keeping "to much" with the current solution and we will revisit it after the workshop. In any case, we think a major refactoring of the fhicls is really needed at this point. I'm opening a issue to keep track of it! #374

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good @fjnicolas, thanks! I agree a refactoring is really needed

outputCommands: [ "keep *_*_*_*" ]
}
}

Expand Down
2 changes: 1 addition & 1 deletion sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-nf-sp.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ local wcls_output = {
frame_tags: ['gauss', 'wiener'],

// this may be needed to convert the decon charge [units:e-] to be consistent with the LArSoft default ?unit? e.g. decon charge * 0.005 --> "charge value" to GaussHitFinder
frame_scale: [1.0, 1.0],
frame_scale: [0.02, 0.02],
nticks: params.daq.nticks,
chanmaskmaps: [],
//nticks: ,
Expand Down
2 changes: 1 addition & 1 deletion sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-simchannel-nf-sp.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ local wcls_output_sp = {
frame_tags: ['gauss', 'wiener'],

// this may be needed to convert the decon charge [units:e-] to be consistent with the LArSoft default ?unit? e.g. decon charge * 0.005 --> "charge value" to GaussHitFinder
frame_scale: [1.0, 1.0],
frame_scale: [0.02, 0.02],
nticks: params.daq.nticks,
chanmaskmaps: [],
//nticks: -1,
Expand Down