Skip to content

Commit 8a5000b

Browse files
wyjang-utawyjang-uta
committed
Merge branch 'release/v10_20_05d01'
2 parents f8c2166 + 33a6b0d commit 8a5000b

38 files changed

Lines changed: 225 additions & 211 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cmake_minimum_required (VERSION 3.20 FATAL_ERROR)
99

1010
find_package(cetmodules REQUIRED)
1111
project(dunesw LANGUAGES CXX)
12-
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.05d00)
12+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.05d01)
1313

1414
include(CetCMakeEnv)
1515
cet_cmake_env()

‎fcl/dunefd/caf/standard_cafmaker_dune10kt_1x2x6.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ services:
1010
@table::dunefd_1x2x6_reco_services
1111
# Load the service that manages root files for histograms where the CAF info will be saved.
1212
TFileService: { fileName: "caf.root" }
13+
message: @local::dune_message_services_prod
1314
}
1415

1516
source:

‎fcl/dunefdvd/caf/standard_cafmaker_dunevd10kt_1x8x6_3view_30deg.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
@table::dunefdvd_1x8x6_3view_30deg_reco_services
1212
# Load the service that manages root files for histograms where the CAF info will be saved.
1313
TFileService: { fileName: "caf.root" }
14+
message: @local::dune_message_services_prod
1415
}
1516

1617
source:

‎fcl/protodunevd/README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ The corresponding FHICL files are:
1313
- standard_reco_stage2_protodunevd_offline.fcl (yet to be setup)
1414

1515
Various specific data taking configurations were set-up hence the multiple extensions:
16-
- CERN SPS beam: _beam.fcl and _beam_tdeonly.fcl (when DAQ disabled BDE)
16+
- CERN SPS beam:
17+
- _beam.fcl (for 1 GeV/c period 2, 0.5, 1.5, 2 and 4 GeV/c beam data - trigger offset 411 us - optimized readout window)
18+
- _beam2.fcl (for 1 GeV/c period 1, 3, 5 and 8 GeV/c beam data - trigger offset 5000 us - wide readout window)
19+
- _beam_tdeonly.fcl (when data streamed through TDE-DAQ - not DUNE-DAQ)
1720
- Neutrino trigger: _neutrino.fcl
1821
- TDE DAQ: _tdedaq.fcl (data not streamed through the usual DUNE-DAQ pipeline)
1922
- HV scan: _hvXXX.fcl (XXX = high voltage in kV)

fcl/protodunevd/reco/hvscan/standard_reco_stage0_protodunevd_neutrino_hv188.fcl renamed to fcl/protodunevd/reco/hvscan/standard_reco_stage2_protodunevd_neutrino_hv188.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "standard_reco_stage0_protodunevd_neutrino.fcl"
1+
#include "standard_reco_stage2_protodunevd_neutrino.fcl"
22

33
# Set the E-field corresponding to -188 kV
44
services.DetectorPropertiesService.Efield: [0.550,3.125, 5e-1, 3.125]

fcl/protodunevd/reco/hvscan/standard_reco_stage0_protodunevd_offline_hv154.fcl renamed to fcl/protodunevd/reco/hvscan/standard_reco_stage2_protodunevd_offline_hv154.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "standard_reco_stage0_protodunevd_offline.fcl"
1+
#include "standard_reco_stage2_protodunevd_offline.fcl"
22

33
# Set the E-field corresponding to -154.3 kV
44
services.DetectorPropertiesService.Efield: [0.451,3.125, 5e-1, 3.125]

fcl/protodunevd/reco/hvscan/standard_reco_stage0_protodunevd_offline_hv157.fcl renamed to fcl/protodunevd/reco/hvscan/standard_reco_stage2_protodunevd_offline_hv157.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "standard_reco_stage0_protodunevd_offline.fcl"
1+
#include "standard_reco_stage2_protodunevd_offline.fcl"
22

33
# Set the E-field corresponding to -157 kV
44
services.DetectorPropertiesService.Efield: [0.453,3.125, 5e-1, 3.125]

fcl/protodunevd/reco/hvscan/standard_reco_stage0_protodunevd_offline_hv171.fcl renamed to fcl/protodunevd/reco/hvscan/standard_reco_stage2_protodunevd_offline_hv171.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "standard_reco_stage0_protodunevd_offline.fcl"
1+
#include "standard_reco_stage2_protodunevd_offline.fcl"
22

33
# Set the E-field corresponding to -171 kV
44
services.DetectorPropertiesService.Efield: [0.493,3.125, 5e-1, 3.125]

fcl/protodunevd/reco/hvscan/standard_reco_stage0_protodunevd_offline_hv188.fcl renamed to fcl/protodunevd/reco/hvscan/standard_reco_stage2_protodunevd_offline_hv188.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "standard_reco_stage0_protodunevd_offline.fcl"
1+
#include "standard_reco_stage2_protodunevd_offline.fcl"
22

33
# Set the E-field corresponding to -188 kV
44
services.DetectorPropertiesService.Efield: [0.550,3.125, 5e-1, 3.125]

fcl/protodunevd/reco/hvscan/standard_reco_stage0_protodunevd_offline_hv200.fcl renamed to fcl/protodunevd/reco/hvscan/standard_reco_stage2_protodunevd_offline_hv200.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "standard_reco_stage0_protodunevd_offline.fcl"
1+
#include "standard_reco_stage2_protodunevd_offline.fcl"
22

33
# Set the E-field corresponding to -200.4 kV
44
services.DetectorPropertiesService.Efield: [0.587,3.125, 5e-1, 3.125]

0 commit comments

Comments
 (0)