Skip to content

Commit 24b4d6d

Browse files
author
Brinden Carlson
committed
Merge branch 'release/v10_04_03'
2 parents 47d7427 + f8bc830 commit 24b4d6d

10 files changed

Lines changed: 29 additions & 13 deletions

File tree

‎CMakeLists.txt‎

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

2222
# for CI:
23-
# project(sbndcode VERSION 10.04.01.01)
23+
# project(sbndcode VERSION 10.04.03)
2424

2525
message(STATUS "\n")
2626
message(STATUS "================================= ${PROJECT_NAME} =================================")

sbndcode/JobConfigurations/standard/reco/reco2_data_rawdigit.fcl renamed to sbndcode/JobConfigurations/standard/reco/reco2_data_rawdigit_sbnd.fcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
analyzers.caloskim: @local::caloskim_nodigits_goldentracks
44

55
physics.analyzers.caloskim.SelectionTools: []
6+
physics.analyzers.caloskim.RawDigitproducers: ["daq"]
67
physics.analyzers.caloskim.RequireT0: false
78
physics.analyzers.caloskim.HitRawDigitsTickCollectWidth: 200
89

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include "standard_reco2_sbnd.fcl"
2-
#
2+
33
analyzers.caloskim: @local::caloskim_nodigits_goldentracks
44

5+
physics.analyzers.caloskim.RawDigitproducers: ["simtpc2d:daq"]
6+
57
physics.analyzers.caloskim.SelectionTools: []
68
physics.analyzers.caloskim.RequireT0: false
79
physics.analyzers.caloskim.HitRawDigitsTickCollectWidth: 200

‎sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@
9191
<ReplaceCurrentVertexList>true</ReplaceCurrentVertexList>
9292
<EnableCrossingCandidates>false</EnableCrossingCandidates>
9393
</algorithm>
94-
<algorithm type = "LArVertexRefinement">
94+
<!--<algorithm type = "LArVertexRefinement">
9595
<InputClusterListNames>ClustersU ClustersV ClustersW</InputClusterListNames>
9696
<InputVertexListName>CandidateVertices3D</InputVertexListName>
9797
<OutputVertexListName>RefinedVertices3D</OutputVertexListName>
98-
</algorithm>
98+
</algorithm>-->
9999
<algorithm type = "LArBdtVertexSelection">
100100
<InputCaloHitListNames>CaloHitListU CaloHitListV CaloHitListW</InputCaloHitListNames>
101101
<InputClusterListNames>ClustersU ClustersV ClustersW</InputClusterListNames>
@@ -460,7 +460,8 @@
460460
<!-- Output list management -->
461461
<algorithm type = "LArPostProcessing">
462462
<PfoListNames>NeutrinoParticles3D TrackParticles3D ShowerParticles3D</PfoListNames>
463-
<VertexListNames>NeutrinoVertices3D DaughterVertices3D RefinedVertices3D</VertexListNames>
463+
<!--<VertexListNames>NeutrinoVertices3D DaughterVertices3D RefinedVertices3D</VertexListNames>-->
464+
<VertexListNames>NeutrinoVertices3D DaughterVertices3D CandidateVertices3D</VertexListNames>
464465
<ClusterListNames>ClustersU ClustersV ClustersW TrackClusters3D ShowerClusters3D</ClusterListNames>
465466
<CaloHitListNames>CaloHitListU CaloHitListV CaloHitListW CaloHitList2D</CaloHitListNames>
466467
<CurrentPfoListReplacement>NeutrinoParticles3D</CurrentPfoListReplacement>

‎sbndcode/Utilities/detectorclocks_sbnd.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sbnd_detectorclocks: @local::standard_detectorclocks
1313

1414
sbnd_detectorclocks.TrigModuleName: "triggersim"
1515
sbnd_detectorclocks.InheritClockConfig: true
16-
sbnd_detectorclocks.TriggerOffsetTPC: -0.2e3 # Time [us] for TPC readout start w.r.t. trigger time
16+
sbnd_detectorclocks.TriggerOffsetTPC: -0.205e3 # Time [us] for TPC readout start w.r.t. trigger time
1717
sbnd_detectorclocks.FramePeriod: 1.3e3 # Frame period [us]
1818
sbnd_detectorclocks.ClockSpeedTPC: 2. # TPC clock speed in MHz
1919
sbnd_detectorclocks.ClockSpeedOptical: 500. # Optical clock speed in MHz

‎sbndcode/WireCell/cfg/pgrapher/common/params.jsonnet‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@ local wc = import "wirecell.jsonnet";
156156
// Parameters related to simulation, not given elsewhere.
157157
sim : {
158158

159+
// The "absolute" time (ie, relative to trigger time?) that the lower edge
160+
// of final readout tick #0 should correspond to. This is a
161+
// "fixed" notion.
162+
tick0_time: 0,
163+
159164
// The number of impact bins per wire region gives the
160165
// granularity of the simulation convolution in the transverse
161166
// dimension. Typically should match what the granularity at

‎sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/params.jsonnet‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ base {
121121
fixed: true,
122122

123123
// The "absolute" time (ie, relative to trigger time?) that the lower edge
124-
// of final readout tick #0 should correspond to. This is a
125-
// "fixed" notion.
126-
local tick0_time = -205*wc.us, // updated in January 2025, front porch in data = 410 ticks
124+
// of final readout tick #0 should correspond to.
125+
// this is the default value unless overridden with extVar in main
126+
tick0_time: -205 * wc.us,
127127

128128
// Open the ductor's gate a bit early.
129129
local response_time_offset = $.det.response_plane / $.lar.drift_speed,
@@ -132,7 +132,7 @@ base {
132132
ductor : {
133133
nticks: $.daq.nticks + response_nticks,
134134
readout_time: self.nticks * $.daq.tick,
135-
start_time: tick0_time - response_time_offset,
135+
start_time: $.sim.tick0_time - response_time_offset,
136136
},
137137

138138
// To counter the enlarged duration of the ductor, a Reframer

‎sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-depoflux-nf-sp.jsonnet‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ local params = base {
2828
// Electron drift speed, assumes a certain applied E-field
2929
drift_speed: std.extVar('driftSpeed') * wc.mm / wc.us,
3030
},
31+
sim: super.sim {
32+
// front porch size [us]
33+
tick0_time: std.extVar('tick0_time') * wc.us,
34+
}
3135
};
3236

3337
local tools = tools_maker(params);

‎sbndcode/WireCell/wcsimsp_sbnd.fcl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "detectorclocks_sbnd.fcl"
12
BEGIN_PROLOG
23

34
sbnd_wcls: {
@@ -68,6 +69,8 @@ sbnd_wcls_simsp.wcls_main.structs: {
6869
lifetime: 100.0
6970
## Electron drift speed, assumes 0.5 kV/cm and 88.4 K. Units: mm/us
7071
driftSpeed: 1.563
72+
## simulated front porch size [us]
73+
tick0_time: @local::sbnd_detectorclocks.TriggerOffsetTPC
7174
}
7275

7376
# ------------------------------------------------------------------------------------ #

‎ups/product_deps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ wpdir product_dir wire-cell-cfg
253253
#
254254
####################################
255255
product version qual flags <table_format=2>
256-
sbncode v10_04_01 -
256+
sbncode v10_04_03 -
257257
cetmodules v3_24_01 - only_for_build
258258
sbnd_data v01_27_00 - optional
259-
sbndutil v10_04_01 - optional
259+
sbndutil v10_04_03 - optional
260260
end_product_list
261261
####################################
262262

0 commit comments

Comments
 (0)