Merge pull request #742 from macndev/art311

Art v3_11 Upgrade
Mu2e · Mar 24, 2022 · cb03ed5 · cb03ed5
2 parents 1e83155 + 7128256
commit cb03ed5
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 388 deletions.
diff --git a/.muse b/.muse
@@ -1,5 +1,5 @@
 # prefer to build with this environment
-ENVSET p021
+ENVSET p022
 # add these to python path
 PYTHONPATH Trigger/python
 # add Offline/bin to path

diff --git a/Analyses/src/TestKalRepProvenanceHelpers_module.cc b/Analyses/src/TestKalRepProvenanceHelpers_module.cc
diff --git a/EventGenerator/src/CORSIKAEventGenerator_module.cc b/EventGenerator/src/CORSIKAEventGenerator_module.cc
@@ -132,7 +132,7 @@ namespace mu2e {
   {
     std::unique_ptr<CosmicLivetime> livetime(new CosmicLivetime(_primaries, _area, _lowE, _highE, _fluxConstant));
     std::cout << *livetime << std::endl;
-    subrun.put(std::move(livetime));
+    subrun.put(std::move(livetime), art::fullSubRun());
   }
 
   void CorsikaEventGenerator::produce(art::Event &evt)

diff --git a/EventGenerator/src/CRYEventGenerator_module.cc b/EventGenerator/src/CRYEventGenerator_module.cc
@@ -83,7 +83,7 @@ namespace mu2e {
                                                                 1.8e4, // http://pdg.lbl.gov/2018/reviews/rpp2018-rev-cosmic-rays.pdf eq. 29.2
                                                                 cryGen->getLiveTime()  ));
     std::cout << *livetime << std::endl;
-    subrun.put(std::move(livetime));
+    subrun.put(std::move(livetime), art::fullSubRun());
   }
 
 }

diff --git a/EventGenerator/src/GenEventCounter_module.cc b/EventGenerator/src/GenEventCounter_module.cc
@@ -71,7 +71,7 @@ namespace mu2e {
     mf::LogInfo("Summary")<<"Creating GenEventCount record: "<<seenEvents_
                           <<" events for "<<sr.id()<<"\n";
 
-    sr.put(std::unique_ptr<GenEventCount>(new GenEventCount(seenEvents_)));
+    sr.put(std::unique_ptr<GenEventCount>(new GenEventCount(seenEvents_)), art::fullSubRun());
 
     seenEvents_ = 0; // in case the job has more than one subrun
   }

diff --git a/EventMixing/src/Mu2eProductMixer.cc b/EventMixing/src/Mu2eProductMixer.cc
@@ -186,14 +186,14 @@ namespace mu2e {
         (*col)[stage].insert(subrunVolumes_[stage].begin(), subrunVolumes_[stage].end());
       }
 
-      sr.put(std::move(col), subrunVolInstanceName_);
+      sr.put(std::move(col), subrunVolInstanceName_, art::fullSubRun());
     }
     if (mixCosmicLivetimes_) {
       if(generatedEvents_ == 0)throw cet::exception("BADINPUT")<<"Mu2eProductMixer: generated event count =0; was the mixin file opened correctly?" << std::endl;
       float scaling = resampledEvents_ / generatedEvents_;
       auto livetime = std::make_unique<CosmicLivetime>(totalPrimaries_ * scaling,
                                                        area_, lowE_, highE_, fluxConstant_, livetime_ * scaling);
-      sr.put(std::move(livetime), subrunLivetimeInstanceName_);
+      sr.put(std::move(livetime), subrunLivetimeInstanceName_, art::fullSubRun());
     }
   }
 

diff --git a/EventMixing/src/ProtonBunchIntensityFlat_module.cc b/EventMixing/src/ProtonBunchIntensityFlat_module.cc
@@ -74,7 +74,7 @@ namespace mu2e {
   }
 
   void ProtonBunchIntensityFlat::beginSubRun(art::SubRun & subrun ) {
-    subrun.put(std::make_unique<ProtonBunchIntensity>(static_cast<unsigned long long>(llrint(mean_))),"MeanIntensity");
+    subrun.put(std::make_unique<ProtonBunchIntensity>(static_cast<unsigned long long>(llrint(mean_))),"MeanIntensity", art::fullSubRun());
   }
 
 }

diff --git a/EventMixing/src/ProtonBunchIntensityLogNormal_module.cc b/EventMixing/src/ProtonBunchIntensityLogNormal_module.cc
@@ -119,7 +119,7 @@ namespace mu2e {
 
   //================================================================
   void ProtonBunchIntensityLogNormal::beginSubRun(art::SubRun & subrun ) {
-    subrun.put(std::make_unique<ProtonBunchIntensity>(static_cast<unsigned long long>(llrint(mean_))),"MeanIntensity");
+    subrun.put(std::make_unique<ProtonBunchIntensity>(static_cast<unsigned long long>(llrint(mean_))),"MeanIntensity", art::fullSubRun());
   }
 
   //================================================================

diff --git a/Filters/src/CompressPhysicalVolumes_module.cc b/Filters/src/CompressPhysicalVolumes_module.cc
@@ -140,7 +140,7 @@ namespace mu2e {
       }
     }
 
-    sr.put(std::move(out));
+    sr.put(std::move(out), art::fullSubRun());
 
     mf::LogInfo("Summary")
       << "CompressPhysicalVolumes stats: passed "

diff --git a/GeometryService/src/GeometryRecorder_module.cc b/GeometryService/src/GeometryRecorder_module.cc
diff --git a/GlobalConstantsService/src/SConscript b/GlobalConstantsService/src/SConscript
@@ -30,6 +30,8 @@ helper.make_plugins( [ mainlib,
                        'art_Utilities',
                        'canvas',
                        'boost_filesystem',
+                       'cetlib',
+                       'cetlib_except',
                        ] )
 
 # This tells emacs to view this file in python mode.

diff --git a/Mu2eG4/inc/Mu2eG4Inputs.hh b/Mu2eG4/inc/Mu2eG4Inputs.hh
@@ -7,6 +7,7 @@
 #include <vector>
 #include <optional>
 
+#include "cetlib/maybe_ref.h"
 #include "canvas/Utilities/InputTag.h"
 #include "Offline/Mu2eG4/inc/Mu2eG4Config.hh"
 #include "Offline/Mu2eG4/inc/Mu2eG4PrimaryType.hh"
@@ -25,6 +26,33 @@ namespace mu2e {
 
   class Mu2eG4Inputs {
   public:
+
+    // The two elements of the return value of the function inputSimParticles.
+    // The maybe_ref is not valid if there are no input sim particles, either for
+    // initial stage jobs, or for non-filtered multistage input when the
+    // input event has no primaries for the current stage.
+    struct InputSimsInfo{
+      cet::maybe_ref<cet::map_vector<mu2e::SimParticle> const > sims;
+      art::ProductID                                            id;
+
+      InputSimsInfo ():
+        sims(), id(){
+      }
+
+      InputSimsInfo ( cet::map_vector<mu2e::SimParticle> const&  asims
+                      , art::ProductID const& aid):
+        sims(asims), id(aid){
+      }
+
+      void reseat( cet::map_vector<mu2e::SimParticle> const&  asims
+                   , art::ProductID const& aid){
+        sims.reseat(asims);
+        id   = aid;
+      }
+
+      bool isValid() const { return sims.isValid(); };
+    };
+
     explicit Mu2eG4Inputs(const Mu2eG4Config::Inputs_& conf);
 
     bool multiStage() const { return multiStage_; }
@@ -41,10 +69,7 @@ namespace mu2e {
 
     const std::optional<EventLevelVolInfos>& updateEventLevelVolumeInfos() const { return elvi_; }
 
-    // The handle is not valid if there are no input sim particles, either for
-    // initial stage jobs, or for non-filtered multistage input when the
-    // input event has no primaries for the current stage.
-    art::Handle<SimParticleCollection> inputSimParticles(const art::Event& evt) const;
+    InputSimsInfo inputSimParticles(const art::Event& evt) const;
 
   private:
     Mu2eG4PrimaryType primaryType_;

diff --git a/Mu2eG4/src/IonProducer_module.cc b/Mu2eG4/src/IonProducer_module.cc
@@ -82,7 +82,7 @@ namespace mu2e {
     // content for the ion test use, but we still need a stage count.
     mvi->resize(1);
 
-    sr.put(std::move(mvi));
+    sr.put(std::move(mvi), art::fullSubRun());
   }
 
   //================================================================
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,7 @@ namespace mu2e { @@
       }
       void ProtonBunchIntensityFlat::beginSubRun(art::SubRun & subrun ) {
-        subrun.put(std::make_unique<ProtonBunchIntensity>(static_cast<unsigned long long>(llrint(mean_))),"MeanIntensity");
+        subrun.put(std::make_unique<ProtonBunchIntensity>(static_cast<unsigned long long>(llrint(mean_))),"MeanIntensity", art::fullSubRun());
       }
     }
@@ Expand Down @@