Merge branch 'release/v10_20_03d01'

wyjang-uta · wyjang-uta · commit d4e4afa87aff · 2026-03-27T16:32:49.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required (VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules REQUIRED)
 project(dunesw LANGUAGES CXX)
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.03d00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.03d01)
 
 include(CetCMakeEnv)
 cet_cmake_env()
diff --git a/fcl/dunefd/reco/reco2_atmos_dune10kt_1x2x6_geov5_reprocess.fcl b/fcl/dunefd/reco/reco2_atmos_dune10kt_1x2x6_geov5_reprocess.fcl
@@ -0,0 +1,3 @@
+#include "reco2_atmos_dune10kt_1x2x6_geov5.fcl"
+
+process_name: "Reco2Reprocess"
diff --git a/fcl/dunefd/reco/workflow_reco_dune10kt.fcl b/fcl/dunefd/reco/workflow_reco_dune10kt.fcl
@@ -162,6 +162,12 @@ dunefd_horizdrift_cvn:
     cvneva
 ]
 
+dunefd_horizdrift_dlreco:
+[
+    @sequence::dunefd_horizdrift_cvn,
+    emtrkmichelid
+]
+
 dunefd_horizdrift_nuenergy:
 [
     energyrecnumu,
@@ -199,7 +205,7 @@ dunefd_horizdrift_workflow_reco2:
 #@sequence::dunefd_horizdrift_pmtrack_trajcluster,
 #@sequence::dunefd_horizdrift_pmtrack_trajcluster_pfp,
 #@sequence::dunefd_horizdrift_pmtrack_showers,
-    @sequence::dunefd_horizdrift_cvn,
+    @sequence::dunefd_horizdrift_dlreco,
     @sequence::dunefd_horizdrift_nuenergy,
     @sequence::dunefd_horizdrift_pd_reco1,
     @sequence::dunefd_horizdrift_pd_reco2,
@@ -372,8 +378,8 @@ dunefd_horizdrift_producers.emtrkmichelid.PointIdAlg.PatchSizeD:      48
 dunefd_horizdrift_producers.emtrkmichelid.PointIdAlg.DriftWindow:     6
 dunefd_horizdrift_producers.emtrkmichelid.PointIdAlg.DownscaleFn:     "mean"
 dunefd_horizdrift_producers.emtrkmichelid.PointIdAlg.DownscaleFullView: false
-dunefd_horizdrift_producers.emtrkmichelid.HitModuleLabel:             "linecluster"
-dunefd_horizdrift_producers.emtrkmichelid.ClusterModuleLabel:         "linecluster"
+dunefd_horizdrift_producers.emtrkmichelid.HitModuleLabel:             "hitfd"
+dunefd_horizdrift_producers.emtrkmichelid.ClusterModuleLabel:         "pandora"
 dunefd_horizdrift_producers.emtrkmichelid.Views:                      []
 
 dunefd_horizdrift_producers.emshower.ClusterModuleLabel:    "pandora"
diff --git a/fcl/protodunevd/README.md b/fcl/protodunevd/README.md
@@ -25,7 +25,8 @@ The default PDS+CRP+CRT simulation and reconstruction chain makes use of
 - protodunevd_g4_stage1.fcl
 - protodunevd_g4_stage2.fcl
 - protodunevd_detsim.fcl
-- protodunevd_reco.fcl
+- standard_reco_stage0_protodunevd_sim.fcl
+- standard_reco_stage1_protodunevd_sim.fcl
 
 Other configuration are available by default:
 
diff --git a/test/ci/ci_test_reco1_dunefd.fcl b/test/ci/ci_test_reco1_dunefd.fcl
@@ -0,0 +1,9 @@
+#include "standard_reco1_dune10kt_1x2x6.fcl"
+
+services.NuRandomService.policy: "preDefinedSeed"
+services.NuRandomService.baseSeed: 1234
+
+#services.RandomNumberGenerator.restoreFrom: "RecoRandomSeeds_Ref_dunefd.dat"
+#services.RandomNumberGenerator.saveTo: "RecoRandomSeeds.dat"
+
+#outputs.out1.fastCloning: false
diff --git a/test/ci/ci_test_reco2_dunefd.fcl b/test/ci/ci_test_reco2_dunefd.fcl
@@ -0,0 +1,9 @@
+#include "standard_reco2_dune10kt_nu_1x2x6.fcl"
+
+services.NuRandomService.policy: "preDefinedSeed"
+services.NuRandomService.baseSeed: 1234
+
+#services.RandomNumberGenerator.restoreFrom: "RecoRandomSeeds_Ref_dunefd.dat"
+#services.RandomNumberGenerator.saveTo: "RecoRandomSeeds.dat"
+
+#outputs.out1.fastCloning: false
diff --git a/test/ci/ci_tests.cfg b/test/ci/ci_tests.cfg
diff --git a/ups/product_deps b/ups/product_deps

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "reco2_atmos_dune10kt_1x2x6_geov5.fcl"`
	`2`	`+`
	`3`	`+process_name: "Reco2Reprocess"`