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

Update unit tests to use WireCell workflow #414

Merged
merged 6 commits into from
Feb 19, 2024
Merged

Update unit tests to use WireCell workflow #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0805040
Unit tests config for wire cell workflow
fjnicolas Feb 16, 2024
ffe257e
set WC env var
fjnicolas Feb 16, 2024
e50fca9
add mcreco to all WC sim fhicls
fjnicolas Feb 16, 2024
aa27efa
set WC env var for fast_electrons.sh
fjnicolas Feb 16, 2024
0f5b7c3
Merge branch 'develop' into feature/fnicolas_fix_unit_tests
fjnicolas Feb 16, 2024
9a7bc28
remove mcreco from g4_dirt_filter.fcl
lynnt20 Feb 18, 2024
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
2 changes: 1 addition & 1 deletion sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ physics.simulate: [ rns
, pdfastsim
, pdfastsimout
, simdrift
, mcreco
#, mcreco ## mcreco now run after WireCell sim
, genericcrt
]

Expand Down
2 changes: 1 addition & 1 deletion sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ physics:
, pdfastsim
, pdfastsimout
, simdrift
, mcreco
#, mcreco ## mcreco now run after WireCell sim
, genericcrt
]

Expand Down
11 changes: 10 additions & 1 deletion sbndcode/WireCell/wirecell_pgrapher_detsim_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,18 @@
##include "opdetdigitizer_sbnd.fcl"
#include "rootoutput_sbnd.fcl"

#
# MC reco
#
#include "mcreco_sbnd.fcl"

process_name: WCLS

services:
{
TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
#@table::sbnd_detsim_services
@table::sbnd_g4_services
FileCatalogMetadata: @local::sbnd_file_catalog_mc
#AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
#AuxDetGeometry: { @table::sbnd_geo_source }
Expand Down Expand Up @@ -100,14 +105,18 @@ physics:
}
}
}

# Truth-level reconstruction
mcreco: @local::sbnd_mcreco

#crt: @local::sbnd_crtsim
#opdaq: @local::sbnd_opdetdigitizer
}

#define the producer and filter modules for this path, order matters,
#simulate: [ rns, daq, crt, opdaq] #default
#simulate: [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
simulate: [ simtpc2d] #only wirecell drift simulation (simtpc2d)
simulate: [ simtpc2d, mcreco] #only wirecell drift simulation (simtpc2d)

#define the output stream, there could be more than one if using filters
stream1: [ out1 ]
Expand Down
10 changes: 9 additions & 1 deletion sbndcode/WireCell/wirecell_sim_rawdigits_sp.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@
#include "detsimmodules_sbnd.fcl"
#include "rootoutput_sbnd.fcl"

#
# MC reco
#
#include "mcreco_sbnd.fcl"


process_name: WCLS

services:
{
TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
#@table::sbnd_detsim_services
@table::sbnd_g4_services
FileCatalogMetadata: @local::sbnd_file_catalog_mc
#AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
#AuxDetGeometry: { @table::sbnd_geo_source }
Expand Down Expand Up @@ -133,6 +139,8 @@ physics:
}
}

# Truth-level reconstruction
mcreco: @local::sbnd_mcreco

#crt: @local::sbnd_crtsim
#opdaq: @local::sbnd_opdetdigitizer
Expand All @@ -141,7 +149,7 @@ physics:
#define the producer and filter modules for this path, order matters,
#simulate: [ rns, daq, crt, opdaq] #default
#simulate: [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
simulate: [ simtpc2d] #added wctsp Ewerton 2023-05-16
simulate: [ simtpc2d, mcreco] #added wctsp Ewerton 2023-05-16

trigger_paths : [ simulate ]

Expand Down
13 changes: 11 additions & 2 deletions sbndcode/WireCell/wirecell_sim_sp_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@
#include "detsimmodules_sbnd.fcl"
#include "rootoutput_sbnd.fcl"

#
# MC reco
#
#include "mcreco_sbnd.fcl"


process_name: WCLS

services:
{
TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
#@table::sbnd_detsim_services
@table::sbnd_g4_services
FileCatalogMetadata: @local::sbnd_file_catalog_mc
#AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
#AuxDetGeometry: { @table::sbnd_geo_source }
Expand Down Expand Up @@ -131,17 +137,20 @@ physics:
driftSpeed: 1.563
}
}
}

}

# Truth-level reconstruction
mcreco: @local::sbnd_mcreco

#crt: @local::sbnd_crtsim
#opdaq: @local::sbnd_opdetdigitizer
}

#define the producer and filter modules for this path, order matters,
#simulate: [ rns, daq, crt, opdaq] #default
#simulate: [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
simulate: [ simtpc2d] #added wctsp Ewerton 2023-05-16
simulate: [ simtpc2d, mcreco] #added wctsp Ewerton 2023-05-16

trigger_paths : [ simulate ]

Expand Down
12 changes: 11 additions & 1 deletion sbndcode/WireCell/wirecell_tbb_deposet_detsim_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,19 @@
##include "opdetdigitizer_sbnd.fcl"
#include "rootoutput_sbnd.fcl"

#
# MC reco
#
#include "mcreco_sbnd.fcl"


process_name: WCLS

services:
{
TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
#@table::sbnd_detsim_services
@table::sbnd_g4_services
FileCatalogMetadata: @local::sbnd_file_catalog_mc
#AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
#AuxDetGeometry: { @table::sbnd_geo_source }
Expand Down Expand Up @@ -99,14 +105,18 @@ physics:
}
}
}

# Truth-level reconstruction
mcreco: @local::sbnd_mcreco

#crt: @local::sbnd_crtsim
#opdaq: @local::sbnd_opdetdigitizer
}

#define the producer and filter modules for this path, order matters,
#simulate: [ rns, daq, crt, opdaq] #default
#simulate: [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
simulate: [ simtpc2d] #only wirecell drift simulation (simtpc2d)
simulate: [ simtpc2d, mcreco] #only wirecell drift simulation (simtpc2d)

#define the output stream, there could be more than one if using filters
stream1: [ out1 ]
Expand Down
10 changes: 8 additions & 2 deletions test/JobConfigurations/fast_simulation_reconstruction_test_electrons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@
declare -ar TestNames=(
'prodsingle_electron_bnblike_newflux'
'g4_sce'
'detsim_sce'
'reco1_sce'
'wirecell_sim_sp_sbnd'
'detsim_sce_lite_wc'
'reco1_sce_lite_wc2d'
'reco2_sce'
)

#############################################################################

# Set WireCell env vars
export WIRECELL_PATH=${SBNDCODE_DIR}/sbndcode/WireCell/cfg/:${SBND_DATA_DIR}/WireCell


function ExecBase() {
local LogFile="$1"
shift
Expand Down
11 changes: 9 additions & 2 deletions test/JobConfigurations/fast_simulation_reconstruction_test_muons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,19 @@
declare -ar TestNames=(
'prodsingle_mu_bnblike_newflux'
'g4_sce'
'detsim_sce'
'reco1_sce'
'wirecell_sim_sp_sbnd'
'detsim_sce_lite_wc'
'reco1_sce_lite_wc2d'
'reco2_sce'
)

#############################################################################


# Set WireCell env vars
export WIRECELL_PATH=${SBNDCODE_DIR}/sbndcode/WireCell/cfg/:${SBND_DATA_DIR}/WireCell


function ExecBase() {
local LogFile="$1"
shift
Expand Down