Skip to content

Commit 1e3aa24

Browse files
nathanielerowenathanielerowe
authored
Merge branch 'develop' into feature/lynnt_ccnuefilter
2 parents ad06589 + 6de1147 commit 1e3aa24

53 files changed

Lines changed: 88104 additions & 187 deletions

File tree

Some content is hidden

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

‎sbndcode/Geometry/gdml/preparse/setup.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
source /cvmfs/sbnd.opensciencegrid.org/products/sbnd/setup_sbnd.sh
3+
setup root v6_26_06 -q e26:p3913:prof
4+
g++ -o preparseGDML preparseGDML.cpp `root-config --cflags --glibs`

‎sbndcode/Geometry/gdml/sbnd_v02_05.gdml‎

Lines changed: 63119 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/Geometry/gdml/sbnd_v02_05_base.gdml‎

Lines changed: 7014 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/Geometry/gdml/sbnd_v02_05_nowires.gdml‎

Lines changed: 17393 additions & 0 deletions
Large diffs are not rendered by default.

‎sbndcode/Geometry/geometry_sbnd.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353

5454
BEGIN_PROLOG
5555

56-
sbnd_geometry_file: "sbnd_v02_04.gdml"
57-
sbnd_geometry_file_nowires: "sbnd_v02_04_nowires.gdml"
56+
sbnd_geometry_file: "sbnd_v02_05.gdml"
57+
sbnd_geometry_file_nowires: "sbnd_v02_05_nowires.gdml"
5858

5959

6060
#

‎sbndcode/JobConfigurations/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
add_subdirectory(base)
22
add_subdirectory(standard)
3+
add_subdirectory(dnnroi)
34

‎sbndcode/JobConfigurations/base/reco_drops.fcl‎

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

‎sbndcode/JobConfigurations/dnnroi/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
install_fhicl()

‎sbndcode/JobConfigurations/dnnroi/reco1_data_bothrois.fcl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# File: reco1_data_bothrois.fcl
2+
# Authors: Mun Jung Jung (munjung@uchicago.edu)
3+
4+
# runs Reco1 on data
5+
# for SP, use both traditional and DNN-based ROI finding, creating three Wire products: simtpc2d:gauss, simtpc2d:wiener (from traditional), simtpc2d:dnnsp (from DNN)
6+
# for downstream reco1, run gaushitfinder on sptpc2d:gauss, from traditional ROI finding
7+
# to generate matching files with downstream reco1 run on sptpc2d:dnnsp, gaushits should be scrubbed and run again
8+
#
9+
#include "reco1_data.fcl"
10+
11+
physics.producers.sptpc2d: @local::sbnd_wcls_sp_data_bothrois
12+

‎sbndcode/JobConfigurations/dnnroi/reco1_nosp_data.fcl‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# File: reco1_nosp_data.fcl
2+
# Authors: Mun Jung Jung (munjung@uchicago.edu)
3+
4+
# runs everything downstream of sptpc2d in the reco1 chain for data
5+
# runs gaushitfinder on sptpc2d:gauss
6+
7+
#include "reco1_data.fcl"
8+
9+
physics.reco1: [gaushit, numberofhitsfilter, cluster3d, crtstrips,
10+
crtclustering, crtspacepoints, crttracks, opdecopmt, ophitpmt, opflashtpc0, opflashtpc1]
11+
physics.ana: [superadata]
12+
13+
outputs.out1.SelectEvents: [ "reco1" ]
14+
15+
physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:gauss"

0 commit comments

Comments
 (0)