Merge pull request #409 from macndev/artv30800

Art v3_09_00 + geant4 v4_10_7_p01c Upgrade
Mu2e · May 29, 2021 · dcea32f · dcea32f
2 parents c2dc425 + 545d1ad
commit dcea32f
Show file tree

Hide file tree

Showing 243 changed files with 908 additions and 565 deletions.
diff --git a/.muse b/.muse
@@ -1,5 +1,5 @@
 # prefer to build with this environment
-ENVSET p005
+ENVSET p008
 # add these to python path
 PYTHONPATH TrackerAlignment/scripts
 PYTHONPATH Trigger/python

diff --git a/Analyses/src/BFieldPlotter_module.cc b/Analyses/src/BFieldPlotter_module.cc
@@ -14,6 +14,7 @@
 #include "art/Framework/Principal/Handle.h"
 #include "art/Framework/Core/ModuleMacros.h"
 #include "art_root_io/TFileService.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 
 // ROOT includes
 #include "TFile.h"

diff --git a/Analyses/src/CORSIKAGenPlots_module.cc b/Analyses/src/CORSIKAGenPlots_module.cc
@@ -15,6 +15,7 @@
 #include "art/Framework/Principal/SubRun.h"
 #include "art_root_io/TFileService.h"
 #include "art/Framework/Services/Registry/ServiceHandle.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 
 #include "canvas/Utilities/InputTag.h"
 #include "fhiclcpp/ParameterSet.h"

diff --git a/Analyses/src/CRYGenPlots_module.cc b/Analyses/src/CRYGenPlots_module.cc
@@ -15,6 +15,7 @@
 #include "art/Framework/Principal/SubRun.h"
 #include "art_root_io/TFileService.h"
 #include "art/Framework/Services/Registry/ServiceHandle.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 
 #include "canvas/Utilities/InputTag.h"
 #include "fhiclcpp/ParameterSet.h"

diff --git a/Analyses/src/CaloCalib_module.cc b/Analyses/src/CaloCalib_module.cc
@@ -36,6 +36,7 @@
 #include "art/Framework/Principal/Handle.h"
 #include "art/Framework/Principal/Selector.h"
 #include "art/Framework/Principal/Provenance.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 #include "cetlib_except/exception.h"
 #include "fhiclcpp/ParameterSet.h"
 #include "messagefacility/MessageLogger/MessageLogger.h"

diff --git a/Analyses/src/CaloDigiAna_module.cc b/Analyses/src/CaloDigiAna_module.cc
@@ -22,6 +22,7 @@
 #include "art_root_io/TFileDirectory.h"
 #include "messagefacility/MessageLogger/MessageLogger.h"
 #include "art/Framework/Services/Optional/RandomNumberGenerator.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 
 // Mu2e includes.
 #include "CalorimeterGeom/inc/Calorimeter.hh"

diff --git a/Analyses/src/CaloHitFinderInspect_module.cc b/Analyses/src/CaloHitFinderInspect_module.cc
@@ -11,6 +11,7 @@
 #include "art/Framework/Principal/Handle.h"
 #include "art/Framework/Principal/Selector.h"
 #include "art/Framework/Principal/Provenance.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 #include "cetlib_except/exception.h"
 #include "fhiclcpp/ParameterSet.h"
 #include "messagefacility/MessageLogger/MessageLogger.h"

diff --git a/Analyses/src/CaloTrackMatchExample_module.cc b/Analyses/src/CaloTrackMatchExample_module.cc
@@ -35,6 +35,7 @@
 #include "art/Framework/Principal/Handle.h"
 #include "art/Framework/Principal/Selector.h"
 #include "art/Framework/Principal/Provenance.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 #include "cetlib_except/exception.h"
 #include "fhiclcpp/ParameterSet.h"
 #include "messagefacility/MessageLogger/MessageLogger.h"

diff --git a/Analyses/src/CollectionSizeAnalyzer_module.cc b/Analyses/src/CollectionSizeAnalyzer_module.cc
@@ -113,8 +113,7 @@ namespace mu2e {
 
   //================================================================
   void CollectionSizeAnalyzer::doStepPoints(const art::Event& event) {
-    std::vector<art::Handle<StepPointMCCollection> > stepHandles;
-    event.getManyByType(stepHandles);
+    std::vector<art::Handle<StepPointMCCollection> > stepHandles = event.getMany<StepPointMCCollection>();
     for(const auto& c: stepHandles) {
       const std::string cn = getCollectionName(c);
       hStepPointSize_->Fill(cn.c_str(), double(c->size()));
@@ -126,8 +125,7 @@ namespace mu2e {
 
   //================================================================
   void CollectionSizeAnalyzer::doSimParticles(const art::Event& event) {
-    std::vector<art::Handle<SimParticleCollection> > stepHandles;
-    event.getManyByType(stepHandles);
+    std::vector<art::Handle<SimParticleCollection> > stepHandles = event.getMany<SimParticleCollection>();
     for(const auto& c: stepHandles) {
       const std::string cn = getCollectionName(c);
       hSimParticleDistLin_->Fill(cn.c_str(), double(c->size()), 1.);

diff --git a/Analyses/src/DiskCal00_module.cc b/Analyses/src/DiskCal00_module.cc
@@ -236,8 +236,7 @@ namespace mu2e {
 
   void DiskCal00::simCheck(const art::Event& event) {
     typedef std::vector< art::Handle<SimParticleCollection> > HandleVector;
-    HandleVector allSims;
-    event.getManyByType(allSims);
+    HandleVector allSims = event.getMany<SimParticleCollection>();
     cout << "Size: " << allSims.size() << endl;
 
     for ( HandleVector::const_iterator i=allSims.begin(), e=allSims.end(); i != e; ++i ){

diff --git a/Analyses/src/PointerCheck_module.cc b/Analyses/src/PointerCheck_module.cc
@@ -149,62 +149,55 @@ namespace mu2e {
   //================================================================
   void PointerCheck::analyze(art::Event const& event) {
 
-    std::vector< art::Handle<SimParticleCollection> > vah_sp;
-    event.getManyByType(vah_sp);
+    std::vector< art::Handle<SimParticleCollection> > vah_sp = event.getMany<SimParticleCollection>();
     for (auto const & ah : vah_sp) {
       if(!excludedCollection(*ah.provenance(),_SPtags)) {
 	printProvenance(*ah.provenance());
 	checkSimParticle(*ah);
       } // endif excluded
     } // loop over handles
 
-    std::vector< art::Handle<StepPointMCCollection> > vah_st;
-    event.getManyByType(vah_st);
+    std::vector< art::Handle<StepPointMCCollection> > vah_st = event.getMany<StepPointMCCollection>();
     for (auto const & ah : vah_st) {
       if(!excludedCollection(*ah.provenance(),_SPMCtags)) {
 	printProvenance(*ah.provenance());
 	checkStepPointMC(*ah);
       } // endif excluded
     } // loop over handles
 
-    std::vector< art::Handle<MCTrajectoryCollection> > vah_tr;
-    event.getManyByType(vah_tr);
+    std::vector< art::Handle<MCTrajectoryCollection> > vah_tr = event.getMany<MCTrajectoryCollection>();
     for (auto const & ah : vah_tr) {
       if(!excludedCollection(*ah.provenance(),_trajtags)) {
 	printProvenance(*ah.provenance());
 	checkMCTrajectory(*ah);
       } // endif excluded
     } // loop over handles
 
-    std::vector< art::Handle<SimParticlePtrCollection> > vah_pp;
-    event.getManyByType(vah_pp);
+    std::vector< art::Handle<SimParticlePtrCollection> > vah_pp = event.getMany<SimParticlePtrCollection>();
     for (auto const & ah : vah_pp) {
       if(!excludedCollection(*ah.provenance(),_trajtags)) {
 	printProvenance(*ah.provenance());
 	checkSimParticlePtr(*ah);
       } // endif excluded
     } // loop over handles
 
-    std::vector< art::Handle<StrawDigiMCCollection> > vah_sd;
-    event.getManyByType(vah_sd);
+    std::vector< art::Handle<StrawDigiMCCollection> > vah_sd = event.getMany<StrawDigiMCCollection>();
     for (auto const & ah : vah_sd) {
       if(!excludedCollection(*ah.provenance(),_trkDMCtags)) {
 	printProvenance(*ah.provenance());
 	checkStrawDigiMC(*ah);
       } // endif excluded
     } // loop over handles
 
-    std::vector< art::Handle<CaloHitMCCollection> > vah_cd;
-    event.getManyByType(vah_cd);
+    std::vector< art::Handle<CaloHitMCCollection> > vah_cd = event.getMany<CaloHitMCCollection>();
     for (auto const & ah : vah_cd) {
       if(!excludedCollection(*ah.provenance(),_calDMCtags)) {
 	printProvenance(*ah.provenance());
 	checkCaloHitMC(*ah);
       } // endif excluded
     } // loop over handles
     std::cout << "Startgin shower steps" << std::endl;
-    std::vector< art::Handle<CaloShowerStepCollection> > vah_cs;
-    event.getManyByType(vah_cs);
+    std::vector< art::Handle<CaloShowerStepCollection> > vah_cs = event.getMany<CaloShowerStepCollection>();
     for (auto const & ah : vah_cs) {
       if(!excludedCollection(*ah.provenance(),_calCSStags)) {
 	printProvenance(*ah.provenance());
@@ -213,8 +206,7 @@ namespace mu2e {
     } // loop over handles
 
     std::cout << "Starting crvMC" << std::endl;
-    std::vector< art::Handle<CrvDigiMCCollection> > vah_cm;
-    event.getManyByType(vah_cm);
+    std::vector< art::Handle<CrvDigiMCCollection> > vah_cm = event.getMany<CrvDigiMCCollection>();
     for (auto const & ah : vah_cm) {
       if(!excludedCollection(*ah.provenance(),_crvDMCtags)) {
 	printProvenance(*ah.provenance());

diff --git a/Analyses/src/ReadBack_module.cc b/Analyses/src/ReadBack_module.cc
@@ -383,8 +383,7 @@ namespace mu2e {
 
      // These selectors will select data products with the given instance name, and ignore all other fields of the product ID.
      art::ProductInstanceNameSelector getCrystalSteps(_calorimeterStepPoints);
-     HandleVector crystalStepsHandles;
-     event.getMany( getCrystalSteps, crystalStepsHandles);
+     HandleVector crystalStepsHandles = event.getMany<StepPointMCCollection>(getCrystalSteps);
 
      //Calorimeter shower MC
      art::Handle<CaloShowerSimCollection> caloShowerSimHandle;

diff --git a/Analyses/src/ReadCaloDigi_module.cc b/Analyses/src/ReadCaloDigi_module.cc
@@ -26,6 +26,7 @@
 #include "art_root_io/TFileDirectory.h"
 #include "messagefacility/MessageLogger/MessageLogger.h"
 #include "art/Framework/Services/Optional/RandomNumberGenerator.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 
 // Mu2e includes.
 #include "CalorimeterGeom/inc/Calorimeter.hh"
@@ -449,10 +450,9 @@ namespace mu2e {
 
     //Handle to VD steps
     art::ProductInstanceNameSelector selector_vdhits("virtualdetector");
-    StepMCHandleVector vdStepsHandleVec;
     art::Handle<StepPointMCCollection> *vdStepsHandle;
     const StepPointMCCollection *vdHits;
-    event.getMany(selector_vdhits, vdStepsHandleVec);
+    StepMCHandleVector vdStepsHandleVec = event.getMany<StepPointMCCollection>(selector_vdhits);
 
 
     //Handle to tracks collection

diff --git a/Analyses/src/ReadStrawHitReco_module.cc b/Analyses/src/ReadStrawHitReco_module.cc
@@ -21,6 +21,7 @@
 #include "art/Framework/Services/Registry/ServiceHandle.h"
 #include "art_root_io/TFileService.h"
 #include "art/Framework/Principal/Provenance.h"
+#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h"
 
 #include "fhiclcpp/ParameterSet.h"
 

diff --git a/Analyses/src/SConscript b/Analyses/src/SConscript
@@ -15,7 +15,8 @@ babarlibs = env['BABARLIBS']
 
 extrarootlibs = [ 'Geom' ]
 
-mainlib = helper.make_mainlib ( [] )
+mainlib = helper.make_mainlib ( ['fhiclcpp_types',
+                                 'tbb',] )
 
 helper.make_plugins( [ mainlib,
                        'mu2e_TrkExt',
@@ -49,14 +50,16 @@ helper.make_plugins( [ mainlib,
                        'art_Framework_Principal',
                        'art_Framework_Services_Registry',
                        'art_root_io_tfile_support',
-                       'art_root_io_TFileService_service',
+                       'art_root_io_TFileService',
                        'art_Framework_Services_Optional_RandomNumberGenerator_service',
                        'art_Persistency_Common',
                        'art_Persistency_Provenance',
                        'art_Utilities',
                        'canvas',
                        'MF_MessageLogger',
                        'fhiclcpp',
+                       'fhiclcpp_types',
+                       'tbb',
                        'cetlib',
                        'cetlib_except',
                        'CLHEP',
@@ -66,7 +69,6 @@ helper.make_plugins( [ mainlib,
                        extrarootlibs,
                        'xerces-c',
                        'boost_filesystem',
-                       'boost_system',
                        'pthread',
                        'hep_concurrency',
                        'DTCInterface',

diff --git a/Analyses/src/SimParticleCheck00_module.cc b/Analyses/src/SimParticleCheck00_module.cc
@@ -80,8 +80,7 @@ namespace mu2e {
 
   void SimParticleCheck00::analyze(const art::Event& event) {
     typedef std::vector< art::Handle<SimParticleCollection> > HandleVector;
-    HandleVector allSims;
-    event.getManyByType(allSims);
+    HandleVector allSims = event.getMany<SimParticleCollection>();
 
     _hNCollections->Fill(allSims.size());
 

diff --git a/Analyses/src/VMMonitor_module.cc b/Analyses/src/VMMonitor_module.cc
@@ -13,6 +13,7 @@
 
 #include "art/Framework/Core/EDAnalyzer.h"
 #include "art/Framework/Core/ModuleMacros.h"
+#include "art/Framework/Principal/Event.h"
 
 namespace mu2e {
 

diff --git a/BFieldTest/src/SConscript b/BFieldTest/src/SConscript
@@ -20,19 +20,20 @@ helper.make_plugins( [
         'art_Framework_Principal',
         'art_Framework_Services_Registry',
         'art_root_io_tfile_support',
-        'art_root_io_TFileService_service',
+        'art_root_io_TFileService',
         'art_Persistency_Common',
         'art_Persistency_Provenance',
         'art_Utilities',
         'canvas',
         'MF_MessageLogger',
         'fhiclcpp',
+        'fhiclcpp_types',
+        'tbb',
         'cetlib',
         'cetlib_except',
         'CLHEP',
         rootlibs,
         'boost_filesystem',
-        'boost_system',
         # 'pthread',
         ] )
 

diff --git a/BTrkData/src/SConscript b/BTrkData/src/SConscript
@@ -24,7 +24,6 @@ mainlib = helper.make_mainlib ( [
     'cetlib',
     'cetlib_except',
     'CLHEP',
-    'boost_system',
 ] )
 
 

diff --git a/CRVAnalysis/src/SConscript b/CRVAnalysis/src/SConscript
@@ -40,7 +40,6 @@ mainlib = helper.make_mainlib ( [ 'CLHEP',
                                   'art_Persistency_Provenance',
                                   'art_Utilities',
                                   'canvas',
-                                  'boost_system',
                                   'cetlib',
                                   'cetlib_except',
                                   'Core']

diff --git a/CRVFilters/src/SConscript b/CRVFilters/src/SConscript
@@ -21,6 +21,8 @@ helper.make_plugins( [ mainlib,
                        'art_Utilities',
                        'canvas',
                        'fhiclcpp',
+                       'fhiclcpp_types',
+                       'tbb',
                        'cetlib',
                        'cetlib_except',
                        rootlibs,

diff --git a/CRVResponse/src/CrvStepsFromStepPointMCs_module.cc b/CRVResponse/src/CrvStepsFromStepPointMCs_module.cc
@@ -12,6 +12,7 @@
 #include "fhiclcpp/types/Atom.h"
 #include "fhiclcpp/types/Sequence.h"
 #include "canvas/Utilities/InputTag.h"
+#include "messagefacility/MessageLogger/MessageLogger.h"
 
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "GeometryService/inc/GeomHandle.hh"

diff --git a/CRVResponse/src/SConscript b/CRVResponse/src/SConscript
@@ -47,21 +47,22 @@ helper.make_plugins( [ mainlib,
                        'art_Framework_Principal',
                        'art_Framework_Services_Registry',
                        'art_root_io_tfile_support',
-                       'art_root_io_TFileService_service',
+                       'art_root_io_TFileService',
                        'art_Framework_Services_Optional_RandomNumberGenerator_service',
                        'art_Persistency_Common',
                        'art_Persistency_Provenance',
                        'art_Utilities',
                        'canvas',
                        'MF_MessageLogger',
                        'fhiclcpp',
+                       'fhiclcpp_types',
+                       'tbb',
                        'cetlib',
                        'cetlib_except',
                        'CLHEP',
                        'HepPDT',
                        rootlibs,
                        'boost_filesystem',
-                       'boost_system',
                        ] )
 
 # this tells emacs to view this file in python mode.

diff --git a/CalPatRec/src/MergePatRec_module.cc b/CalPatRec/src/MergePatRec_module.cc
@@ -268,11 +268,11 @@ namespace mu2e {
 
     if (_debugLevel > 0) ObjectDumpUtils::printEventHeader(&AnEvent,"MergePatRec::produce");
 
-    AnEvent.getByToken(_tprToken, htpr);
-    AnEvent.getByToken(_cprToken, hcpr);
+    htpr = AnEvent.getHandle<mu2e::KalRepPtrCollection>(_tprToken);
+    hcpr = AnEvent.getHandle<mu2e::KalRepPtrCollection>(_cprToken);
 
-    AnEvent.getByToken(_stprToken, hstpr);
-    AnEvent.getByToken(_scprToken, hscpr);
+    hstpr = AnEvent.getHandle<KalSeedCollection>(_stprToken);
+    hscpr = AnEvent.getHandle<KalSeedCollection>(_scprToken);
 
     _data.event = &AnEvent;
     _data.list_of_kreps_tpr = nullptr;