Merge branch 'release/v09_75_00d00'

DUNE · May 26, 2023 · 2321738 · 2321738
2 parents 63b4cf0 + 191d5b5
commit 2321738
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@
 cmake_minimum_required (VERSION 3.19 FATAL_ERROR)
 
 project(duneopdet LANGUAGES CXX)
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.72.01d00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.75.00d00)
 
 # cetbuildtools contains our cmake modules
 find_package(cetbuildtools REQUIRED)

diff --git a/duneopdet/OpticalDetector/SIPMOpSensorSim_module.cc b/duneopdet/OpticalDetector/SIPMOpSensorSim_module.cc
@@ -140,7 +140,9 @@ namespace opdet {
     , fInputToken{   consumes< std::vector<sim::OpDetBacktrackerRecord> >(fInputTag) }
     , fDarkNoiseRate{config().DarkNoiseRate()}
     , fCrossTalk{    config().CrossTalk()}
-    , fSIPMEngine(   art::ServiceHandle<rndm::NuRandomService>()->createEngine(*this, 
+    , fSIPMEngine(
+        art::ServiceHandle<rndm::NuRandomService>()->registerAndSeedEngine(
+          createEngine(0, "HepJamesRandom", "sipm"),
                                                                                "HepJamesRandom",
                                                                                "sipm", 
                                                                                config.get_PSet(), 

diff --git a/duneopdet/OpticalDetector/WaveformDigitizerSim_module.cc b/duneopdet/OpticalDetector/WaveformDigitizerSim_module.cc
@@ -313,7 +313,8 @@ namespace opdet {
 
     , fFullWaveformOutput{  config().FullWaveformOutput() }
 
-    , fOpDigiEngine( art::ServiceHandle<rndm::NuRandomService>()->createEngine(*this, 
+    , fOpDigiEngine( art::ServiceHandle<rndm::NuRandomService>()->registerAndSeedEngine(
+        createEngine(0, "HepJamesRandom", "waveformdigi"),
                                                                                "HepJamesRandom",
                                                                                "waveformdigi", 
                                                                                config.get_PSet(), 
@@ -615,4 +616,3 @@ namespace opdet {
 
 
 } // end namespace
-
diff --git a/duneopdet/PhotonPropagation/PhotonLibraryPropagationS2_module.cc b/duneopdet/PhotonPropagation/PhotonLibraryPropagationS2_module.cc
@@ -89,8 +89,10 @@ phot::PhotonLibraryPropagationS2::PhotonLibraryPropagationS2(fhicl::ParameterSet
   : EDProducer{p}
   , fDriftEModuleLabel{p.get< std::string >("DriftEModuleLabel")}
   , fGain{p.get<double>("Gain",500)}
-  , fPhotonEngine(art::ServiceHandle<rndm::NuRandomService>()->createEngine(*this, "HepJamesRandom", "photon", p, "SeedPhoton"))
-  , fScintTimeEngine(art::ServiceHandle<rndm::NuRandomService>()->createEngine(*this, "HepJamesRandom", "scinttime", p, "SeedScintTime"))
+  , fPhotonEngine(art::ServiceHandle<rndm::NuRandomService>()->registerAndSeedEngine(
+      createEngine(0, "HepJamesRandom", "photon"), "HepJamesRandom", "photon", p, "SeedPhoton"))
+  , fScintTimeEngine(art::ServiceHandle<rndm::NuRandomService>()->registerAndSeedEngine(
+      createEngine(0, "HepJamesRandom", "scinttime"), "HepJamesRandom", "scinttime", p, "SeedScintTime"))
 {
   art::ServiceHandle<sim::LArG4Parameters> lgp;
 

diff --git a/ups/product_deps b/ups/product_deps
@@ -25,7 +25,7 @@ fwdir  product_dir config_data
 
 product          version
 cetbuildtools	 v8_20_00	-	only_for_build
-dunecore         v09_72_01d00
+dunecore         v09_75_00d00
 end_product_list