Skip to content

Commit 1b3e197

Browse files
bear-is-asleepbear-is-asleep
authored
Merge branch 'develop' into feature/hlay_crt_data_timing_cherry_pick
2 parents def6286 + e278101 commit 1b3e197

34 files changed

Lines changed: 3543 additions & 7 deletions

‎CMakeLists.txt‎

Lines changed: 3 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.93.01.02)
18+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01.02.01)
1919
find_package(cetmodules REQUIRED)
2020
project(sbndcode LANGUAGES CXX)
2121

2222
# for CI:
23-
# project(sbndcode VERSION 09.93.01.02)
23+
# project(sbndcode VERSION 09.93.01.02.01)
2424

2525
message(STATUS "\n")
2626
message(STATUS "================================= ${PROJECT_NAME} =================================")
@@ -80,6 +80,7 @@ find_package( larcore REQUIRED )
8080
find_package( larcorealg REQUIRED )
8181
find_package( larcoreobj REQUIRED )
8282
find_package( larreco REQUIRED )
83+
find_package( larrecodnn REQUIRED )
8384
find_package( larana REQUIRED )
8485
find_package( PostgreSQL REQUIRED )
8586
find_package( hep_concurrency REQUIRED )

‎sbndcode/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ add_subdirectory(WireCell)
4242

4343
add_subdirectory(Decoders)
4444
add_subdirectory(ChannelMaps)
45+
46+
# for CVN
47+
add_subdirectory(SBNDCVN)

‎sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "crtskim_sbnd.fcl"
1717
#include "pmtskim_sbnd.fcl"
1818

19+
#include "SBNDCVNMapper.fcl"
20+
1921
BEGIN_PROLOG
2022

2123
sbnd_reco2_producers:{
@@ -67,6 +69,9 @@ sbnd_reco2_producers:{
6769

6870
### Uncalibrated calorimetry producer for calibration caloskimmer
6971
caloskimCalorimetry: @local::caloskim_calorimetry
72+
73+
### CVN
74+
cvn: @local::standard_sbndcvnevaluatorslc
7075
}
7176

7277
sbnd_reco2_producer_sequence: [
@@ -101,6 +106,7 @@ sbnd_reco2_producer_sequence: [
101106
, fmatcharaSCE
102107
, fmatchoparaSCE
103108
, opt0finderSCE
109+
, cvn
104110
]
105111

106112
#FIXME override the producer labels. This should really happen in the module's config fcl

‎sbndcode/JobConfigurations/standard/reco/reco2_data.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ physics.producers:
1919
}
2020

2121
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, caloskimCalorimetry,
22-
crtclustering, crtspacepoints, crttracks ]
22+
crtclustering, crtspacepoints, crttracks, cvn ]
2323

2424
physics.analyzers.caloskim.G4producer: ""
2525
physics.analyzers.caloskim.SimChannelproducer: ""

‎sbndcode/LArSoftConfigurations/mlreco_sbnd.fcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sbnd_supera_mpvmpr: {
1717
module_type: "LArSoftSuperaDriver"
1818
supera_params: "supera_sbnd_mpvmpr.fcl"
1919
out_filename: "larcv.root"
20-
unique_filename: false
20+
unique_filename: true
2121
stream: "mc"
2222
StrictDataLoading: false
2323
}
@@ -27,7 +27,7 @@ sbnd_supera_data: {
2727
module_type: "LArSoftSuperaDriver"
2828
supera_params: "supera_sbnd_data.fcl"
2929
out_filename: "larcv.root"
30-
unique_filename: false
30+
unique_filename: true
3131
stream: "data"
3232
StrictDataLoading: false
3333
}
@@ -37,7 +37,7 @@ sbnd_supera: {
3737
module_type: "LArSoftSuperaDriver"
3838
supera_params: "supera_sbnd_corsika.fcl"
3939
out_filename: "larcv.root"
40-
unique_filename: false
40+
unique_filename: true
4141
stream: "mc"
4242
StrictDataLoading: false
4343
}

‎sbndcode/LArSoftConfigurations/services_sbnd.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ sbnd_services:
8585
DetectorClocksService: @local::sbnd_detectorclocks
8686
DetectorPropertiesService: @local::sbnd_detproperties
8787
# OpDigiProperties: @local::sbnd_opdigiproperties
88-
ChannelStatusService: @local::sbnd_channelstatus
88+
ChannelStatusService: @local::sbnd_data_channelstatus
8989
DetPedestalService: @local::sbnd_detpedestalservice # from database_sbnd.fcl
9090
SpaceCharge: @local::sbnd_spacecharge
9191
} # sbnd_services

‎sbndcode/SBNDCVN/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
add_subdirectory(module_helpers)
2+
add_subdirectory(modules)
3+
add_subdirectory(tf)
4+
add_subdirectory(fcls)
5+
install_fhicl()
6+

‎sbndcode/SBNDCVN/fcls/CMakeLists.txt‎

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

‎sbndcode/SBNDCVN/fcls/SBNDCVNMapper.fcl‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
BEGIN_PROLOG
2+
3+
# This file defines the configuration for the CVNMapper and CVNMapperProtoDUNE modules
4+
standard_pixelmapproducer:
5+
{
6+
TdcWidth: 500 # 1000
7+
WireLength: 1984 #collection plane : 1664, induction plane : 1984
8+
TimeResolution: 1700 #1600 # 2560 # 3400
9+
Threshold: 0
10+
MultipleDrifts: true
11+
verbose: false
12+
ChangeWireNo: true
13+
ReadoutSize: 3400. # in time ticks # 2560
14+
ShiftT: 420. # 420.
15+
InductionWires: 1984
16+
FlipInductionView: false
17+
UseT: true
18+
}
19+
20+
standard_cvnmapper:
21+
{
22+
module_type: SBNDCVNMapper
23+
HitsModuleLabel: "gaushit"
24+
ClusterPMLabel: "cvnmap"
25+
MinClusterHits: 100
26+
verbose: false
27+
UseSlice: true
28+
SliceLabel: "pandora"
29+
PFParticleModuleLabel: "pandora"
30+
T0Label: "pandora"
31+
PixelMapProducer: @local::standard_pixelmapproducer
32+
MapVecSize: 100000
33+
34+
}
35+
36+
standard_cvnzlibmaker:
37+
{
38+
module_type: SBNDCVNZlibMaker
39+
OutputDir: "./NewZlibMakerOutput"
40+
PixelMapInput: "sbndpixelmap"
41+
SetLog: false
42+
ReverseViews: [false,false,false]
43+
PlaneLimit: 500
44+
TDCLimit: 500
45+
verbose: false
46+
UseSlice: true
47+
SliceLabel: "pandora"
48+
TopologyHitsCut: 0
49+
GenieGenModuleLabel: "generator"
50+
Verbose: false
51+
UseBackTrackInfo: true
52+
UseNuContainment: false
53+
CosEfrac: 0.75
54+
NuEfrac: 0.25
55+
VolCut: 0.
56+
SaveTree: false
57+
PFParticleModuleLabel: "pandora"
58+
HitModuleLabel: "gaushit"
59+
T0Label: "pandora"
60+
}
61+
62+
standard_sbndwirecheck:
63+
{
64+
module_type: SBNDWireCheck
65+
HitModuleLabel: "gaushit"
66+
SpacePointModuleLabel: "pandora"
67+
SliceLabel: "pandora"
68+
GenieGenModuleLabel: "generator"
69+
TrackModuleLabel: "pandoraTrack"
70+
PFPLabel: "pandora"
71+
T0Label: "pandora" # pandora # opt0finder
72+
Run: 1
73+
SubRun: 13
74+
Event: 74
75+
SliceID: 0
76+
}
77+
78+
standard_cvnmapper_wire:
79+
{
80+
module_type: CVNMapperWire
81+
#==================
82+
HitsModuleLabel: "wclsdatanfsp:gauss"
83+
ClusterPMLabel: "cvnmap"
84+
MinClusterHits: 100
85+
PixelMapProducer:
86+
{
87+
@table::standard_pixelmapproducer
88+
TimeResolution: 1500
89+
Threshold: 0.6
90+
}
91+
}
92+
93+
standard_cvnmapper_sim:
94+
{
95+
module_type: CVNMapperSim
96+
#==================
97+
HitsModuleLabel: "tpcrawdecoder:simpleSC"
98+
ClusterPMLabel: "cvnmap"
99+
MinClusterHits: 100
100+
PixelMapProducer:
101+
{
102+
@table::standard_pixelmapproducer
103+
TimeResolution: 1500
104+
Threshold: 0.6
105+
}
106+
}
107+
108+
standard_sbndtfnethandler:
109+
{
110+
LibPath: "SBND_DATA_DIR"
111+
TFProtoBuf: "CVN"
112+
ChargeLogScale: false
113+
NImageWires: 500
114+
NImageTDCs : 500
115+
ReverseViews: [false,false,false]
116+
UseBundle: true
117+
Inputs: ["view0","view1","view2"]
118+
Outputs: ["flavour"]
119+
NInputs: 3
120+
NOutputs: 7
121+
verbose: false
122+
}
123+
124+
standard_sbndcvnevaluatorpm:
125+
{
126+
module_type: SBNDCVNEvaluator
127+
#==================
128+
PixelMapModuleLabel: "sbndpixelmap"
129+
PixelMapInput: "cvnmap"
130+
SliceLabel: ""
131+
PFParticleModuleLabel: ""
132+
T0Label: ""
133+
CVNType: "Tensorflow"
134+
verbose: false
135+
SBNDTFHandler: {
136+
tool_type: SBNDTFNetHandler
137+
@table::standard_sbndtfnethandler
138+
}
139+
PixelMapProducer: @local::standard_pixelmapproducer
140+
}
141+
142+
standard_sbndcvnevaluatorslc:
143+
{
144+
module_type: SBNDCVNEvaluator
145+
#==================
146+
PixelMapModuleLabel: ""
147+
PixelMapInput: ""
148+
SliceLabel: "pandora"
149+
PFParticleModuleLabel: "pandora"
150+
T0Label: "pandora"
151+
CVNType: "Tensorflow"
152+
verbose: false
153+
SBNDTFHandler: {
154+
tool_type: SBNDTFNetHandler
155+
@table::standard_sbndtfnethandler
156+
}
157+
PixelMapProducer: @local::standard_pixelmapproducer
158+
}
159+
160+
standard_sbndcvntest:
161+
{
162+
module_type: SBNDCVNTest
163+
#==================
164+
SliceLabel: "pandora"
165+
CVNLabel: "cvn"
166+
GenieLabel: "generator"
167+
HitLabel: "gaushit"
168+
HitMatchLabel: "gaushitTruthMatch"
169+
}
170+
171+
172+
END_PROLOG

‎sbndcode/SBNDCVN/fcls/run_SBNDCVNEvaTest.fcl‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#include "SBNDCVNMapper.fcl"
2+
#include "simulationservices_sbnd.fcl"
3+
#include "rootoutput_sbnd.fcl"
4+
#include "services_sbnd.fcl"
5+
#include "messages_sbnd.fcl"
6+
#include "sam_sbnd.fcl"
7+
#include "larfft_sbnd.fcl"
8+
#include "signalservices_sbnd.fcl"
9+
#include "rootoutput_sbnd.fcl"
10+
11+
process_name: SBNDCVNEvaTest
12+
13+
services:
14+
{
15+
RandomNumberGenerator: {} # required by fuzzyCluster
16+
message: @local::sbnd_message_services_prod # from messages_sbnd.fcl
17+
FileCatalogMetadata: @local::sbnd_file_catalog_mc # from sam_sbnd.fcl
18+
MetadataSBN: @local::sbnd_file_catalog_sbn # from sam_sbnd.fcl
19+
@table::sbnd_services # from services_sbnd.fcl
20+
LArFFT: @local::sbnd_larfft
21+
SignalShapingServiceSBND: @local::sbnd_signalshapingservice # from signalservices_sbnd.fcl
22+
ParticleInventoryService: @local::standard_particleinventoryservice
23+
TFileService: { fileName: "cvn.root" }
24+
}
25+
services.FileCatalogMetadataSBN: {
26+
@table::sbnd_file_catalog_extra
27+
FCLName: ""
28+
ProjectName: ""
29+
ProjectStage: ""
30+
ProjectVersion: ""
31+
ProjectSoftware:""
32+
ProductionName: ""
33+
ProductionType: ""
34+
} # services.FileCatalogMetadataSBND
35+
36+
source:
37+
{
38+
module_type: RootInput
39+
maxEvents: -1
40+
}
41+
42+
43+
physics:
44+
{
45+
46+
producers:{
47+
#sbndpixelmap: @local::standard_cvnmapper
48+
cvn: @local::standard_sbndcvnevaluatorslc
49+
}
50+
51+
analyzers:{
52+
cvntest: @local::standard_sbndcvntest
53+
}
54+
55+
filters: {}
56+
57+
#reco: [sbndpixelmap, cvn]
58+
reco: [cvn]
59+
60+
ana: [ cvntest ]
61+
62+
# stream: [ ]
63+
64+
trigger_paths: [ reco ]
65+
66+
end_paths: [ana]
67+
}

0 commit comments

Comments
 (0)