diff --git a/.muse b/.muse index b0d87ea214..4e520ab6ad 100644 --- 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 index 7e7b9c7f21..17d6674db1 100644 --- 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 index 33bcaa2edb..85cb776ac5 100644 --- 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 index d8ced9cd40..fd1f380e26 100644 --- 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 index 73c77294ee..26dd579306 100644 --- 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 index 4b5e4b6fc2..e6982ce514 100644 --- 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 index 9a364caf11..06ec872c2f 100644 --- 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 index 94ba3018c1..947b3dd11a 100644 --- 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 index 26f825897e..df1e5b4c22 100644 --- 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 > stepHandles; - event.getManyByType(stepHandles); + std::vector > stepHandles = event.getMany(); 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 > stepHandles; - event.getManyByType(stepHandles); + std::vector > stepHandles = event.getMany(); 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 index 2998b25d17..95a8877b25 100644 --- 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 > HandleVector; - HandleVector allSims; - event.getManyByType(allSims); + HandleVector allSims = event.getMany(); 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 index f2a8816fd4..3a30272025 100644 --- a/Analyses/src/PointerCheck_module.cc +++ b/Analyses/src/PointerCheck_module.cc @@ -149,8 +149,7 @@ namespace mu2e { //================================================================ void PointerCheck::analyze(art::Event const& event) { - std::vector< art::Handle > vah_sp; - event.getManyByType(vah_sp); + std::vector< art::Handle > vah_sp = event.getMany(); for (auto const & ah : vah_sp) { if(!excludedCollection(*ah.provenance(),_SPtags)) { printProvenance(*ah.provenance()); @@ -158,8 +157,7 @@ namespace mu2e { } // endif excluded } // loop over handles - std::vector< art::Handle > vah_st; - event.getManyByType(vah_st); + std::vector< art::Handle > vah_st = event.getMany(); for (auto const & ah : vah_st) { if(!excludedCollection(*ah.provenance(),_SPMCtags)) { printProvenance(*ah.provenance()); @@ -167,8 +165,7 @@ namespace mu2e { } // endif excluded } // loop over handles - std::vector< art::Handle > vah_tr; - event.getManyByType(vah_tr); + std::vector< art::Handle > vah_tr = event.getMany(); for (auto const & ah : vah_tr) { if(!excludedCollection(*ah.provenance(),_trajtags)) { printProvenance(*ah.provenance()); @@ -176,8 +173,7 @@ namespace mu2e { } // endif excluded } // loop over handles - std::vector< art::Handle > vah_pp; - event.getManyByType(vah_pp); + std::vector< art::Handle > vah_pp = event.getMany(); for (auto const & ah : vah_pp) { if(!excludedCollection(*ah.provenance(),_trajtags)) { printProvenance(*ah.provenance()); @@ -185,8 +181,7 @@ namespace mu2e { } // endif excluded } // loop over handles - std::vector< art::Handle > vah_sd; - event.getManyByType(vah_sd); + std::vector< art::Handle > vah_sd = event.getMany(); for (auto const & ah : vah_sd) { if(!excludedCollection(*ah.provenance(),_trkDMCtags)) { printProvenance(*ah.provenance()); @@ -194,8 +189,7 @@ namespace mu2e { } // endif excluded } // loop over handles - std::vector< art::Handle > vah_cd; - event.getManyByType(vah_cd); + std::vector< art::Handle > vah_cd = event.getMany(); for (auto const & ah : vah_cd) { if(!excludedCollection(*ah.provenance(),_calDMCtags)) { printProvenance(*ah.provenance()); @@ -203,8 +197,7 @@ namespace mu2e { } // endif excluded } // loop over handles std::cout << "Startgin shower steps" << std::endl; - std::vector< art::Handle > vah_cs; - event.getManyByType(vah_cs); + std::vector< art::Handle > vah_cs = event.getMany(); 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 > vah_cm; - event.getManyByType(vah_cm); + std::vector< art::Handle > vah_cm = event.getMany(); 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 index 06beaea973..f085b86a7d 100644 --- 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(getCrystalSteps); //Calorimeter shower MC art::Handle caloShowerSimHandle; diff --git a/Analyses/src/ReadCaloDigi_module.cc b/Analyses/src/ReadCaloDigi_module.cc index 186caa2359..95ada7131c 100644 --- 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 *vdStepsHandle; const StepPointMCCollection *vdHits; - event.getMany(selector_vdhits, vdStepsHandleVec); + StepMCHandleVector vdStepsHandleVec = event.getMany(selector_vdhits); //Handle to tracks collection diff --git a/Analyses/src/ReadStrawHitReco_module.cc b/Analyses/src/ReadStrawHitReco_module.cc index c3a4f651cd..90c850f493 100644 --- 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 index e6ea54d1f3..3161d0f6ac 100644 --- 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,7 +50,7 @@ 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', @@ -57,6 +58,8 @@ helper.make_plugins( [ mainlib, '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 index 26465a8094..419e4d57f6 100644 --- 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 > HandleVector; - HandleVector allSims; - event.getManyByType(allSims); + HandleVector allSims = event.getMany(); _hNCollections->Fill(allSims.size()); diff --git a/Analyses/src/VMMonitor_module.cc b/Analyses/src/VMMonitor_module.cc index 5379275cf7..34056780a3 100644 --- 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 index f107037dec..02ddb53bda 100644 --- 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 index 0670ad6ddf..d8f108c4e0 100644 --- 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 index 81e579bce4..29a4b1184f 100644 --- 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 index d6b0a3fb93..d7e3b9614e 100644 --- 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 index 854cb6d0a6..8a0cecc2a7 100644 --- 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 index 51c23f35cf..3e6382b0b5 100644 --- a/CRVResponse/src/SConscript +++ b/CRVResponse/src/SConscript @@ -47,7 +47,7 @@ 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', @@ -55,13 +55,14 @@ helper.make_plugins( [ mainlib, '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 index 03cde4038d..93f7e2c4ba 100644 --- 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(_tprToken); + hcpr = AnEvent.getHandle(_cprToken); - AnEvent.getByToken(_stprToken, hstpr); - AnEvent.getByToken(_scprToken, hscpr); + hstpr = AnEvent.getHandle(_stprToken); + hscpr = AnEvent.getHandle(_scprToken); _data.event = &AnEvent; _data.list_of_kreps_tpr = nullptr; diff --git a/CalPatRec/src/SConscript b/CalPatRec/src/SConscript index a23ffa3373..3a5ea27898 100644 --- a/CalPatRec/src/SConscript +++ b/CalPatRec/src/SConscript @@ -39,20 +39,20 @@ mainlib = helper.make_mainlib( [ 'mu2e_TrkDiag', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', 'cetlib', 'cetlib_except', rootlibs, extrarootlibs, 'CLHEP', 'xerces-c', - 'boost_system', ] ) helper.make_plugins( [ mainlib, @@ -77,7 +77,7 @@ 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', @@ -92,7 +92,6 @@ helper.make_plugins( [ mainlib, extrarootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) helper.make_dict_and_map( [ mainlib, @@ -116,20 +115,21 @@ helper.make_dict_and_map( [ mainlib, 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, extrarootlibs, 'CLHEP', 'xerces-c', - 'boost_system', ] ) # This tells emacs to view this file in python mode. diff --git a/CaloCluster/src/CaloClusterFast_module.cc b/CaloCluster/src/CaloClusterFast_module.cc index 5778c14c6c..8c003ab5a7 100644 --- a/CaloCluster/src/CaloClusterFast_module.cc +++ b/CaloCluster/src/CaloClusterFast_module.cc @@ -71,8 +71,7 @@ namespace mu2e { void CaloClusterFast::produce(art::Event& event) { - art::Handle caloHitsHandle; - event.getByToken(caloCrystalToken_, caloHitsHandle); + art::Handle caloHitsHandle = event.getHandle(caloCrystalToken_); auto caloClusters = std::make_unique(); makeClusters(*caloClusters,caloHitsHandle); diff --git a/CaloCluster/src/CaloProtoClusterMaker_module.cc b/CaloCluster/src/CaloProtoClusterMaker_module.cc index 3e90fd22a9..75dce45b2d 100644 --- a/CaloCluster/src/CaloProtoClusterMaker_module.cc +++ b/CaloCluster/src/CaloProtoClusterMaker_module.cc @@ -105,9 +105,8 @@ namespace mu2e { if( !(geom->hasElement()) ) return; // Get handles to calorimeter crystal hits - art::Handle CaloHitsHandle; - bool const success = event.getByToken(caloCrystalToken_, CaloHitsHandle); - if (!success) return; + art::Handle CaloHitsHandle = event.getHandle(caloCrystalToken_); + if ( ! CaloHitsHandle ) return; // Create a new CaloCluster collection and fill it auto caloProtoClustersMain = std::make_unique(); diff --git a/CaloCluster/src/SConscript b/CaloCluster/src/SConscript index ab2dbd0e21..6183085038 100644 --- a/CaloCluster/src/SConscript +++ b/CaloCluster/src/SConscript @@ -30,18 +30,19 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'art_Persistency_Provenance', 'canvas', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', 'art_Utilities', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, - 'boost_system' ] ) helper.make_plugins( [ mainlib, @@ -57,20 +58,21 @@ 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', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'TMVA', 'xerces-c', #needed for MVA 'boost_filesystem', - 'boost_system', rootlibs ], ) diff --git a/CaloDiag/src/CaloNeutron_module.cc b/CaloDiag/src/CaloNeutron_module.cc index b0a1a8e32e..bf44be16cb 100644 --- a/CaloDiag/src/CaloNeutron_module.cc +++ b/CaloDiag/src/CaloNeutron_module.cc @@ -208,8 +208,7 @@ namespace mu2e { void CaloNeutron::endSubRun(const art::SubRun& sr) { - std::vector > hh; - sr.getManyByType(hh); + std::vector > hh = sr.getMany(); if(hh.size() > 1) { @@ -268,10 +267,10 @@ namespace mu2e { // Get the StepPointMCs from the event. HandleVector crystalStepsHandles, ROStepsHandles,ROCardStepsHandles,CrateStepsHandles; - event.getMany( getCrystalSteps, crystalStepsHandles); - event.getMany( getROSteps, ROStepsHandles); - event.getMany( getROCardSteps, ROCardStepsHandles); - event.getMany( getCrateSteps, CrateStepsHandles); + crystalStepsHandles = event.getMany(getCrystalSteps); + ROStepsHandles = event.getMany(getROSteps); + ROCardStepsHandles = event.getMany(getROCardSteps); + CrateStepsHandles = event.getMany(getCrateSteps); diff --git a/CaloDiag/src/SConscript b/CaloDiag/src/SConscript index e6ea54d1f3..3161d0f6ac 100644 --- a/CaloDiag/src/SConscript +++ b/CaloDiag/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,7 +50,7 @@ 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', @@ -57,6 +58,8 @@ helper.make_plugins( [ mainlib, '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/CaloFilters/src/FilterEcalNNTrigger_module.cc b/CaloFilters/src/FilterEcalNNTrigger_module.cc index a66461cbbc..325704522b 100644 --- a/CaloFilters/src/FilterEcalNNTrigger_module.cc +++ b/CaloFilters/src/FilterEcalNNTrigger_module.cc @@ -72,8 +72,7 @@ namespace mu2e { bool FilterEcalNNTrigger::filter(art::Event& event) { - art::Handle caloClustersHandle; - event.getByToken(caloClusterToken_, caloClustersHandle); + art::Handle caloClustersHandle = event.getHandle(caloClusterToken_); auto trigInfo = std::make_unique(); bool retval = filterClusters(caloClustersHandle, *trigInfo); diff --git a/CaloFilters/src/SConscript b/CaloFilters/src/SConscript index 0fbb9187f4..d1b0e9283a 100644 --- a/CaloFilters/src/SConscript +++ b/CaloFilters/src/SConscript @@ -46,7 +46,7 @@ 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', @@ -54,6 +54,8 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -63,7 +65,6 @@ helper.make_plugins( [ mainlib, extrarootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) # this tells emacs to view this file in python mode. diff --git a/CaloMC/src/CaloNoiseSimGenerator.cc b/CaloMC/src/CaloNoiseSimGenerator.cc index d6f4c50324..2f9240e6d9 100644 --- a/CaloMC/src/CaloNoiseSimGenerator.cc +++ b/CaloMC/src/CaloNoiseSimGenerator.cc @@ -15,6 +15,7 @@ #include #include #include +#include diff --git a/CaloMC/src/SConscript b/CaloMC/src/SConscript index 9ba121d6a7..d8fb16b30a 100644 --- a/CaloMC/src/SConscript +++ b/CaloMC/src/SConscript @@ -33,17 +33,18 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'art_Persistency_Provenance', 'canvas', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, - 'boost_system', 'Minuit' ] ) @@ -61,19 +62,20 @@ 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', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'HepPDT', 'boost_filesystem', - 'boost_system', rootlibs #needed for reco hit fitting ], ) diff --git a/CaloReco/src/CaloTemplateWFProcessor.cc b/CaloReco/src/CaloTemplateWFProcessor.cc index dbe1b80ffd..0397b2fa6e 100644 --- a/CaloReco/src/CaloTemplateWFProcessor.cc +++ b/CaloReco/src/CaloTemplateWFProcessor.cc @@ -11,6 +11,7 @@ #include #include #include +#include namespace mu2e { diff --git a/CaloReco/src/SConscript b/CaloReco/src/SConscript index de48db7abe..bac8f68963 100644 --- a/CaloReco/src/SConscript +++ b/CaloReco/src/SConscript @@ -26,18 +26,19 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'art_Persistency_Provenance', 'canvas', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', 'art_Utilities', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, - 'boost_system', 'Minuit' ] ) @@ -54,18 +55,19 @@ 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', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'boost_filesystem', - 'boost_system', rootlibs ], ) diff --git a/CommonMC/src/GenEventCountReader_module.cc b/CommonMC/src/GenEventCountReader_module.cc index 40b8138ebf..3363b00048 100644 --- a/CommonMC/src/GenEventCountReader_module.cc +++ b/CommonMC/src/GenEventCountReader_module.cc @@ -59,8 +59,7 @@ namespace mu2e { void GenEventCountReader::endSubRun(const art::SubRun& sr) { // We expect exactly one object of type GenEventCount per SubRun. - std::vector > hh; - sr.getManyByType(hh); + std::vector > hh = sr.getMany(); if(hh.size() > 1) { std::ostringstream os; os<<"GenEventCountReader: multiple GenEventCount objects found in " diff --git a/CommonMC/src/GenerateCosmicTimes_module.cc b/CommonMC/src/GenerateCosmicTimes_module.cc index 25d57bb926..b4db91ff2f 100644 --- a/CommonMC/src/GenerateCosmicTimes_module.cc +++ b/CommonMC/src/GenerateCosmicTimes_module.cc @@ -161,8 +161,7 @@ namespace mu2e { // Generate and record offsets for all primaries - std::vector > colls; - event.getManyByType(colls); + std::vector > colls = event.getMany(); for(const auto& ih : colls) { for(const auto& iter : *ih) { if(iter.second.isPrimary()) { diff --git a/CommonMC/src/GenerateMuonLife_module.cc b/CommonMC/src/GenerateMuonLife_module.cc index 5eeb6efeee..9c351f32e5 100644 --- a/CommonMC/src/GenerateMuonLife_module.cc +++ b/CommonMC/src/GenerateMuonLife_module.cc @@ -115,8 +115,7 @@ namespace mu2e { res->insert(inmap->begin(),inmap->end()); } - std::vector > colls; - event.getManyByType(colls); + std::vector > colls = event.getMany(); // Generate and record offsets for all primaries for(const auto& ih : colls) { diff --git a/CommonMC/src/GenerateProtonTimes_module.cc b/CommonMC/src/GenerateProtonTimes_module.cc index a3c7b5c19a..a48be8ba98 100644 --- a/CommonMC/src/GenerateProtonTimes_module.cc +++ b/CommonMC/src/GenerateProtonTimes_module.cc @@ -162,8 +162,7 @@ namespace mu2e { res->insert(inmap->begin(),inmap->end()); } - std::vector > colls; - event.getManyByType(colls); + std::vector > colls = event.getMany(); art::Handle ftmHandle; if (!fixedTime_.empty()) event.getByLabel(fixedTime_, ftmHandle); diff --git a/CommonMC/src/SConscript b/CommonMC/src/SConscript index 9825e715e4..e1748c7e11 100644 --- a/CommonMC/src/SConscript +++ b/CommonMC/src/SConscript @@ -37,7 +37,7 @@ 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', @@ -45,12 +45,13 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'HepPDT', 'boost_filesystem', - 'boost_system', rootlibs, ], ) diff --git a/CommonMC/src/SelectRecoMC_module.cc b/CommonMC/src/SelectRecoMC_module.cc index 8ea1a21926..611a1c8f70 100644 --- a/CommonMC/src/SelectRecoMC_module.cc +++ b/CommonMC/src/SelectRecoMC_module.cc @@ -349,8 +349,7 @@ namespace mu2e { for (auto const& ksc : _kscs) { // get all products from this art::ModuleLabelSelector kscsel(ksc); - std::vector< art::Handle > seedhs; - event.getMany(kscsel, seedhs); + std::vector< art::Handle > seedhs = event.getMany(kscsel); if(_debug > 1) std::cout << "Found " << seedhs.size() << " collections from module " << ksc << std::endl; // loop over the KalSeeds and the hits inside them for(auto const& seedh : seedhs) { @@ -392,8 +391,7 @@ namespace mu2e { for (auto const& hsc : _hscs) { // get all products from this art::ModuleLabelSelector hscsel(hsc); - std::vector< art::Handle > seedhs; - event.getMany(hscsel, seedhs); + std::vector< art::Handle > seedhs = event.getMany(hscsel); if(_debug > 1) std::cout << "Found " << seedhs.size() << " collections from module " << hsc << std::endl; // loop over the HelixSeeds and the hits inside them for(auto const& seedh : seedhs) { diff --git a/Compression/src/SConscript b/Compression/src/SConscript index f143c41aa8..30b086798e 100644 --- a/Compression/src/SConscript +++ b/Compression/src/SConscript @@ -32,20 +32,21 @@ 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', 'HepPDT', rootlibs, 'boost_filesystem', - 'boost_system', 'hep_concurrency', 'xerces-c', 'pthread' diff --git a/ConditionsService/inc/ConditionsService.hh b/ConditionsService/inc/ConditionsService.hh index 783f4909d2..bb3cc5edfc 100644 --- a/ConditionsService/inc/ConditionsService.hh +++ b/ConditionsService/inc/ConditionsService.hh @@ -23,7 +23,7 @@ #include "fhiclcpp/ParameterSet.h" #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "cetlib_except/exception.h" // Mu2e include files. diff --git a/ConditionsService/src/ConditionsService_service.cc b/ConditionsService/src/ConditionsService_service.cc index 0422c1bc68..6f6fd5d849 100644 --- a/ConditionsService/src/ConditionsService_service.cc +++ b/ConditionsService/src/ConditionsService_service.cc @@ -11,6 +11,7 @@ // Framework include files #include "messagefacility/MessageLogger/MessageLogger.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e include files #include "ConditionsService/inc/ConditionsService.hh" @@ -105,3 +106,4 @@ namespace mu2e { } // end namespace mu2e DEFINE_ART_SERVICE(mu2e::ConditionsService); + diff --git a/ConditionsService/src/SConscript b/ConditionsService/src/SConscript index 59668de654..9ad9201d3b 100644 --- a/ConditionsService/src/SConscript +++ b/ConditionsService/src/SConscript @@ -36,11 +36,12 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'canvas', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', ] ) diff --git a/CosmicReco/src/SConscript b/CosmicReco/src/SConscript index 068ded82a2..90a1e2b1c1 100644 --- a/CosmicReco/src/SConscript +++ b/CosmicReco/src/SConscript @@ -34,20 +34,21 @@ mainlib = helper.make_mainlib ( [ 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', 'HepPDT', 'xerces-c', - 'boost_system', extrarootlibs, ] ) @@ -76,7 +77,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -84,6 +85,8 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -91,7 +94,6 @@ helper.make_plugins( [ rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', 'pthread', extrarootlibs diff --git a/CutAndCountAnalysis/src/SConscript b/CutAndCountAnalysis/src/SConscript index b01c16aed8..67f9a199dd 100644 --- a/CutAndCountAnalysis/src/SConscript +++ b/CutAndCountAnalysis/src/SConscript @@ -42,7 +42,7 @@ mainlib = helper.make_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', @@ -50,6 +50,8 @@ mainlib = helper.make_mainlib ( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -58,7 +60,6 @@ mainlib = helper.make_mainlib ( [ rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) @@ -90,7 +91,7 @@ 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', @@ -98,6 +99,8 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -106,7 +109,6 @@ helper.make_plugins( [ mainlib, rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) # this tells emacs to view this file in python mode. diff --git a/DAQ/fcl/prolog_trigger.fcl b/DAQ/fcl/prolog_trigger.fcl index 03b2890c6b..21e4b7582e 100644 --- a/DAQ/fcl/prolog_trigger.fcl +++ b/DAQ/fcl/prolog_trigger.fcl @@ -34,7 +34,7 @@ DAQ : { # bufferSize : 1000 } - makeSD: + makeSDOld: { module_type: StrawAndCaloDigisFromFragments diagLevel: 0 @@ -46,6 +46,14 @@ DAQ : { caloTag : "daq:calo" } + makeSD: + { + module_type: StrawRecoFromFragments + diagLevel : 0 + useTrkADC : 0 + trkTag : "daq:trk" + } + CaloDigiMaker: { module_type : CaloRecoFromFragments @@ -62,6 +70,8 @@ DAQ : { deltaTPulses : 5. pulseRatioMax : 1.1 pulseRatioMin : 0.9 + # hitEDepMax : 80. + hitEDepMax : 1000. # for testing } CrvDigi: diff --git a/DAQ/inc/CaloDAQUtilities.hh b/DAQ/inc/CaloDAQUtilities.hh index 0db9bdd4ac..865c98c6b0 100644 --- a/DAQ/inc/CaloDAQUtilities.hh +++ b/DAQ/inc/CaloDAQUtilities.hh @@ -33,7 +33,7 @@ namespace mu2e { void printWaveform(std::vector& Pulse); - void printAllHitInfo(int CrystalID, int SiPMID, DTCLib::DTC_DataHeaderPacket &Header, CalorimeterFragment::CalorimeterHitReadoutPacket& Hit, std::vector& Pulse); + void printAllHitInfo(int CrystalID, int SiPMID, DTCLib::DTC_DataHeaderPacket &Header, CalorimeterFragment::CalorimeterHitReadoutPacket& Hit, uint16_t& PulseMax); private: std::string moduleName_; diff --git a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc index 9072ef2a81..243bc090ef 100644 --- a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc +++ b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc @@ -152,20 +152,17 @@ class ArtBinaryPacketsFromDigis : public art::EDProducer { std::vector> tsTable; size_t _timestampOffset; - int _includeTracker; - int _includeCalorimeter; - int _includeCrv; + int _includeTracker; + int _includeCalorimeter; + int _includeCrv; + int _includeDMAHeaders; - int _includeDMAHeaders; - - // -- include proditions handling - - //mu2e::ProditionsHandle _calodaqconds_h; + // -- include proditions handling ProditionsHandle _calodaqconds_h; // Set to 1 to save packet data to a binary file - int _generateBinaryFile; + int _generateBinaryFile; - std::string _outputFile; + std::string _outputFile; std::ofstream outputStream; //-------------------------------------------------------------------------------- @@ -186,11 +183,10 @@ class ArtBinaryPacketsFromDigis : public art::EDProducer { //-------------------------------------------------------------------------------- // CALORIEMTER ROC/DTC INFO //-------------------------------------------------------------------------------- - // 6 rocs per DTC => 27 DTCs - // 172 rocs * 8 crystals per roc => 1376 - // Note: the highest crystal ID in the old simulation was 1355 - const size_t number_of_calo_rocs = 172; - const size_t number_of_crystals_per_roc = 8; + // 6 rocs per DTC => 23 DTCs + // 136 rocs * 10 crystals per roc => 1348 + const size_t number_of_calo_rocs = 136; + const size_t number_of_crystals_per_roc = 10; const size_t number_of_calo_rocs_per_dtc = 6; //-------------------------------------------------------------------------------- @@ -226,14 +222,13 @@ class ArtBinaryPacketsFromDigis : public art::EDProducer { uint8_t& DTCId, uint8_t Subsys); void printHeader(DataBlockHeader const& headerDataBlock); - void putBlockInEvent(DTCLib::DTC_Event& currentEvent, uint8_t dtcID, + void putBlockInEvent(DTCLib::DTC_Event& currentEvent, uint8_t dtcID, DTCLib::DTC_Subsystem subsys, DTCLib::DTC_DataBlock thisBlock) { - auto subEvt = currentEvent.GetSubEventByDTCID(dtcID); + auto subEvt = currentEvent.GetSubEventByDTCID(dtcID, subsys); if (subEvt == nullptr) { DTCLib::DTC_SubEvent newSubEvt; newSubEvt.SetEventWindowTag(currentEvent.GetEventWindowTag()); - auto hdrPtr = newSubEvt.GetHeader(); - hdrPtr->source_dtc_id = dtcID; + newSubEvt.SetSourceDTC(dtcID, subsys); newSubEvt.AddDataBlock(thisBlock); currentEvent.AddSubEvent(newSubEvt); @@ -262,19 +257,11 @@ class ArtBinaryPacketsFromDigis : public art::EDProducer { //-------------------------------------------------------------------------------- // methods used to handle the calorimeter data //-------------------------------------------------------------------------------- - // void fillCalorimeterDataPacket(const CaloDigi& SD, CaloDataPacket& caloData); - - //void fillCalorimeterDataPacket(mu2e::CaloDAQMap const& calodaqconds, - // const CaloDigi& SD, CaloDataPacket& caloData); void fillCalorimeterDataPacket(CaloDAQMap const& calodaqconds, const CaloDigi& SD, CaloDataPacket& caloData); void addCaloHitToCaloPacket(calo_data_block_t& dataBlock, CaloDataPacket& caloData); - //void fillCalorimeterHeaderDataPacket(const CaloDigi& SD, DataBlockHeader& HeaderData, - // uint64_t& EventNum); - - void fillCalorimeterHeaderDataPacket(CaloDAQMap const& calodaqconds, const CaloDigi& SD, DataBlockHeader& HeaderData, uint64_t& EventNum); @@ -392,16 +379,16 @@ void ArtBinaryPacketsFromDigis::printCalorimeterData(CaloDataPacket const& caloD for (size_t i = 0; i < nHits; ++i) { CalorimeterHitReadoutPacket const& hit = caloData.hitPacketVec[i]; - printf("[ArtBinaryPacketsFromDigis::printCaloData] hit : %i \n", (int)i); - printf("[ArtBinaryPacketsFromDigis::printCaloData] ChannelNumber : %i \n", + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t hit : %i \n", (int)i); + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t ChannelNumber : %i \n", (int)hit.ChannelNumber); - printf("[ArtBinaryPacketsFromDigis::printCaloData] DIRACA : %i \n", (int)hit.DIRACA); - printf("[ArtBinaryPacketsFromDigis::printCaloData] DIRACB : %i \n", (int)hit.DIRACB); - printf("[ArtBinaryPacketsFromDigis::printCaloData] ErrorFlags : %i \n", (int)hit.ErrorFlags); - printf("[ArtBinaryPacketsFromDigis::printCaloData] Time : %i \n", (int)hit.Time); - printf("[ArtBinaryPacketsFromDigis::printCaloData] NumberOfSamples : %i \n", + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t DIRACA : %i \n", (int)hit.DIRACA); + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t DIRACB : %i \n", (int)hit.DIRACB); + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t ErrorFlags : %i \n", (int)hit.ErrorFlags); + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t Time : %i \n", (int)hit.Time); + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t NumberOfSamples : %i \n", (int)hit.NumberOfSamples); - printf("[ArtBinaryPacketsFromDigis::printCaloData] IndexOfMaxDigitizerSample : %i \n", + printf("[ArtBinaryPacketsFromDigis::printCaloData]\t IndexOfMaxDigitizerSample : %i \n", (int)hit.IndexOfMaxDigitizerSample); } } @@ -468,8 +455,8 @@ void ArtBinaryPacketsFromDigis::fillTrackerDataStream(DTCLib::DTC_Event& current pos += sizeof(TrackerADCPacket) * num_packets; } } + putBlockInEvent(currentEvent, dtcID, DTCLib::DTC_Subsystem_Tracker, thisBlock); } - putBlockInEvent(currentEvent, dtcID, thisBlock); } void ArtBinaryPacketsFromDigis::fillTrackerDMABlocks(DTCLib::DTC_Event& currentEvent, @@ -707,20 +694,20 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t calo_data_block_list_t& caloDataBlocks) { auto const& cdH = evt.getValidHandle(_cdtoken); const CaloDigiCollection& hits_CD(*cdH); + CaloDAQMap const& calodaqconds = _calodaqconds_h.get(evt.id()); // Get calo daq cond calo_data_block_list_t tmpCaloDataBlockList; - for (size_t i = 0; i < hits_CD.size(); ++i) { // Loop on Digi - CaloDigi const& CD = hits_CD.at(i); // Get Digi #i - - //mu2e::CaloDAQMap const& calodaqconds = _calodaqconds_h.get(evt.id()); // Get calo daq cond - CaloDAQMap const& calodaqconds = _calodaqconds_h.get(evt.id()); // Get calo daq cond + for (size_t i = 0; i < hits_CD.size(); ++i) { + CaloDigi const& CD = hits_CD.at(i); // Fill struct with info for current hit DataBlockHeader headerData; fillCalorimeterHeaderDataPacket(calodaqconds, CD, headerData, eventNum); CaloDataPacket caloData; fillCalorimeterDataPacket(calodaqconds, CD, caloData); - + if (_diagLevel > 1) { + printCalorimeterData(caloData); + } tmpCaloDataBlockList.push_back( std::pair(headerData, caloData)); } @@ -731,7 +718,7 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t << tmpCaloDataBlockList.size() << std::endl; } - uint8_t max_dtc_id = number_of_calo_rocs / number_of_calo_rocs_per_dtc - 1; + uint8_t max_dtc_id = number_of_calo_rocs / number_of_calo_rocs_per_dtc; if (number_of_calo_rocs % number_of_calo_rocs_per_dtc > 0) { max_dtc_id += 1; } @@ -745,6 +732,12 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t for (size_t curHitIdx = 0; curHitIdx < tmpCaloDataBlockList.size(); curHitIdx++) { if (tmpCaloDataBlockList[curHitIdx].first.s.DTCID == dtcID && tmpCaloDataBlockList[curHitIdx].first.s.LinkID == rocID) { + + if (_diagLevel > 1) { + std::cout << "[ArtBinaryPacketsFromDigis::processCalorimeterData ] filling Hit from DTCID = "<< (int)dtcID + << " ROCID = " << (int)rocID + << std::endl; + } if (is_first) { is_first = false; caloDataBlocks.push_back(tmpCaloDataBlockList[curHitIdx]); @@ -798,28 +791,24 @@ void ArtBinaryPacketsFromDigis::fillHeaderByteAndPacketCounts(calo_data_block_t& //-------------------------------------------------------------------------------- // crate a caloPacket from the digi //-------------------------------------------------------------------------------- -//void ArtBinaryPacketsFromDigis::fillCalorimeterDataPacket(mu2e::CaloDAQMap const& calodaqconds, -// const CaloDigi& CD, -// CaloDataPacket& CaloData) { void ArtBinaryPacketsFromDigis::fillCalorimeterDataPacket(CaloDAQMap const& calodaqconds, const CaloDigi& CD, CaloDataPacket& CaloData) { CaloData.dataPacket.NumberOfHits = 1; CalorimeterBoardID ccBoardID; - // Change # 1: get roid and cryID from Digi //========================================= - uint16_t roId = CD.SiPMID(); - uint16_t crystalId = roId/2; + uint16_t roId = CD.SiPMID(); + uint16_t crystalId = _calorimeter->caloIDMapper().crystalIDFromSiPMID(roId); if( _diagLevel==1) printf( "...FromDigis: cryId %d roId %d \n",crystalId,roId); //========================================================================================= // Change # 2: get packetId from DMAP and roId to extract: Dirac#, Chan# and Dettype // For the moment (wait OTSDAQ) define BoardId as consecutive with Dirac# and 6 Diracs=1DTC //========================================================================================= - uint16_t packetId = calodaqconds.caloRoIdToPacketId(roId); + uint16_t packetId = calodaqconds.caloRoIdToPacketId(roId); uint16_t globalROCID = (packetId & (0x00FF)); uint16_t DiracChannel = (packetId & (0x1F00)) >> 8; uint16_t DetType = (packetId & (0xE000)) >> 13; @@ -827,26 +816,24 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterDataPacket(CaloDAQMap const& calo if( _diagLevel==1) printf( "..FromDigis: DTYPE %d ROCID %d CHAN %d \n",DetType,globalROCID,DiracChannel); if( _diagLevel==1 && DetType==1) printf("Caphri \n"); - ccBoardID.BoardID = globalROCID % number_of_calo_rocs_per_dtc; + ccBoardID.BoardID = globalROCID % number_of_calo_rocs_per_dtc; ccBoardID.ChannelStatusFlagsA = 0; ccBoardID.ChannelStatusFlagsB = 0; - ccBoardID.unused = 0; + ccBoardID.unused = 0; CaloData.boardID = ccBoardID; CalorimeterHitReadoutPacket hitPacket; - // hitPacket.ChannelNumber = CD.SiPMID(); // previous version .... hitPacket.ChannelNumber = DiracChannel; // modified as it should be in the packet - hitPacket.DIRACA = packetId; //Change-5 - hitPacket.DIRACB = (((CD.SiPMID() % 2) << 12) | (crystalId)); // this is useless for the moment .. can be a test - - hitPacket.ErrorFlags = 0; - hitPacket.Time = CD.t0(); + hitPacket.DIRACA = packetId; //Change-5 + hitPacket.DIRACB = (((CD.SiPMID() % 2) << 12) | (crystalId)); // this is useless for the moment .. can be a test + hitPacket.ErrorFlags = 0; + hitPacket.Time = CD.t0(); std::vector theWaveform; for (size_t i = 0; i < CD.waveform().size(); ++i) { theWaveform.push_back((adc_t)CD.waveform().at(i)); } - hitPacket.NumberOfSamples = theWaveform.size(); + hitPacket.NumberOfSamples = theWaveform.size(); hitPacket.IndexOfMaxDigitizerSample = waveformMaximumIndex(theWaveform); CaloData.hitPacketVec.push_back(hitPacket); @@ -974,19 +961,13 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterDataStream(DTCLib::DTC_Event& cur waveform_size); pos += waveform_size; } // end loop over the calorimeterHitReadoutPacketVector + putBlockInEvent(currentEvent, dtcID, DTCLib::DTC_Subsystem_Calorimeter, thisBlock); } - - putBlockInEvent(currentEvent, dtcID, thisBlock); } //-------------------------------------------------------------------------------- // create the header for the caloPacket //-------------------------------------------------------------------------------- -//void ArtBinaryPacketsFromDigis::fillCalorimeterHeaderDataPacket(mu2e::CaloDAQMap const& calodaqconds, -// const CaloDigi& CD, -// DataBlockHeader& HeaderData, -// uint64_t& EventNum) { - void ArtBinaryPacketsFromDigis::fillCalorimeterHeaderDataPacket(CaloDAQMap const& calodaqconds, const CaloDigi& CD, DataBlockHeader& HeaderData, @@ -1004,16 +985,15 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterHeaderDataPacket(CaloDAQMap const // --------------------------------------------------------------- size_t roId = CD.SiPMID(); // size_t globalROCID = crystalId / number_of_crystals_per_roc; - uint16_t packetId = calodaqconds.caloRoIdToPacketId(roId); + uint16_t packetId = calodaqconds.caloRoIdToPacketId(roId); uint16_t globalROCID = (packetId & (0x00FF)); uint16_t DetType = (packetId & (0xE000)) >> 13; // ---------------------------------------------------------------- if( _diagLevel==1 && DetType == 1) printf(" CAPHRI !!! \n"); - HeaderData.s.LinkID = globalROCID % number_of_rocs_per_dtc;// from ROCID call it now LinkID - + HeaderData.s.LinkID = globalROCID % number_of_calo_rocs_per_dtc;// from ROCID call it now LinkID HeaderData.s.SubsystemID = DTCLib::DTC_Subsystem_Calorimeter; - HeaderData.s.Valid = 1; + HeaderData.s.Valid = 1; // Word 2 HeaderData.s.PacketCount = 1; // NEEDS TO BE INCREASED EVERY TIME A NEW HIT IS ADDED! // Word 3 @@ -1027,7 +1007,7 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterHeaderDataPacket(CaloDAQMap const HeaderData.s.Status = 0; // 0 corresponds to "TimeStamp had valid data" HeaderData.s.Version = format_version; // Word 7 - HeaderData.s.DTCID = static_cast(globalROCID / number_of_rocs_per_dtc); + HeaderData.s.DTCID = static_cast(globalROCID / number_of_calo_rocs_per_dtc); uint8_t evbMode = 0; // ask Eric HeaderData.s.EventWindowMode = evbMode; if( _diagLevel==1) printf(" >>FromDigi-Header: Dtyp Dirac# Link-DTC DTC %d %d %d %d \n", @@ -1046,7 +1026,7 @@ void ArtBinaryPacketsFromDigis::processTrackerData(art::Event& evt, uint64_t& ev tracker_data_block_list_t tmpTrackerData; - uint8_t max_dtc_id = number_of_rocs / number_of_rocs_per_dtc - 1; + uint8_t max_dtc_id = number_of_rocs / number_of_rocs_per_dtc; if (number_of_rocs % number_of_rocs_per_dtc > 0) { max_dtc_id += 1; } @@ -1071,7 +1051,7 @@ void ArtBinaryPacketsFromDigis::processTrackerData(art::Event& evt, uint64_t& ev // ROC ID, counting from 0 across all DTCs (for the tracker) // uint8_t localROCID = panel; - uint8_t globalROCID = (plane * 6) + panel; + uint8_t globalROCID = (plane * 6) + panel;// strawId().uniquePanel() would provide the ROCID uint8_t thisDTCID = static_cast(globalROCID / number_of_rocs_per_dtc); if (panel == rocID && thisDTCID == dtcID) { trackerData.back().second.emplace_back(); @@ -1300,7 +1280,9 @@ void ArtBinaryPacketsFromDigis::fillCrvDataStream(DTCLib::DTC_Event& currentEven pos += sizeof(CRVHitReadoutPacket); } - putBlockInEvent(currentEvent, dtcID, thisBlock); + if (hitCount > 0) { + putBlockInEvent(currentEvent, dtcID, DTCLib::DTC_Subsystem_CRV, thisBlock); + } } } // namespace mu2e diff --git a/DAQ/src/CaloDAQUtilities.cc b/DAQ/src/CaloDAQUtilities.cc index de23d8b197..85e6b80ce9 100644 --- a/DAQ/src/CaloDAQUtilities.cc +++ b/DAQ/src/CaloDAQUtilities.cc @@ -77,13 +77,13 @@ namespace mu2e { void CaloDAQUtilities::printAllHitInfo(int CrystalID, int SiPMID, DTCLib::DTC_DataHeaderPacket &Header, - CalorimeterFragment::CalorimeterHitReadoutPacket& Hit, std::vector& Pulse){ + CalorimeterFragment::CalorimeterHitReadoutPacket& Hit, uint16_t& PulseMax){ std::cout << "Crystal ID: " << CrystalID << std::endl; std::cout << "SiPM ID: " << SiPMID << std::endl; std::cout << "Time: " << (int)Hit.Time << std::endl; std::cout << "NumSamples: " << (int)Hit.NumberOfSamples << std::endl; - printWaveform(Pulse); + //printWaveform(Pulse); // Text format: timestamp crystalID roID time nsamples samples... // Example: 1 201 402 660 18 0 0 0 0 1 17 51 81 91 83 68 60 58 52 42 33 23 16 @@ -91,13 +91,14 @@ namespace mu2e { std::cout << CrystalID << " "; std::cout << SiPMID << " "; std::cout << Hit.Time << " "; - std::cout << Pulse.size() << " "; - for (size_t i = 0; i < Pulse.size(); i++) { - std::cout << Pulse[i]; - if (i < Pulse.size() - 1) { - std::cout << " "; - } - } + std::cout << PulseMax << " "; + // std::cout << Pulse.size() << " "; + // for (size_t i = 0; i < Pulse.size(); i++) { + // std::cout << Pulse[i]; + // if (i < Pulse.size() - 1) { + // std::cout << " "; + // } + // } std::cout << std::endl; } diff --git a/DAQ/src/CaloHitsFromFragments_module.cc b/DAQ/src/CaloHitsFromFragments_module.cc index d27d37512d..0ee35f0a0a 100644 --- a/DAQ/src/CaloHitsFromFragments_module.cc +++ b/DAQ/src/CaloHitsFromFragments_module.cc @@ -27,6 +27,8 @@ #include #include #include +#include +#include namespace art { class CaloHitsFromFragments; @@ -63,6 +65,9 @@ class art::CaloHitsFromFragments : public EDProducer { fhicl::Name("pulseRatioMin"), fhicl::Comment("Min of the ratio between two SiPM pulses coupled to the same crystal " "within the time-gate")}; + fhicl::Atom hitEDepMax{ + fhicl::Name("hitEDepMax"), + fhicl::Comment("Maximum hit energy in MeV (to reject saturated pulses)")}; }; // --- C'tor/d'tor: @@ -79,22 +84,24 @@ class art::CaloHitsFromFragments : public EDProducer { std::unique_ptr const& calo_hits, std::unique_ptr const& caphri_hits); - void addPulse(uint16_t& crystalID, float& time, float& eDep); + void addPulse(uint16_t& crystalID, float& time, float& eDep, + std::unique_ptrconst& hits_calo, + std::unique_ptrconst& hits_caphri); int diagLevel_; art::InputTag caloFragmentsTag_; float digiSampling_; - float deltaTPulses_, pulseRatioMax_, pulseRatioMin_; + float deltaTPulses_, pulseRatioMax_, pulseRatioMin_, hitEDepMax_; const int hexShiftPrint = 7; - std::unordered_map> - pulseMap_; // Temporary hack until the Calorimeter channel map is finialized + std::unordered_map> pulseMap_; // Temporary hack until the Calorimeter channel map is finialized mu2e::CaloDAQUtilities caloDAQUtil_; std::array peakADC2MeV_; - std::array caphriCrystalID_; + std::array timeCalib_; + std::array caphriCrystalID_; }; // ====================================================================== @@ -108,6 +115,7 @@ void art::CaloHitsFromFragments::beginRun(art::Run& Run) { // NOW FILLING THE ARRAY WITH A DUMMY VALUE for (size_t i = 0; i < peakADC2MeV_.size(); ++i) { peakADC2MeV_[i] = 0.0461333; + timeCalib_ [i] = 0.; } // FIX ME! @@ -116,39 +124,64 @@ void art::CaloHitsFromFragments::beginRun(art::Run& Run) { caphriCrystalID_ = {623, 624, 595, 596}; } -void art::CaloHitsFromFragments::addPulse(uint16_t& crystalID, float& time, float& eDep) { +void art::CaloHitsFromFragments::addPulse(uint16_t& crystalID, float& time, float& eDep, + std::unique_ptrconst & hits_calo, + std::unique_ptrconst & hits_caphri) { bool addNewHit(true); + bool isCaphri = std::find(caphriCrystalID_.begin(), caphriCrystalID_.end(), crystalID) != + caphriCrystalID_.end(); + size_t counter(0); for (auto& pulse : pulseMap_[crystalID]) { - // search if there is a hit matching in time and eDep - if ((std::fabs(pulse._time - time) < deltaTPulses_) && (eDep / pulse._eDep <= pulseRatioMax_) && - (eDep / pulse._eDep >= pulseRatioMin_)) { - // combine the pulses - pulse._time = (pulse._time + time) / 2.; - pulse._eDep = (pulse._eDep + eDep) / 2.; - pulse._nSiPM += 1; - addNewHit = false; + ++counter; + if (std::fabs(pulse.time() - time) < deltaTPulses_){ + if( (eDep / pulse.energyDep() <= pulseRatioMax_) && + (eDep / pulse.energyDep() >= pulseRatioMin_) ) { + // combine the pulses + pulse.setTime ( (pulse.time() + time) / 2.);//probably not necessary + pulse.setEDep ( (pulse.energyDep() + eDep) / 2.); + pulse.setNSiPMs( pulse.nSiPMs()+ 1); + addNewHit = false; + }else if (eDep > pulse.energyDep()) { + pulse.setTime (time);//probably not necessary + pulse.setEDep (eDep); + addNewHit = false; + } + + //move the pulse in the final collection + if (isCaphri){ + hits_caphri->emplace_back(std::move(pulse)); + }else{ + hits_calo->emplace_back(std::move(pulse)); + } break; } } if (addNewHit) { - pulseMap_[crystalID].push_back(CrystalInfo(crystalID, 1, time, eDep)); + pulseMap_[crystalID].emplace_back(mu2e::CaloHit(crystalID, 1, time, eDep)); } } art::CaloHitsFromFragments::CaloHitsFromFragments(const art::EDProducer::Table& config) : - art::EDProducer{config}, diagLevel_(config().diagLevel()), - caloFragmentsTag_(config().caloTag()), digiSampling_(config().digiSampling()), - deltaTPulses_(config().deltaTPulses()), pulseRatioMax_(config().pulseRatioMax()), - pulseRatioMin_(config().pulseRatioMin()), caloDAQUtil_("CaloHitsFromFragments") { - produces(); - produces("caphri"); -} + art::EDProducer{config}, diagLevel_(config().diagLevel()), + caloFragmentsTag_(config().caloTag()), + digiSampling_ (config().digiSampling()), + deltaTPulses_ (config().deltaTPulses()), + pulseRatioMax_ (config().pulseRatioMax()), + pulseRatioMin_ (config().pulseRatioMin()), + hitEDepMax_ (config().hitEDepMax()), + caloDAQUtil_ ("CaloHitsFromFragments") + { + pulseMap_.reserve(4000); + produces(); + produces("caphri"); + } // ---------------------------------------------------------------------- void art::CaloHitsFromFragments::produce(Event& event) { pulseMap_.clear(); + art::EventNumber_t eventNumber = event.event(); // Collection of CaloHits for the event @@ -251,7 +284,7 @@ void art::CaloHitsFromFragments::analyze_calorimeter_( << std::endl; } - auto hits = cc.GetCalorimeterHits(curBlockIdx); + auto hits = cc.GetCalorimeterHitsForTrigger(curBlockIdx); bool err = false; for (size_t hitIdx = 0; hitIdx < calData->NumberOfHits; hitIdx++) { @@ -281,39 +314,27 @@ void art::CaloHitsFromFragments::analyze_calorimeter_( caloDAQUtil_.getSiPMID(hits[hitIdx].first); // hits[hitIdx].first.DIRACB >> 12; size_t peakIndex = hits[hitIdx].first.IndexOfMaxDigitizerSample; - float eDep(0); - if (hits[hitIdx].first.IndexOfMaxDigitizerSample < hits[hitIdx].second.size()) { - eDep = hits[hitIdx].second.at(peakIndex) * peakADC2MeV_[sipmID]; + // float eDep(0); + // if (hits[hitIdx].first.IndexOfMaxDigitizerSample < hits[hitIdx].second.size()) { + // eDep = hits[hitIdx].second.at(peakIndex) * peakADC2MeV_[sipmID]; + float eDep = hits[hitIdx].second * peakADC2MeV_[sipmID]; + // } + float time = hits[hitIdx].first.Time + peakIndex * digiSampling_ + timeCalib_[sipmID]; + + //FIX ME! WE NEED TO CHECK IF TEH PULSE IS SATURATED HERE + if (eDep < hitEDepMax_){ + addPulse(crystalID, time, eDep, calo_hits, caphri_hits); } - float time = hits[hitIdx].first.Time + peakIndex * digiSampling_; - - addPulse(crystalID, time, eDep); - if (diagLevel_ > 1) { // Until we have the final mapping, the BoardID is just a placeholder // adc_t BoardId = cc.DBC_BoardID(pos,channelIdx); - caloDAQUtil_.printAllHitInfo(crystalID, sipmID, hdr, hits[hitIdx].first, - hits[hitIdx].second); + caloDAQUtil_.printAllHitInfo(crystalID, sipmID, hdr, hits[hitIdx].first, + hits[hitIdx].second); } // End debug output } // End loop over readout channels in DataBlock - // now create the CaloHitCollection - for (auto& crystal : pulseMap_) { - bool isCaphri = std::find(caphriCrystalID_.begin(), caphriCrystalID_.end(), crystal.first) != - caphriCrystalID_.end(); - for (auto& crystalInfo : crystal.second) { - if (isCaphri) { - caphri_hits->emplace_back(crystal.first, crystalInfo._nSiPM, crystalInfo._time, - crystalInfo._eDep); - } else { - calo_hits->emplace_back(crystal.first, crystalInfo._nSiPM, crystalInfo._time, - crystalInfo._eDep); - } - } - } - if (err) continue; } diff --git a/DAQ/src/CaloRecoFromFragments_module.cc b/DAQ/src/CaloRecoFromFragments_module.cc index 5deca11d47..0526a62bff 100644 --- a/DAQ/src/CaloRecoFromFragments_module.cc +++ b/DAQ/src/CaloRecoFromFragments_module.cc @@ -96,6 +96,10 @@ void art::CaloRecoFromFragments::produce(Event& event) { } numCalFrags = calFragments->size(); + if (diagLevel_ > 1) { + std::cout << "[CaloRecoFromFragments::produce] found "<< numCalFrags <<" Calorimeter fragments" + << std::endl; + } for (size_t idx = 0; idx < numCalFrags; ++idx) { auto size = ((*calFragments)[idx]).sizeBytes(); // * sizeof(artdaq::RawDataType); totalSize += size; @@ -199,7 +203,7 @@ void art::CaloRecoFromFragments::analyze_calorimeter_(mu2e::CaloDAQMap const& ca } if (diagLevel_ > 0) { - std::cout << "[StrawAndCaloDigiFromFragments] NEW CALDATA: NumberOfHits " + std::cout << "[CaloRecoFromFragments] NEW CALDATA: NumberOfHits " << calData->NumberOfHits << std::endl; } diff --git a/Analyses/src/FragmentAna_module.cc b/DAQ/src/FragmentAna_module.cc similarity index 99% rename from Analyses/src/FragmentAna_module.cc rename to DAQ/src/FragmentAna_module.cc index 4c289d915f..225e54f79d 100644 --- a/Analyses/src/FragmentAna_module.cc +++ b/DAQ/src/FragmentAna_module.cc @@ -325,6 +325,7 @@ void FragmentAna::analyze_calorimeter_(const artdaq::Fragment& f) { // temporarily storing the 4-bit apdID and 12-bit crystalID in the Reserved DIRAC A slot. // Also, note that until we have an actual map, channel index does not actually correspond // to the physical readout channel on a ROC. + uint16_t crystalID = hit.first.DIRACB & 0x0FFF; uint16_t roId = hit.first.DIRACB >> 12; _hCalROId->Fill(crystalID * 2 + roId); diff --git a/DAQ/src/PrefetchDAQData_module.cc b/DAQ/src/PrefetchDAQData_module.cc new file mode 100644 index 0000000000..18243c2e82 --- /dev/null +++ b/DAQ/src/PrefetchDAQData_module.cc @@ -0,0 +1,169 @@ +// framework +#include "art/Framework/Principal/Event.h" +#include "fhiclcpp/ParameterSet.h" +#include "art/Framework/Principal/Handle.h" +#include "art/Framework/Core/EDProducer.h" +#include "art/Framework/Core/ModuleMacros.h" +#include "art_root_io/TFileService.h" + +// data +#include "RecoDataProducts/inc/CaloDigi.hh" +#include "RecoDataProducts/inc/StrawDigi.hh" + +// DAQ data +//#include "mu2e-artdaq-core/Overlays/FragmentType.hh" +//#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh" +#include + + +namespace mu2e { + + class PrefetchDAQData : public art::EDProducer { + + protected: + + public: + explicit PrefetchDAQData(fhicl::ParameterSet const&); + virtual ~PrefetchDAQData(); + virtual void beginJob(); + virtual void produce( art::Event& e); + + void fake_access(const CaloDigi& Digi); + void fake_access(const StrawDigi& Digi); + void fake_access(const artdaq::Fragment& Frag); + + private: + + bool findData(const art::Event& e); + // control flags + int _debugLevel; + int _fetchCaloDigis; + int _fetchStrawDigis; + int _fetchCaloFragments; + int _fetchTrkFragments; + + art::InputTag _cdTag; + art::InputTag _sdTag; + art::InputTag _cfTag; + art::InputTag _tfTag; + // cache of event objects + const CaloDigiCollection* _cdcol; + const StrawDigiCollection* _sdcol; + const artdaq::Fragments* _cfcol; + const artdaq::Fragments* _tfcol; + int _eventNum; + }; + + //----------------------------------------------------------------------------- + PrefetchDAQData::PrefetchDAQData(fhicl::ParameterSet const& pset): + art::EDProducer(pset), + _debugLevel (pset.get ("debugLevel")), + _fetchCaloDigis (pset.get ("fetchCaloDigis" )), + _fetchStrawDigis (pset.get ("fetchStrawDigis")), + _fetchCaloFragments(pset.get ("fetchCaloFragments")), + _fetchTrkFragments (pset.get ("fetchTrkFragments")), + _cdTag (pset.get("caloDigiCollectionTag")), + _sdTag (pset.get("strawDigiCollectionTag")), + _cfTag (pset.get("caloFragmentTag")), + _tfTag (pset.get("trkFragmentTag")) + {} + + PrefetchDAQData::~PrefetchDAQData() { + } + +//----------------------------------------------------------------------------- + void PrefetchDAQData::beginJob() { + } + +//----------------------------------------------------------------------------- + void PrefetchDAQData::fake_access(const CaloDigi& Hit) { + } + +//----------------------------------------------------------------------------- + void PrefetchDAQData::fake_access(const StrawDigi& X) { + } +//----------------------------------------------------------------------------- + void PrefetchDAQData::fake_access(const artdaq::Fragment& Frag) { + } + +//----------------------------------------------------------------------------- + bool PrefetchDAQData::findData(const art::Event& evt){ + _cdcol = 0; + _sdcol = 0; + _cfcol = 0; + _tfcol = 0; + + if (_fetchCaloDigis) { + auto cdH = evt.getValidHandle(_cdTag); + _cdcol = cdH.product(); + } + + if (_fetchTrkFragments) { + auto tfH = evt.getValidHandle(_tfTag); + _tfcol = tfH.product(); + } + + if (_fetchCaloFragments) { + auto cfH = evt.getValidHandle(_cfTag); + _cfcol = cfH.product(); + } + + if (_fetchStrawDigis) { + auto sdH = evt.getValidHandle(_sdTag); + _sdcol = sdH.product(); + } +//----------------------------------------------------------------------------- +// prefetch data +//----------------------------------------------------------------------------- + if (_cdcol) { + int ncd = _cdcol->size(); + for(int i=0;iat(i); + fake_access(cd); + } + } + + if (_sdcol) { + int nsd = _sdcol->size(); + for(int i=0;iat(i); + fake_access(sdigi); + } + } + + if (_cfcol) { + int ncf = _cfcol->size(); + for(int i=0;iat(i); + fake_access(frag); + } + } + if (_tfcol) { + int ntf = _tfcol->size(); + for(int i=0;iat(i); + fake_access(frag); + } + } + + return true; + } + +//----------------------------------------------------------------------------- + void PrefetchDAQData::produce(art::Event& Event) { + + _eventNum = Event.event(); + + if (_debugLevel > 0) printf("[PrefetchDAQData::produce] event number: %10i\n",_eventNum); + + findData(Event); + } + +//------------------------------------------------------------------------------ +// Part of the magic that makes this class a module. +DEFINE_ART_MODULE(PrefetchDAQData) + +} + + + diff --git a/DAQ/src/SConscript b/DAQ/src/SConscript index eff0985fe7..32128057df 100644 --- a/DAQ/src/SConscript +++ b/DAQ/src/SConscript @@ -28,7 +28,7 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Principal', @@ -37,11 +37,12 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'art_Utilities', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, - 'boost_system' ] ) helper.make_plugins( [ mainlib, @@ -64,7 +65,7 @@ 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', @@ -72,12 +73,13 @@ helper.make_plugins( [ mainlib, 'art_Utilities', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'HepPDT', 'boost_filesystem', - 'boost_system', rootlibs, 'xerces-c', # only needed for MakeStereoHits_module.cc 'Minuit', # Needed for BetaTauPitch_module.cc and ReadStrawCluster_module.cc diff --git a/DAQ/src/StrawRecoFromFragments_module.cc b/DAQ/src/StrawRecoFromFragments_module.cc index 564d6e480b..0067946c17 100644 --- a/DAQ/src/StrawRecoFromFragments_module.cc +++ b/DAQ/src/StrawRecoFromFragments_module.cc @@ -199,7 +199,7 @@ void art::StrawRecoFromFragmnets::analyze_tracker_( if (hdr.GetPacketCount() > 0 ) { // Create the StrawDigi data products - auto trkDataVec = cc.GetTrackerData(curBlockIdx); + auto trkDataVec = cc.GetTrackerData(curBlockIdx, useTrkADC_); if (trkDataVec.empty()) { mf::LogError("StrawRecoFromFragmnets") << "Error retrieving Tracker data from DataBlock " << curBlockIdx @@ -212,7 +212,7 @@ void art::StrawRecoFromFragmnets::analyze_tracker_( mu2e::StrawId sid(trkDataPair.first->StrawIndex); mu2e::TrkTypes::TDCValues tdc = {trkDataPair.first->TDC0(), trkDataPair.first->TDC1()}; mu2e::TrkTypes::TOTValues tot = {trkDataPair.first->TOT0, trkDataPair.first->TOT1}; - mu2e::TrkTypes::ADCValue pmp = trkDataPair.first->PMP; + mu2e::TrkTypes::ADCValue pmp = trkDataPair.first->PMP; // Fill the StrawDigiCollection straw_digis->emplace_back(sid, tdc, tot, pmp); diff --git a/DAQ/test/generateBinaryFromDigi.fcl b/DAQ/test/generateBinaryFromDigi.fcl index 1250f8b076..17961eaccd 100644 --- a/DAQ/test/generateBinaryFromDigi.fcl +++ b/DAQ/test/generateBinaryFromDigi.fcl @@ -43,10 +43,20 @@ physics : { digisTag : CaloDigiMaker } + + readFragments : { + module_type : FragmentAna + diagLevel : 0 + parseCAL : 1 + parseTRK : 1 + caloTag : "daq:calo" + trkTag : "daq:trk" + } } t1 : [ binaryOutput ] - e1 : [ readSD, readCD ] + #e1 : [ readSD, readCD ] + e1 : [ readSD, readCD, readFragments ] trigger_paths : [t1] end_paths : [e1] @@ -57,3 +67,5 @@ physics.producers.binaryOutput.includeTracker : 1 physics.producers.binaryOutput.includeCalorimeter : 1 physics.producers.binaryOutput.outputFile : "DTC_packets.bin" services.TFileService.fileName : "generateBinaryFromDigi_test.root" + +# physics.producers.binaryOutput.diagLevel : 10 \ No newline at end of file diff --git a/DAQ/test/generateDigiFromFragment.fcl b/DAQ/test/generateDigiFromFragment.fcl index 66817449d5..2738e6e9ef 100644 --- a/DAQ/test/generateDigiFromFragment.fcl +++ b/DAQ/test/generateDigiFromFragment.fcl @@ -7,6 +7,9 @@ #include "fcl/minimalMessageService.fcl" #include "fcl/standardServices.fcl" #include "DAQ/fcl/prolog_trigger.fcl" + +#include "CaloCluster/fcl/prolog_trigger.fcl" + process_name : FragmentToDigi source : { @@ -24,15 +27,38 @@ services : @local::Services.Reco physics : { producers : { + fetchData: + { + module_type : PrefetchDAQData + debugLevel : 0 + fetchCaloDigis : 0 + fetchStrawDigis : 0 + fetchCaloFragments : 1 + fetchTrkFragments : 1 + caloDigiCollectionTag : "notNow" + strawDigiCollectionTag : "notNow" + caloFragmentTag : "daq:calo" + trkFragmentTag : "daq:trk" + } + makeSD: { @table::DAQ.producers.makeSD } + CaloDigiMaker: + { + @table::DAQ.producers.CaloDigiMaker + } + CaloHitMaker: { @table::DAQ.producers.CaloHitMaker } + CaloClusterFast: + { + @table::CaloClusterTrigger.producers.CaloClusterFast + } } analyzers : { @@ -47,8 +73,10 @@ physics : { } # t1 : [ makeSD ] - t1 : [ makeSD, CaloHitMaker ] - e1 : [ readFragments, outfile ] + # t1 : [ fetchData, makeSD , CaloDigiMaker, CaloHitMaker, CaloClusterFast] + t1 : [ fetchData, makeSD , CaloHitMaker, CaloClusterFast] + #e1 : [ outfile, readFragments] + e1 : [] trigger_paths : [t1] end_paths : [e1] @@ -76,3 +104,6 @@ services.TimeTracker : { } } services.scheduler.wantSummary: true +physics.producers.makeSD.useTrkADC : 0 +#physics.producers.makeSD.diagLevel : 10 +#physics.producers.CaloDigiMaker.diagLevel : 10 diff --git a/DbService/inc/DbService.hh b/DbService/inc/DbService.hh index 76d56c1336..b5596d9791 100644 --- a/DbService/inc/DbService.hh +++ b/DbService/inc/DbService.hh @@ -9,7 +9,7 @@ #include "fhiclcpp/types/OptionalSequence.h" #include "art/Framework/Services/Registry/ServiceTable.h" #include "art/Framework/Services/Registry/ActivityRegistry.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "cetlib_except/exception.h" #include "DbService/inc/DbEngine.hh" diff --git a/DbService/src/DbServiceTest_module.cc b/DbService/src/DbServiceTest_module.cc index d6d2daf511..4402735bee 100644 --- a/DbService/src/DbServiceTest_module.cc +++ b/DbService/src/DbServiceTest_module.cc @@ -13,6 +13,7 @@ #include "art/Framework/Core/ModuleMacros.h" #include "art/Framework/Principal/Handle.h" //#include "art/Framework/Services/Optional/TFileService.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "fhiclcpp/ParameterSet.h" #include "DbService/inc/DbHandle.hh" diff --git a/DbService/src/DbService_service.cc b/DbService/src/DbService_service.cc index 1d311417ec..e3813c6b19 100644 --- a/DbService/src/DbService_service.cc +++ b/DbService/src/DbService_service.cc @@ -3,6 +3,7 @@ #include "DbService/inc/DbIdList.hh" #include "DbTables/inc/DbUtil.hh" #include "ConfigTools/inc/ConfigFileLookupPolicy.hh" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" namespace mu2e { diff --git a/DbService/src/SConscript b/DbService/src/SConscript index 3aed6b0320..d1170c78cc 100644 --- a/DbService/src/SConscript +++ b/DbService/src/SConscript @@ -28,18 +28,19 @@ 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', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', ] ) BINLIBS = [ mainlib, 'mu2e_DbTables' , 'cetlib', 'cetlib_except', "pq" ] diff --git a/EventDisplay/src/SConscript b/EventDisplay/src/SConscript index e3ce1ba408..0e68728ca5 100644 --- a/EventDisplay/src/SConscript +++ b/EventDisplay/src/SConscript @@ -36,7 +36,7 @@ userlibs = [ rootlibs, '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', @@ -44,6 +44,8 @@ userlibs = [ rootlibs, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -51,7 +53,6 @@ userlibs = [ rootlibs, 'HepPID', 'Core', 'boost_filesystem', - 'boost_system' ] diff --git a/EventGenerator/src/GenEventCounter_module.cc b/EventGenerator/src/GenEventCounter_module.cc index 04e40fad36..177a3f7f4a 100644 --- a/EventGenerator/src/GenEventCounter_module.cc +++ b/EventGenerator/src/GenEventCounter_module.cc @@ -53,8 +53,7 @@ namespace mu2e { // The intention is to have at most one object of type // GenEventCount per SubRun. Throw here if such an // object is already in SubRun. - std::vector > hh; - sr.getManyByType(hh); + std::vector > hh = sr.getMany(); if(!hh.empty()) { std::ostringstream os; os<<"GenEventCounter: refusing to write event count in " diff --git a/EventGenerator/src/SConscript b/EventGenerator/src/SConscript index 84d0f70314..106b78edf2 100644 --- a/EventGenerator/src/SConscript +++ b/EventGenerator/src/SConscript @@ -36,7 +36,7 @@ mainlib = helper.make_mainlib ( [ 'art_Persistency_Common', 'art_Framework_Services_Registry', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', @@ -44,6 +44,8 @@ mainlib = helper.make_mainlib ( [ 'canvas', 'CRY', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'MF_MessageLogger', 'cetlib', 'cetlib_except', @@ -51,7 +53,6 @@ mainlib = helper.make_mainlib ( [ 'HepPDT', 'HepPID', rootlibs, - 'boost_system', 'gsl', ], [],['-I' + cryinc, '-L' + crylib] ) @@ -75,7 +76,7 @@ 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', @@ -83,6 +84,8 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -90,7 +93,6 @@ helper.make_plugins( [ mainlib, 'HepPID', rootlibs, 'boost_filesystem', - 'boost_system', 'gsl', 'CRY', ], diff --git a/EventMixing/src/SConscript b/EventMixing/src/SConscript index d071f808f4..e31493048f 100644 --- a/EventMixing/src/SConscript +++ b/EventMixing/src/SConscript @@ -18,7 +18,7 @@ mainlib = helper.make_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_Framework_IO_ProductMix', 'art_root_io', @@ -28,11 +28,12 @@ mainlib = helper.make_mainlib ( [ 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'hep_concurrency', 'boost_filesystem', - 'boost_system', 'Core', # dependence on gVersionCheck, reportedly due to some bug upstream ] ) @@ -46,7 +47,7 @@ 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_Framework_IO_ProductMix', 'art_root_io', @@ -57,6 +58,8 @@ helper.make_plugins ( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'hep_concurrency', @@ -64,7 +67,6 @@ helper.make_plugins ( [ mainlib, 'Hist', 'Core', 'boost_filesystem', - 'boost_system', 'pthread' ] ) diff --git a/ExtinctionMonitorFNAL/Analyses/src/SConscript b/ExtinctionMonitorFNAL/Analyses/src/SConscript index 01a94e7647..98731b9ea3 100644 --- a/ExtinctionMonitorFNAL/Analyses/src/SConscript +++ b/ExtinctionMonitorFNAL/Analyses/src/SConscript @@ -20,7 +20,7 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', @@ -30,7 +30,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService', 'cetlib_except', 'CLHEP', rootlibs, - 'boost_system', ] ) helper.make_plugins( [ mainlib, @@ -49,7 +48,7 @@ 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', @@ -57,12 +56,13 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, 'boost_filesystem', - 'boost_system', 'hep_concurrency', ] ) diff --git a/ExtinctionMonitorFNAL/Digitization/src/SConscript b/ExtinctionMonitorFNAL/Digitization/src/SConscript index 98515ca578..8bd15494d8 100644 --- a/ExtinctionMonitorFNAL/Digitization/src/SConscript +++ b/ExtinctionMonitorFNAL/Digitization/src/SConscript @@ -29,11 +29,12 @@ mainlib = helper.make_mainlib ( [ 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', - 'boost_system', ] ) helper.make_plugins( [ mainlib, @@ -64,7 +65,6 @@ helper.make_plugins( [ mainlib, 'HepPID', 'Core', 'boost_filesystem', - 'boost_system', ] ) diff --git a/ExtinctionMonitorFNAL/Reconstruction/src/SConscript b/ExtinctionMonitorFNAL/Reconstruction/src/SConscript index 7ef9f32506..2d2a74998e 100644 --- a/ExtinctionMonitorFNAL/Reconstruction/src/SConscript +++ b/ExtinctionMonitorFNAL/Reconstruction/src/SConscript @@ -25,14 +25,15 @@ my_libs=['mu2e_ExtinctionMonitorFNAL_Geometry', mainlib = helper.make_mainlib ( my_libs ) helper.make_plugins( [ mainlib, my_libs, 'mu2e_Mu2eInterfaces', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Core', 'art_Framework_Principal', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'boost_filesystem', - 'boost_system', 'Hist', 'Core' ] ) diff --git a/ExtinctionMonitorFNAL/TruthAlgs/src/SConscript b/ExtinctionMonitorFNAL/TruthAlgs/src/SConscript index 18b7cc077f..8fc66aeabb 100644 --- a/ExtinctionMonitorFNAL/TruthAlgs/src/SConscript +++ b/ExtinctionMonitorFNAL/TruthAlgs/src/SConscript @@ -21,12 +21,13 @@ helper.make_plugins ( [ 'mu2e_Mu2eUtilities', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', 'boost_filesystem', - 'boost_system', ] ) # This tells emacs to view this file in python mode. diff --git a/ExtinctionMonitorFNAL/Utilities/src/SConscript b/ExtinctionMonitorFNAL/Utilities/src/SConscript index 4d402ba7af..ba63f38fa2 100644 --- a/ExtinctionMonitorFNAL/Utilities/src/SConscript +++ b/ExtinctionMonitorFNAL/Utilities/src/SConscript @@ -19,13 +19,14 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ExtinctionMonitorFNAL_Geometry', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'HepPDT', 'HepPID', 'Core', - 'boost_system' ] ) # This tells emacs to view this file in python mode. diff --git a/Filters/src/CompressPhysicalVolumes_module.cc b/Filters/src/CompressPhysicalVolumes_module.cc index 9d07171b6a..8d02f04e43 100644 --- a/Filters/src/CompressPhysicalVolumes_module.cc +++ b/Filters/src/CompressPhysicalVolumes_module.cc @@ -16,6 +16,7 @@ #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/SubRun.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "Mu2eUtilities/inc/SimParticleParentGetter.hh" diff --git a/Filters/src/DetectorStepFilter_module.cc b/Filters/src/DetectorStepFilter_module.cc index e7fc656923..96685cf683 100644 --- a/Filters/src/DetectorStepFilter_module.cc +++ b/Filters/src/DetectorStepFilter_module.cc @@ -17,6 +17,7 @@ #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" #include "DataProducts/inc/PDGCode.hh" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StrawGasStep.hh" #include "MCDataProducts/inc/CaloShowerStep.hh" diff --git a/Filters/src/EMFBoxHitsFilter_module.cc b/Filters/src/EMFBoxHitsFilter_module.cc index 9b77a4e991..96c4821365 100644 --- a/Filters/src/EMFBoxHitsFilter_module.cc +++ b/Filters/src/EMFBoxHitsFilter_module.cc @@ -18,6 +18,7 @@ #include "art/Framework/Core/ModuleMacros.h" #include "canvas/Persistency/Common/FindManyP.h" #include "art_root_io/TFileService.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "RecoDataProducts/inc/ExtMonFNALRawHitCollection.hh" #include "MCDataProducts/inc/ExtMonFNALHitTruthAssn.hh" diff --git a/Filters/src/EMFPixelHitsFilter_module.cc b/Filters/src/EMFPixelHitsFilter_module.cc index ead00c7854..e9d8f2306d 100644 --- a/Filters/src/EMFPixelHitsFilter_module.cc +++ b/Filters/src/EMFPixelHitsFilter_module.cc @@ -15,6 +15,7 @@ #include "art/Framework/Core/ModuleMacros.h" #include "canvas/Persistency/Common/FindManyP.h" #include "art_root_io/TFileService.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "RecoDataProducts/inc/ExtMonFNALRawHitCollection.hh" #include "MCDataProducts/inc/ExtMonFNALHitTruthAssn.hh" diff --git a/Filters/src/EMFPixelSimFilter_module.cc b/Filters/src/EMFPixelSimFilter_module.cc index c640f1c5c5..611a1c96c1 100644 --- a/Filters/src/EMFPixelSimFilter_module.cc +++ b/Filters/src/EMFPixelSimFilter_module.cc @@ -15,6 +15,7 @@ #include "art/Framework/Core/ModuleMacros.h" #include "canvas/Persistency/Common/FindManyP.h" #include "art_root_io/TFileService.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/ExtMonFNALSimHitCollection.hh" diff --git a/Filters/src/FilterCosmicsStage1_module.cc b/Filters/src/FilterCosmicsStage1_module.cc index 40f22fc463..e70f16fb75 100644 --- a/Filters/src/FilterCosmicsStage1_module.cc +++ b/Filters/src/FilterCosmicsStage1_module.cc @@ -13,6 +13,7 @@ #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" diff --git a/Filters/src/FilterG4Out_module.cc b/Filters/src/FilterG4Out_module.cc index b6e9e16c15..9f9b7ffa10 100644 --- a/Filters/src/FilterG4Out_module.cc +++ b/Filters/src/FilterG4Out_module.cc @@ -33,6 +33,7 @@ // art includes. #include "fhiclcpp/types/OptionalSequence.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "art/Framework/Core/EDFilter.h" #include "art/Framework/Principal/Event.h" diff --git a/Filters/src/FilterOutEmptyEvents_module.cc b/Filters/src/FilterOutEmptyEvents_module.cc index 6da5527b74..8a71669368 100644 --- a/Filters/src/FilterOutEmptyEvents_module.cc +++ b/Filters/src/FilterOutEmptyEvents_module.cc @@ -15,6 +15,7 @@ #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StatusG4.hh" using namespace std; diff --git a/Filters/src/FilterStatusG4_module.cc b/Filters/src/FilterStatusG4_module.cc index d845e7b748..2c8772ba20 100644 --- a/Filters/src/FilterStatusG4_module.cc +++ b/Filters/src/FilterStatusG4_module.cc @@ -14,6 +14,7 @@ #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StatusG4.hh" namespace mu2e { diff --git a/Filters/src/FilterStepPointAngleVsTarget_module.cc b/Filters/src/FilterStepPointAngleVsTarget_module.cc index c6d666a351..d2b158a946 100644 --- a/Filters/src/FilterStepPointAngleVsTarget_module.cc +++ b/Filters/src/FilterStepPointAngleVsTarget_module.cc @@ -17,6 +17,7 @@ #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "MCDataProducts/inc/SimParticle.hh" diff --git a/Filters/src/FilterStepPointKinEnPDG_module.cc b/Filters/src/FilterStepPointKinEnPDG_module.cc index b1beb3e5b1..e8436b0d71 100644 --- a/Filters/src/FilterStepPointKinEnPDG_module.cc +++ b/Filters/src/FilterStepPointKinEnPDG_module.cc @@ -13,6 +13,7 @@ #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "GlobalConstantsService/inc/GlobalConstantsHandle.hh" diff --git a/Filters/src/FilterStepPointMomentum_module.cc b/Filters/src/FilterStepPointMomentum_module.cc index dec963e486..b92ce8df97 100644 --- a/Filters/src/FilterStepPointMomentum_module.cc +++ b/Filters/src/FilterStepPointMomentum_module.cc @@ -13,6 +13,7 @@ #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" diff --git a/Filters/src/FilterStepPointPDG_module.cc b/Filters/src/FilterStepPointPDG_module.cc index fb438603d3..da8426dc82 100644 --- a/Filters/src/FilterStepPointPDG_module.cc +++ b/Filters/src/FilterStepPointPDG_module.cc @@ -16,6 +16,7 @@ #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "MCDataProducts/inc/SimParticle.hh" diff --git a/Filters/src/FilterStepPointPositionMomentum_module.cc b/Filters/src/FilterStepPointPositionMomentum_module.cc index e91f52c285..9a72fe8df3 100644 --- a/Filters/src/FilterStepPointPositionMomentum_module.cc +++ b/Filters/src/FilterStepPointPositionMomentum_module.cc @@ -16,6 +16,7 @@ #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "MCDataProducts/inc/SimParticle.hh" diff --git a/Filters/src/FilterStepPointPzVsTarget_module.cc b/Filters/src/FilterStepPointPzVsTarget_module.cc index c21e5f48fc..9fbb2bb2bc 100644 --- a/Filters/src/FilterStepPointPzVsTarget_module.cc +++ b/Filters/src/FilterStepPointPzVsTarget_module.cc @@ -17,6 +17,7 @@ #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "MCDataProducts/inc/SimParticle.hh" diff --git a/Filters/src/FilterStepPointReflection_module.cc b/Filters/src/FilterStepPointReflection_module.cc index bde7663ff8..35aff55926 100644 --- a/Filters/src/FilterStepPointReflection_module.cc +++ b/Filters/src/FilterStepPointReflection_module.cc @@ -16,6 +16,7 @@ #include "art/Framework/Principal/Handle.h" #include "canvas/Utilities/InputTag.h" #include "art/Framework/Core/ModuleMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" #include "DataProducts/inc/VirtualDetectorId.hh" diff --git a/Filters/src/RecoMomFilter_module.cc b/Filters/src/RecoMomFilter_module.cc index 54767a6945..7682268de2 100644 --- a/Filters/src/RecoMomFilter_module.cc +++ b/Filters/src/RecoMomFilter_module.cc @@ -59,8 +59,7 @@ namespace mu2e { bool RecoMomFilter::filter(art::Event& event) { - std::vector > colls; - event.getManyByType(colls); + std::vector > colls = event.getMany(); std::vector moduleNames; for (size_t i=0;i<_trkTags.size();i++){ diff --git a/Filters/src/SConscript b/Filters/src/SConscript index de930b2787..c8c6675f06 100644 --- a/Filters/src/SConscript +++ b/Filters/src/SConscript @@ -36,7 +36,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -44,6 +44,8 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -52,7 +54,6 @@ helper.make_plugins( [ 'General', rootlibs, 'boost_filesystem', - 'boost_system', 'hep_concurrency', 'xerces-c', 'pthread' diff --git a/Filters/src/SelectStepPointsByTime_module.cc b/Filters/src/SelectStepPointsByTime_module.cc index 5242cad5fb..b156cbec20 100644 --- a/Filters/src/SelectStepPointsByTime_module.cc +++ b/Filters/src/SelectStepPointsByTime_module.cc @@ -18,6 +18,7 @@ #include "art/Framework/Principal/Handle.h" #include "art/Framework/Core/ModuleMacros.h" #include "canvas/Utilities/InputTag.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/StepPointMC.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" diff --git a/Filters/src/VetoIncorrectHits_module.cc b/Filters/src/VetoIncorrectHits_module.cc index 4e609d0159..d7e4e0f616 100644 --- a/Filters/src/VetoIncorrectHits_module.cc +++ b/Filters/src/VetoIncorrectHits_module.cc @@ -14,6 +14,7 @@ #include "art/Framework/Core/ModuleMacros.h" #include "CLHEP/Units/SystemOfUnits.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "Mu2eUtilities/inc/TwoLinePCA.hh" #include "TrackerGeom/inc/Tracker.hh" #include "MCDataProducts/inc/StepPointMCCollection.hh" diff --git a/GeneralUtilities/src/ParameterSetFromFile.cc b/GeneralUtilities/src/ParameterSetFromFile.cc index a02368f8fc..82770d08a5 100644 --- a/GeneralUtilities/src/ParameterSetFromFile.cc +++ b/GeneralUtilities/src/ParameterSetFromFile.cc @@ -20,9 +20,8 @@ ParameterSetFromFile( std::string const& fileName ): { cet::filepath_lookup policy("FHICL_FILE_PATH"); - fhicl::intermediate_table tbl; - fhicl::parse_document(_fileName, policy, tbl); - fhicl::make_ParameterSet(tbl, _pSet); + fhicl::intermediate_table tbl = fhicl::parse_document(_fileName, policy); + _pSet = fhicl::ParameterSet::make(tbl); } diff --git a/GeneralUtilities/src/SConscript b/GeneralUtilities/src/SConscript index 1e0dc3e2d3..07a9d62c8b 100644 --- a/GeneralUtilities/src/SConscript +++ b/GeneralUtilities/src/SConscript @@ -15,12 +15,13 @@ mainlib = helper.make_mainlib ( [ 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'boost_regex', 'boost_filesystem', - 'boost_system', ] ) diff --git a/GeometryService/inc/GeometryService.hh b/GeometryService/inc/GeometryService.hh index e61106f471..ac279e5e2a 100644 --- a/GeometryService/inc/GeometryService.hh +++ b/GeometryService/inc/GeometryService.hh @@ -15,7 +15,7 @@ #include "fhiclcpp/ParameterSet.h" #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "cetlib_except/exception.h" #include "ConfigTools/inc/SimpleConfig.hh" diff --git a/GeometryService/src/GeometryService_service.cc b/GeometryService/src/GeometryService_service.cc index 5915092314..04f0a199d5 100644 --- a/GeometryService/src/GeometryService_service.cc +++ b/GeometryService/src/GeometryService_service.cc @@ -11,6 +11,7 @@ // Framework include files #include "art/Persistency/Provenance/ModuleDescription.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "canvas/Persistency/Provenance/EventID.h" #include "canvas/Persistency/Provenance/Timestamp.h" #include "canvas/Persistency/Provenance/SubRunID.h" diff --git a/GeometryService/src/SConscript b/GeometryService/src/SConscript index 92d98176fb..83c85d6646 100644 --- a/GeometryService/src/SConscript +++ b/GeometryService/src/SConscript @@ -40,12 +40,12 @@ mainlib = helper.make_mainlib ( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', 'cetlib', 'cetlib_except', 'CLHEP', 'boost_iostreams', 'boost_regex', - 'boost_system', 'Core' ] ) @@ -70,12 +70,13 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', ] ) helper.make_dict_and_map( [ diff --git a/GlobalConstantsService/inc/GlobalConstantsService.hh b/GlobalConstantsService/inc/GlobalConstantsService.hh index d6fc034413..ff4607f8cd 100644 --- a/GlobalConstantsService/inc/GlobalConstantsService.hh +++ b/GlobalConstantsService/inc/GlobalConstantsService.hh @@ -10,7 +10,7 @@ #include "fhiclcpp/ParameterSet.h" #include "art/Framework/Services/Registry/ActivityRegistry.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "ConfigTools/inc/SimpleConfig.hh" #include "Mu2eInterfaces/inc/ConditionsEntity.hh" diff --git a/GlobalConstantsService/src/GlobalConstantsService_service.cc b/GlobalConstantsService/src/GlobalConstantsService_service.cc index d82178737c..b25c265fc5 100644 --- a/GlobalConstantsService/src/GlobalConstantsService_service.cc +++ b/GlobalConstantsService/src/GlobalConstantsService_service.cc @@ -2,6 +2,7 @@ // Need to have the main implementation in GlobalConstantsService.so // so that the link of GeomHandle will have no undefined references. // +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "GlobalConstantsService/inc/GlobalConstantsService.hh" DEFINE_ART_SERVICE(mu2e::GlobalConstantsService); diff --git a/GlobalConstantsService/src/SConscript b/GlobalConstantsService/src/SConscript index fad4d7e9e6..789b8ca2d6 100644 --- a/GlobalConstantsService/src/SConscript +++ b/GlobalConstantsService/src/SConscript @@ -20,10 +20,11 @@ mainlib = helper.make_mainlib ( [ 'art_Framework_Services_Registry', 'HepPID', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', - 'boost_system', ] ) helper.make_plugins( [ mainlib, @@ -31,7 +32,6 @@ helper.make_plugins( [ mainlib, 'art_Utilities', 'canvas', 'boost_filesystem', - 'boost_system', ] ) # This tells emacs to view this file in python mode. diff --git a/HelloWorld/src/SConscript b/HelloWorld/src/SConscript index 95903f9865..d871fc6fd4 100644 --- a/HelloWorld/src/SConscript +++ b/HelloWorld/src/SConscript @@ -22,10 +22,11 @@ helper.make_plugins( [ mainlib, 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', 'Core', ] ) diff --git a/MCDataProducts/src/SConscript b/MCDataProducts/src/SConscript index b46d49ad47..c140b08252 100644 --- a/MCDataProducts/src/SConscript +++ b/MCDataProducts/src/SConscript @@ -26,7 +26,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_GeometryService', 'cetlib', 'cetlib_except', 'CLHEP', - 'boost_system', 'Core' ] ) diff --git a/Mu2eBTrk/src/SConscript b/Mu2eBTrk/src/SConscript index 4da29e2f52..0579d79d55 100644 --- a/Mu2eBTrk/src/SConscript +++ b/Mu2eBTrk/src/SConscript @@ -25,21 +25,22 @@ mainlib = helper.make_mainlib ( [ 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', 'HepPDT', 'HepPID', - 'xerces-c', - 'boost_system', + 'xerces-c' ] ) # Fixme: split into link lists for each module. @@ -57,7 +58,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -72,7 +73,6 @@ helper.make_plugins( [ rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) diff --git a/Mu2eG4/src/ConstructEnvBox_tool.cc b/Mu2eG4/src/ConstructEnvBox_tool.cc index 5aa815fbf1..cc7c5b07c7 100644 --- a/Mu2eG4/src/ConstructEnvBox_tool.cc +++ b/Mu2eG4/src/ConstructEnvBox_tool.cc @@ -11,6 +11,7 @@ // #include "art/Utilities/ToolMacros.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes. diff --git a/Mu2eG4/src/ConstructEnvCalo01_tool.cc b/Mu2eG4/src/ConstructEnvCalo01_tool.cc index ed6bdaf4b0..fb75391770 100644 --- a/Mu2eG4/src/ConstructEnvCalo01_tool.cc +++ b/Mu2eG4/src/ConstructEnvCalo01_tool.cc @@ -11,6 +11,7 @@ // #include "art/Utilities/ToolMacros.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes. diff --git a/Mu2eG4/src/ConstructEnvMuCapture_tool.cc b/Mu2eG4/src/ConstructEnvMuCapture_tool.cc index e42bae244b..3d1b15e2dc 100644 --- a/Mu2eG4/src/ConstructEnvMuCapture_tool.cc +++ b/Mu2eG4/src/ConstructEnvMuCapture_tool.cc @@ -11,6 +11,7 @@ // #include "art/Utilities/ToolMacros.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes. diff --git a/Mu2eG4/src/ConstructEnvTube_tool.cc b/Mu2eG4/src/ConstructEnvTube_tool.cc index 1e7031df00..a7e4c22f7b 100644 --- a/Mu2eG4/src/ConstructEnvTube_tool.cc +++ b/Mu2eG4/src/ConstructEnvTube_tool.cc @@ -11,6 +11,7 @@ // #include "art/Utilities/ToolMacros.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes. diff --git a/Mu2eG4/src/ConstructTrackerDetail5.cc b/Mu2eG4/src/ConstructTrackerDetail5.cc index ca736c86e8..1689ff60dc 100644 --- a/Mu2eG4/src/ConstructTrackerDetail5.cc +++ b/Mu2eG4/src/ConstructTrackerDetail5.cc @@ -7,6 +7,7 @@ // David Norvil Brown (Louisville), November 2017 // +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "ConfigTools/inc/SimpleConfig.hh" #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" #include "GeometryService/inc/GeomHandle.hh" diff --git a/Mu2eG4/src/HelicalProtonAbsorber.cc b/Mu2eG4/src/HelicalProtonAbsorber.cc index a03fda058d..bb855bbebb 100644 --- a/Mu2eG4/src/HelicalProtonAbsorber.cc +++ b/Mu2eG4/src/HelicalProtonAbsorber.cc @@ -8,6 +8,9 @@ // Notes: // Construct the Helical Proton Absorber +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // C++ includes #include diff --git a/Mu2eG4/src/Mu2eG4Cuts.cc b/Mu2eG4/src/Mu2eG4Cuts.cc index f1d49528f9..fdedf8d1fb 100644 --- a/Mu2eG4/src/Mu2eG4Cuts.cc +++ b/Mu2eG4/src/Mu2eG4Cuts.cc @@ -5,6 +5,7 @@ #include #include #include +#include #include "cetlib_except/exception.h" #include "fhiclcpp/ParameterSet.h" diff --git a/Mu2eG4/src/Mu2eG4MTRunManager.cc b/Mu2eG4/src/Mu2eG4MTRunManager.cc index 530d7fde4f..ef9012567f 100644 --- a/Mu2eG4/src/Mu2eG4MTRunManager.cc +++ b/Mu2eG4/src/Mu2eG4MTRunManager.cc @@ -11,6 +11,7 @@ //Framework includes #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" //Mu2e includes #include "Mu2eG4/inc/Mu2eG4MTRunManager.hh" diff --git a/Mu2eG4/src/Mu2eG4MT_module.cc b/Mu2eG4/src/Mu2eG4MT_module.cc index 432e082670..e01c947a6a 100644 --- a/Mu2eG4/src/Mu2eG4MT_module.cc +++ b/Mu2eG4/src/Mu2eG4MT_module.cc @@ -44,6 +44,7 @@ #include "art/Framework/Services/Registry/ServiceHandle.h" #include "canvas/Utilities/InputTag.h" #include "art/Utilities/Globals.h" +#include "messagefacility/MessageLogger/MessageLogger.h" // Geant4 includes #include "Geant4/G4Run.hh" @@ -72,7 +73,7 @@ namespace { namespace tbb { template<> - struct tbb_hash_compare { + struct tbb::detail::d1::tbb_hash_compare { tbb_hash_compare() {} static size_t hash(std::thread::id tid) { std::ostringstream oss; diff --git a/Mu2eG4/src/Mu2eG4_module.cc b/Mu2eG4/src/Mu2eG4_module.cc index e4c60d4ffa..a6d9e61525 100644 --- a/Mu2eG4/src/Mu2eG4_module.cc +++ b/Mu2eG4/src/Mu2eG4_module.cc @@ -7,6 +7,8 @@ // Mu2e includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "MCDataProducts/inc/GenParticleCollection.hh" #include "Mu2eHallGeom/inc/Mu2eHall.hh" #include "Mu2eG4/inc/WorldMaker.hh" diff --git a/Mu2eG4/src/Mu2eStudyWorld.cc b/Mu2eG4/src/Mu2eStudyWorld.cc index c2589496e8..1cb7b83aec 100644 --- a/Mu2eG4/src/Mu2eStudyWorld.cc +++ b/Mu2eG4/src/Mu2eStudyWorld.cc @@ -18,6 +18,7 @@ #include "messagefacility/MessageLogger/MessageLogger.h" #include "cetlib_except/exception.h" #include "art/Utilities/make_tool.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" diff --git a/Mu2eG4/src/Mu2eUniverse.cc b/Mu2eG4/src/Mu2eUniverse.cc index 01c31e0ede..0d1166545d 100644 --- a/Mu2eG4/src/Mu2eUniverse.cc +++ b/Mu2eG4/src/Mu2eUniverse.cc @@ -14,6 +14,7 @@ // Framework includes #include "art/Framework/Services/Registry/ServiceHandle.h" #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" diff --git a/Mu2eG4/src/Mu2eWorld.cc b/Mu2eG4/src/Mu2eWorld.cc index da97e52641..f0cf7d093c 100644 --- a/Mu2eG4/src/Mu2eWorld.cc +++ b/Mu2eG4/src/Mu2eWorld.cc @@ -27,6 +27,7 @@ // Framework includes #include "messagefacility/MessageLogger/MessageLogger.h" #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes #include "ConfigTools/inc/checkForStale.hh" diff --git a/Mu2eG4/src/SConscript b/Mu2eG4/src/SConscript index e75f6f2135..9d72a70858 100644 --- a/Mu2eG4/src/SConscript +++ b/Mu2eG4/src/SConscript @@ -245,13 +245,14 @@ mainlib = helper.make_mainlib ( [ 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', 'MF_MessageLogger', 'cetlib', 'cetlib_except', @@ -262,7 +263,6 @@ mainlib = helper.make_mainlib ( [ 'CLHEP', 'Hist', 'Tree', 'Core', 'boost_regex', - 'boost_system', 'tbb', 'pthread', 'libcryptopp', @@ -285,7 +285,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -293,6 +293,8 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', G4LIBS, @@ -301,7 +303,6 @@ helper.make_plugins( [ 'CLHEP', 'Tree', 'Core', 'boost_filesystem', - 'boost_system', 'tbb', 'pthread', 'libcryptopp', diff --git a/Mu2eG4/src/SensitiveDetectorHelper.cc b/Mu2eG4/src/SensitiveDetectorHelper.cc index 5db4bbe0f2..5e8b2cebf2 100644 --- a/Mu2eG4/src/SensitiveDetectorHelper.cc +++ b/Mu2eG4/src/SensitiveDetectorHelper.cc @@ -31,6 +31,7 @@ #include "art/Framework/Principal/Event.h" #include "art/Framework/Core/ProducesCollector.h" #include "art/Framework/Services/Registry/ServiceHandle.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // From G4 #include "Geant4/G4VSensitiveDetector.hh" diff --git a/Mu2eG4/src/WorldMaker.cc b/Mu2eG4/src/WorldMaker.cc index 6482a44e49..a8fc7e45a9 100644 --- a/Mu2eG4/src/WorldMaker.cc +++ b/Mu2eG4/src/WorldMaker.cc @@ -19,6 +19,8 @@ #include "Mu2eG4/inc/Mu2eStudyWorld.hh" #include "Mu2eG4/inc/Mu2eWorld.hh" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include diff --git a/Mu2eG4/src/constructCRV.cc b/Mu2eG4/src/constructCRV.cc index cfbd21f102..7f66593473 100644 --- a/Mu2eG4/src/constructCRV.cc +++ b/Mu2eG4/src/constructCRV.cc @@ -6,6 +6,8 @@ // // Notes: +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // clhep includes #include "CLHEP/Vector/ThreeVector.h" diff --git a/Mu2eG4/src/constructDS.cc b/Mu2eG4/src/constructDS.cc index 5c21febc7a..f3ce38919e 100644 --- a/Mu2eG4/src/constructDS.cc +++ b/Mu2eG4/src/constructDS.cc @@ -38,6 +38,8 @@ // CLHEP includes #include "CLHEP/Vector/ThreeVector.h" #include "CLHEP/Vector/TwoVector.h" +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" using namespace std; diff --git a/Mu2eG4/src/constructDiskCalorimeter.cc b/Mu2eG4/src/constructDiskCalorimeter.cc index 8a108e57a8..09d2b38903 100644 --- a/Mu2eG4/src/constructDiskCalorimeter.cc +++ b/Mu2eG4/src/constructDiskCalorimeter.cc @@ -59,6 +59,8 @@ #include "CLHEP/Units/SystemOfUnits.h" #include "CLHEP/Vector/TwoVector.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include #include #include diff --git a/Mu2eG4/src/constructExtMonFNAL.cc b/Mu2eG4/src/constructExtMonFNAL.cc index 13ef5390fd..1dc0048818 100644 --- a/Mu2eG4/src/constructExtMonFNAL.cc +++ b/Mu2eG4/src/constructExtMonFNAL.cc @@ -13,6 +13,8 @@ #include "Geant4/G4ExtrudedSolid.hh" #include "Mu2eG4Helper/inc/AntiLeakRegistry.hh" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "GeometryService/inc/GeomHandle.hh" #include "GeometryService/inc/G4GeometryOptions.hh" #include "ProtonBeamDumpGeom/inc/ProtonBeamDump.hh" diff --git a/Mu2eG4/src/constructExtMonFNALBuilding.cc b/Mu2eG4/src/constructExtMonFNALBuilding.cc index 84e48b366b..8ed8f5bec2 100644 --- a/Mu2eG4/src/constructExtMonFNALBuilding.cc +++ b/Mu2eG4/src/constructExtMonFNALBuilding.cc @@ -32,6 +32,8 @@ #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "GeometryService/inc/GeomHandle.hh" #include "ProtonBeamDumpGeom/inc/ProtonBeamDump.hh" #include "ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALBuilding.hh" diff --git a/Mu2eG4/src/constructMBS.cc b/Mu2eG4/src/constructMBS.cc index 5c7214519d..f24c87287d 100644 --- a/Mu2eG4/src/constructMBS.cc +++ b/Mu2eG4/src/constructMBS.cc @@ -21,6 +21,9 @@ // At the time of the latter modification, version 4 is default. Once // the design of the CRV and STM are finalized, version 5 will be default. +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // clhep includes #include "CLHEP/Vector/ThreeVector.h" #include "CLHEP/Units/PhysicalConstants.h" diff --git a/Mu2eG4/src/constructMSTM.cc b/Mu2eG4/src/constructMSTM.cc index 5bf1c70ff1..ec5c7e4b6f 100644 --- a/Mu2eG4/src/constructMSTM.cc +++ b/Mu2eG4/src/constructMSTM.cc @@ -48,6 +48,9 @@ // CLHEP includes #include "CLHEP/Vector/ThreeVector.h" +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include #include #include diff --git a/Mu2eG4/src/constructPSEnclosure.cc b/Mu2eG4/src/constructPSEnclosure.cc index 79e4b2d61d..92480f4d70 100644 --- a/Mu2eG4/src/constructPSEnclosure.cc +++ b/Mu2eG4/src/constructPSEnclosure.cc @@ -4,6 +4,8 @@ #include "CLHEP/Vector/ThreeVector.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "ProductionSolenoidGeom/inc/PSEnclosure.hh" #include "ProductionSolenoidGeom/inc/PSVacuum.hh" #include "GeometryService/inc/GeometryService.hh" diff --git a/Mu2eG4/src/constructPSShield.cc b/Mu2eG4/src/constructPSShield.cc index 2fcd529ad6..104f6af424 100644 --- a/Mu2eG4/src/constructPSShield.cc +++ b/Mu2eG4/src/constructPSShield.cc @@ -19,6 +19,8 @@ #include "Mu2eG4Helper/inc/AntiLeakRegistry.hh" #include "Mu2eG4Helper/inc/VolumeInfo.hh" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "Mu2eG4/inc/findMaterialOrThrow.hh" #include "Mu2eG4/inc/finishNesting.hh" #include "Mu2eG4/inc/nestPolycone.hh" diff --git a/Mu2eG4/src/constructProtonAbsorber.cc b/Mu2eG4/src/constructProtonAbsorber.cc index aae6ee31f7..f8c1ef4cec 100644 --- a/Mu2eG4/src/constructProtonAbsorber.cc +++ b/Mu2eG4/src/constructProtonAbsorber.cc @@ -16,6 +16,7 @@ // Framework includes #include "messagefacility/MessageLogger/MessageLogger.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes. #include "Mu2eG4/inc/constructProtonAbsorber.hh" diff --git a/Mu2eG4/src/constructProtonBeamDump.cc b/Mu2eG4/src/constructProtonBeamDump.cc index a685228f4a..b2c13b4d16 100644 --- a/Mu2eG4/src/constructProtonBeamDump.cc +++ b/Mu2eG4/src/constructProtonBeamDump.cc @@ -31,6 +31,8 @@ #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "GeometryService/inc/G4GeometryOptions.hh" #include "GeometryService/inc/GeomHandle.hh" #include "ProtonBeamDumpGeom/inc/ProtonBeamDump.hh" diff --git a/Mu2eG4/src/constructSTM.cc b/Mu2eG4/src/constructSTM.cc index ed5972622b..bb30e8a66a 100644 --- a/Mu2eG4/src/constructSTM.cc +++ b/Mu2eG4/src/constructSTM.cc @@ -12,6 +12,9 @@ #include "CLHEP/Vector/ThreeVector.h" #include "CLHEP/Units/PhysicalConstants.h" +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // Mu2e includes. #include "Mu2eG4/inc/constructSTM.hh" diff --git a/Mu2eG4/src/constructStoppingTarget.cc b/Mu2eG4/src/constructStoppingTarget.cc index 30d4b225d7..d04f8294f2 100644 --- a/Mu2eG4/src/constructStoppingTarget.cc +++ b/Mu2eG4/src/constructStoppingTarget.cc @@ -17,6 +17,7 @@ // Framework includes #include "messagefacility/MessageLogger/MessageLogger.h" #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes #include "Mu2eG4/inc/constructStoppingTarget.hh" diff --git a/Mu2eG4/src/constructStudyEnv_v001.cc b/Mu2eG4/src/constructStudyEnv_v001.cc index 3e03a3854b..268fc30ab6 100644 --- a/Mu2eG4/src/constructStudyEnv_v001.cc +++ b/Mu2eG4/src/constructStudyEnv_v001.cc @@ -27,6 +27,9 @@ #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" #include "CLHEP/Units/SystemOfUnits.h" +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + using namespace std; namespace mu2e { diff --git a/Mu2eG4/src/constructTS.cc b/Mu2eG4/src/constructTS.cc index 76988cea76..b17451c112 100644 --- a/Mu2eG4/src/constructTS.cc +++ b/Mu2eG4/src/constructTS.cc @@ -22,6 +22,7 @@ // Framework includes #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes. #include "BeamlineGeom/inc/Collimator_TS1.hh" diff --git a/Mu2eG4/src/constructTSdA.cc b/Mu2eG4/src/constructTSdA.cc index fab974f018..f903d4ba50 100644 --- a/Mu2eG4/src/constructTSdA.cc +++ b/Mu2eG4/src/constructTSdA.cc @@ -9,6 +9,9 @@ // David Norvil Brown (the other one): rename to TSdA for consistency // with TDR, and update - May 2015. +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // clhep includes #include "CLHEP/Vector/ThreeVector.h" #include "CLHEP/Units/PhysicalConstants.h" diff --git a/Mu2eG4/src/constructTargetPS.cc b/Mu2eG4/src/constructTargetPS.cc index 91fb8a84df..723470ebe8 100644 --- a/Mu2eG4/src/constructTargetPS.cc +++ b/Mu2eG4/src/constructTargetPS.cc @@ -7,6 +7,9 @@ #include #include +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // Mu2e includes. #include "BeamlineGeom/inc/Beamline.hh" #include "ProductionSolenoidGeom/inc/ProductionSolenoid.hh" diff --git a/Mu2eG4/src/constructTrackerv5.cc b/Mu2eG4/src/constructTrackerv5.cc index 2e4dfae385..877307e016 100644 --- a/Mu2eG4/src/constructTrackerv5.cc +++ b/Mu2eG4/src/constructTrackerv5.cc @@ -29,6 +29,7 @@ // Framework includes #include "cetlib_except/exception.h" #include "messagefacility/MessageLogger/MessageLogger.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // Mu2e includes #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" diff --git a/Mu2eG4/src/constructVirtualDetectors.cc b/Mu2eG4/src/constructVirtualDetectors.cc index ca7243f0fa..b3a1327c4f 100644 --- a/Mu2eG4/src/constructVirtualDetectors.cc +++ b/Mu2eG4/src/constructVirtualDetectors.cc @@ -8,6 +8,9 @@ #include #include +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // Mu2e includes. #include "Mu2eG4/inc/constructVirtualDetectors.hh" diff --git a/Mu2eG4/src/constructVisualizationRegions.cc b/Mu2eG4/src/constructVisualizationRegions.cc index ffa55814b2..c57cd4dad5 100644 --- a/Mu2eG4/src/constructVisualizationRegions.cc +++ b/Mu2eG4/src/constructVisualizationRegions.cc @@ -21,6 +21,8 @@ #include "cetlib_except/exception.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "BFieldGeom/inc/BFieldManager.hh" #include "GeometryService/inc/GeomHandle.hh" #include "GeometryService/inc/WorldG4.hh" diff --git a/Mu2eG4/src/constructWorldVolume.cc b/Mu2eG4/src/constructWorldVolume.cc index 5fde73cf75..44bfe6d504 100644 --- a/Mu2eG4/src/constructWorldVolume.cc +++ b/Mu2eG4/src/constructWorldVolume.cc @@ -5,6 +5,9 @@ // Original author KLG based on Mu2eWorld constructDirt // Updated by Andrei Gaponenko. +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // Mu2e includes. #include "Mu2eG4/inc/constructWorldVolume.hh" #include "Mu2eG4Helper/inc/VolumeInfo.hh" diff --git a/Mu2eG4/src/finishNesting.cc b/Mu2eG4/src/finishNesting.cc index 5a3880c7f1..8ac2d3e7d4 100644 --- a/Mu2eG4/src/finishNesting.cc +++ b/Mu2eG4/src/finishNesting.cc @@ -9,6 +9,9 @@ #include #include +// art includes +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + // Mu2e includes #include "Mu2eG4/inc/finishNesting.hh" #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" diff --git a/Mu2eG4/src/generateFieldMap.cc b/Mu2eG4/src/generateFieldMap.cc index 0d3cd67452..5b8911882e 100644 --- a/Mu2eG4/src/generateFieldMap.cc +++ b/Mu2eG4/src/generateFieldMap.cc @@ -18,6 +18,7 @@ #include "art_root_io/TFileService.h" #include "art/Framework/Principal/Handle.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // G4 includes #include "Geant4/G4TransportationManager.hh" diff --git a/Mu2eG4Helper/inc/Mu2eG4Helper.hh b/Mu2eG4Helper/inc/Mu2eG4Helper.hh index 8ccbaa057e..478a83815f 100644 --- a/Mu2eG4Helper/inc/Mu2eG4Helper.hh +++ b/Mu2eG4Helper/inc/Mu2eG4Helper.hh @@ -17,7 +17,7 @@ // Framework include files #include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "boost/regex.hpp" diff --git a/Mu2eG4Helper/src/Mu2eG4Helper_service.cc b/Mu2eG4Helper/src/Mu2eG4Helper_service.cc index 70c4d1b301..161e07e3fd 100644 --- a/Mu2eG4Helper/src/Mu2eG4Helper_service.cc +++ b/Mu2eG4Helper/src/Mu2eG4Helper_service.cc @@ -9,6 +9,7 @@ // Mu2e includes #include "Mu2eG4Helper/inc/Mu2eG4Helper.hh" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" using namespace std; diff --git a/Mu2eG4Helper/src/SConscript b/Mu2eG4Helper/src/SConscript index d4c8f168f7..d7dab089d6 100644 --- a/Mu2eG4Helper/src/SConscript +++ b/Mu2eG4Helper/src/SConscript @@ -19,7 +19,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_GeometryService', 'cetlib', 'cetlib_except', 'Core', - 'boost_system' ] ) helper.make_plugins( [ mainlib, @@ -29,11 +28,12 @@ helper.make_plugins( [ mainlib, 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'boost_filesystem', 'boost_regex', - 'boost_system', 'Core', ] ) diff --git a/Mu2eKinKal/src/SConscript b/Mu2eKinKal/src/SConscript index 58f07200eb..8de3329e6d 100644 --- a/Mu2eKinKal/src/SConscript +++ b/Mu2eKinKal/src/SConscript @@ -32,13 +32,15 @@ mainlib = helper.make_mainlib([ 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'Fit', @@ -72,7 +74,7 @@ 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', @@ -80,6 +82,8 @@ helper.make_plugins([mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -93,7 +97,6 @@ helper.make_plugins([mainlib, extrarootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', 'pthread' ]) diff --git a/Mu2eUtilities/src/SConscript b/Mu2eUtilities/src/SConscript index 8ea4e9eee2..42f8342b4d 100644 --- a/Mu2eUtilities/src/SConscript +++ b/Mu2eUtilities/src/SConscript @@ -31,7 +31,7 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService_ConditionsService_serv 'art_Persistency_Common', 'art_Persistency_Provenance', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Principal', @@ -43,6 +43,8 @@ mainlib = helper.make_mainlib ( [ 'mu2e_ConditionsService_ConditionsService_serv 'HepPDT', XERCESC_LIBS, 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'hep_concurrency', diff --git a/Mu2eUtilities/src/SimParticleParentGetter.cc b/Mu2eUtilities/src/SimParticleParentGetter.cc index 71ccbe0e77..ebe9a77fb2 100644 --- a/Mu2eUtilities/src/SimParticleParentGetter.cc +++ b/Mu2eUtilities/src/SimParticleParentGetter.cc @@ -44,16 +44,14 @@ namespace mu2e { if(stepPointMap_.empty()) { // need to load the associations typedef std::vector > StepPointHandles; - StepPointHandles stepPointResults; - evt_->getManyByType(stepPointResults); + StepPointHandles stepPointResults = evt_->getMany(); if (stepPointResults.empty() ) { //no associations with StepPoints. Trying with simparticle end points if (simParticleMap_.empty()) { //need to load the associations typedef std::vector > SimParticleHandles; - SimParticleHandles simParticleResults; - evt_->getManyByType(simParticleResults); + SimParticleHandles simParticleResults = evt_->getMany(); for(SimParticleHandles::const_iterator h = simParticleResults.begin(); h != simParticleResults.end(); ++h) { AGDEBUG("In loop over simParticleHandles"); diff --git a/ParticleID/src/PIDLogL1D.cc b/ParticleID/src/PIDLogL1D.cc index 6781210d6c..dc19ca2575 100644 --- a/ParticleID/src/PIDLogL1D.cc +++ b/ParticleID/src/PIDLogL1D.cc @@ -5,6 +5,7 @@ #include #include #include +#include #include "fhiclcpp/types/Table.h" diff --git a/ParticleID/src/PIDLogLEp.cc b/ParticleID/src/PIDLogLEp.cc index a77896bf33..d8bfb57b20 100644 --- a/ParticleID/src/PIDLogLEp.cc +++ b/ParticleID/src/PIDLogLEp.cc @@ -5,6 +5,7 @@ #include #include #include +#include #include "fhiclcpp/types/Table.h" diff --git a/ParticleID/src/SConscript b/ParticleID/src/SConscript index 0e893a5065..918cedd137 100644 --- a/ParticleID/src/SConscript +++ b/ParticleID/src/SConscript @@ -29,7 +29,7 @@ libs = [ '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', @@ -37,13 +37,14 @@ libs = [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, 'Minuit', 'boost_filesystem', - 'boost_system', 'pthread' ] diff --git a/Print/artProductSizes/SConscript b/Print/artProductSizes/SConscript index 367392b97f..c6fb3ec761 100644 --- a/Print/artProductSizes/SConscript +++ b/Print/artProductSizes/SConscript @@ -9,7 +9,7 @@ helper=mu2e_helper(env) rootlibs = env['ROOTLIBS'] # Boost libraries need for this executable only. -boostlibs = [ 'boost_filesystem', 'boost_iostreams', 'boost_system' ] +boostlibs = [ 'boost_filesystem', 'boost_iostreams' ] target = 'artProductSizes' diff --git a/Print/src/BkgClusterPrinter.cc b/Print/src/BkgClusterPrinter.cc index f66b1ee249..c2c8735661 100644 --- a/Print/src/BkgClusterPrinter.cc +++ b/Print/src/BkgClusterPrinter.cc @@ -10,8 +10,7 @@ mu2e::BkgClusterPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/BkgQualPrinter.cc b/Print/src/BkgQualPrinter.cc index cc84ebb236..b80deb95d5 100644 --- a/Print/src/BkgQualPrinter.cc +++ b/Print/src/BkgQualPrinter.cc @@ -10,8 +10,7 @@ mu2e::BkgQualPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CaloClusterPrinter.cc b/Print/src/CaloClusterPrinter.cc index f476ff80b1..ea6a3455bb 100644 --- a/Print/src/CaloClusterPrinter.cc +++ b/Print/src/CaloClusterPrinter.cc @@ -10,8 +10,7 @@ mu2e::CaloClusterPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CaloDigiPrinter.cc b/Print/src/CaloDigiPrinter.cc index 1ca998b337..b59a21e8c6 100644 --- a/Print/src/CaloDigiPrinter.cc +++ b/Print/src/CaloDigiPrinter.cc @@ -10,8 +10,7 @@ mu2e::CaloDigiPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CaloHitPrinter.cc b/Print/src/CaloHitPrinter.cc index a42f922e3d..0a59d44fd5 100644 --- a/Print/src/CaloHitPrinter.cc +++ b/Print/src/CaloHitPrinter.cc @@ -10,8 +10,7 @@ mu2e::CaloHitPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CaloRecoDigiPrinter.cc b/Print/src/CaloRecoDigiPrinter.cc index 7e53c731db..87f88e405d 100644 --- a/Print/src/CaloRecoDigiPrinter.cc +++ b/Print/src/CaloRecoDigiPrinter.cc @@ -10,8 +10,7 @@ mu2e::CaloRecoDigiPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CaloShowerStepPrinter.cc b/Print/src/CaloShowerStepPrinter.cc index d8b07169d1..b7473c75e1 100644 --- a/Print/src/CaloShowerStepPrinter.cc +++ b/Print/src/CaloShowerStepPrinter.cc @@ -10,8 +10,7 @@ mu2e::CaloShowerStepPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/ComboHitPrinter.cc b/Print/src/ComboHitPrinter.cc index 5a26cb5ec4..b0a477989a 100644 --- a/Print/src/ComboHitPrinter.cc +++ b/Print/src/ComboHitPrinter.cc @@ -10,8 +10,7 @@ mu2e::ComboHitPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CrvCoincidenceClusterPrinter.cc b/Print/src/CrvCoincidenceClusterPrinter.cc index 6e06b92806..8ce01b7982 100644 --- a/Print/src/CrvCoincidenceClusterPrinter.cc +++ b/Print/src/CrvCoincidenceClusterPrinter.cc @@ -10,8 +10,7 @@ mu2e::CrvCoincidenceClusterPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CrvDigiMCPrinter.cc b/Print/src/CrvDigiMCPrinter.cc index 13ab79dc83..444381d31c 100644 --- a/Print/src/CrvDigiMCPrinter.cc +++ b/Print/src/CrvDigiMCPrinter.cc @@ -10,8 +10,7 @@ mu2e::CrvDigiMCPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CrvDigiPrinter.cc b/Print/src/CrvDigiPrinter.cc index 6ffd2bb8cc..c51d0eb13c 100644 --- a/Print/src/CrvDigiPrinter.cc +++ b/Print/src/CrvDigiPrinter.cc @@ -10,8 +10,7 @@ mu2e::CrvDigiPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CrvRecoPulsePrinter.cc b/Print/src/CrvRecoPulsePrinter.cc index 17a5817a2e..113c97e514 100644 --- a/Print/src/CrvRecoPulsePrinter.cc +++ b/Print/src/CrvRecoPulsePrinter.cc @@ -10,8 +10,7 @@ mu2e::CrvRecoPulsePrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/CrvStepPrinter.cc b/Print/src/CrvStepPrinter.cc index 2e52321a92..3b6f8c96a4 100644 --- a/Print/src/CrvStepPrinter.cc +++ b/Print/src/CrvStepPrinter.cc @@ -10,8 +10,7 @@ mu2e::CrvStepPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/GenParticlePrinter.cc b/Print/src/GenParticlePrinter.cc index 1d4238ccf2..bca8d55d5f 100644 --- a/Print/src/GenParticlePrinter.cc +++ b/Print/src/GenParticlePrinter.cc @@ -10,8 +10,7 @@ mu2e::GenParticlePrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/KalRepPrinter.cc b/Print/src/KalRepPrinter.cc index 2c3e3b06b8..730826ee6a 100644 --- a/Print/src/KalRepPrinter.cc +++ b/Print/src/KalRepPrinter.cc @@ -19,8 +19,7 @@ mu2e::KalRepPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/KalSeedPrinter.cc b/Print/src/KalSeedPrinter.cc index e751bfd8d7..de9205e636 100644 --- a/Print/src/KalSeedPrinter.cc +++ b/Print/src/KalSeedPrinter.cc @@ -11,8 +11,7 @@ mu2e::KalSeedPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/MCTrajectoryPrinter.cc b/Print/src/MCTrajectoryPrinter.cc index 0d25feeee5..ad314c285c 100644 --- a/Print/src/MCTrajectoryPrinter.cc +++ b/Print/src/MCTrajectoryPrinter.cc @@ -10,8 +10,7 @@ mu2e::MCTrajectoryPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/PhysicalVolumePrinter.cc b/Print/src/PhysicalVolumePrinter.cc index 9d9c15529d..d9bacf6f4d 100644 --- a/Print/src/PhysicalVolumePrinter.cc +++ b/Print/src/PhysicalVolumePrinter.cc @@ -10,8 +10,7 @@ mu2e::PhysicalVolumePrinter::PrintSubRun(art::SubRun const& subrun, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - subrun.getManyByType(vah); + std::vector< art::Handle > vah = subrun.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/PrimaryParticlePrinter.cc b/Print/src/PrimaryParticlePrinter.cc index 11544e0df0..3b4b673a50 100644 --- a/Print/src/PrimaryParticlePrinter.cc +++ b/Print/src/PrimaryParticlePrinter.cc @@ -11,8 +11,7 @@ mu2e::PrimaryParticlePrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/SConscript b/Print/src/SConscript index 7cf7efe7e5..c173ce8754 100644 --- a/Print/src/SConscript +++ b/Print/src/SConscript @@ -26,13 +26,15 @@ mainlib = helper.make_mainlib ( [ 'mu2e_GeometryService', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'Trajectory', @@ -41,7 +43,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_GeometryService', 'CLHEP', 'HepPDT', 'boost_filesystem', - 'boost_system' ] ) @@ -56,13 +57,15 @@ 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_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -71,7 +74,6 @@ helper.make_plugins( [ mainlib, rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) # this tells emacs to view this file in python mode. diff --git a/Print/src/SimParticlePrinter.cc b/Print/src/SimParticlePrinter.cc index d50d2f2718..26b1792aea 100644 --- a/Print/src/SimParticlePrinter.cc +++ b/Print/src/SimParticlePrinter.cc @@ -10,8 +10,7 @@ mu2e::SimParticlePrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/SimParticlePtrPrinter.cc b/Print/src/SimParticlePtrPrinter.cc index 83d47cdac6..6bf495e291 100644 --- a/Print/src/SimParticlePtrPrinter.cc +++ b/Print/src/SimParticlePtrPrinter.cc @@ -10,8 +10,7 @@ mu2e::SimParticlePtrPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/SimParticleTimeMapPrinter.cc b/Print/src/SimParticleTimeMapPrinter.cc index 3a7cd94225..1ea046fb50 100644 --- a/Print/src/SimParticleTimeMapPrinter.cc +++ b/Print/src/SimParticleTimeMapPrinter.cc @@ -10,8 +10,7 @@ mu2e::SimParticleTimeMapPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StatusG4Printer.cc b/Print/src/StatusG4Printer.cc index 4405023114..90b11a02a9 100644 --- a/Print/src/StatusG4Printer.cc +++ b/Print/src/StatusG4Printer.cc @@ -10,8 +10,7 @@ mu2e::StatusG4Printer::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StepPointMCPrinter.cc b/Print/src/StepPointMCPrinter.cc index f61758fb57..da9c059594 100644 --- a/Print/src/StepPointMCPrinter.cc +++ b/Print/src/StepPointMCPrinter.cc @@ -10,8 +10,7 @@ mu2e::StepPointMCPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StrawDigiADCWaveformPrinter.cc b/Print/src/StrawDigiADCWaveformPrinter.cc index bc07b1169f..f904eb46ba 100644 --- a/Print/src/StrawDigiADCWaveformPrinter.cc +++ b/Print/src/StrawDigiADCWaveformPrinter.cc @@ -10,8 +10,7 @@ mu2e::StrawDigiADCWaveformPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StrawDigiMCPrinter.cc b/Print/src/StrawDigiMCPrinter.cc index 685ca76323..5878e064ae 100644 --- a/Print/src/StrawDigiMCPrinter.cc +++ b/Print/src/StrawDigiMCPrinter.cc @@ -10,8 +10,7 @@ mu2e::StrawDigiMCPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StrawDigiPrinter.cc b/Print/src/StrawDigiPrinter.cc index d97753575e..6b5e196be3 100644 --- a/Print/src/StrawDigiPrinter.cc +++ b/Print/src/StrawDigiPrinter.cc @@ -10,8 +10,7 @@ mu2e::StrawDigiPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StrawGasStepPrinter.cc b/Print/src/StrawGasStepPrinter.cc index 3393f243bd..1c6848259a 100644 --- a/Print/src/StrawGasStepPrinter.cc +++ b/Print/src/StrawGasStepPrinter.cc @@ -10,8 +10,7 @@ mu2e::StrawGasStepPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StrawHitFlagPrinter.cc b/Print/src/StrawHitFlagPrinter.cc index 22c0499353..e0307fc99f 100644 --- a/Print/src/StrawHitFlagPrinter.cc +++ b/Print/src/StrawHitFlagPrinter.cc @@ -10,8 +10,7 @@ mu2e::StrawHitFlagPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/StrawHitPrinter.cc b/Print/src/StrawHitPrinter.cc index aaadab15ce..6b8dcca7ce 100644 --- a/Print/src/StrawHitPrinter.cc +++ b/Print/src/StrawHitPrinter.cc @@ -10,8 +10,7 @@ mu2e::StrawHitPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/TimeClusterPrinter.cc b/Print/src/TimeClusterPrinter.cc index fdff85d002..061b116296 100644 --- a/Print/src/TimeClusterPrinter.cc +++ b/Print/src/TimeClusterPrinter.cc @@ -10,8 +10,7 @@ mu2e::TimeClusterPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/TrackClusterMatchPrinter.cc b/Print/src/TrackClusterMatchPrinter.cc index fcce8fbf23..5c47334ffd 100644 --- a/Print/src/TrackClusterMatchPrinter.cc +++ b/Print/src/TrackClusterMatchPrinter.cc @@ -10,8 +10,7 @@ mu2e::TrackClusterMatchPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/TrackSummaryPrinter.cc b/Print/src/TrackSummaryPrinter.cc index 5629006b8a..6081ed6ed1 100644 --- a/Print/src/TrackSummaryPrinter.cc +++ b/Print/src/TrackSummaryPrinter.cc @@ -9,8 +9,7 @@ mu2e::TrackSummaryPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/TriggerResultsPrinter.cc b/Print/src/TriggerResultsPrinter.cc index a9e8054eb0..765f778d7e 100644 --- a/Print/src/TriggerResultsPrinter.cc +++ b/Print/src/TriggerResultsPrinter.cc @@ -12,8 +12,7 @@ mu2e::TriggerResultsPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/Print/src/TrkCaloIntersectPrinter.cc b/Print/src/TrkCaloIntersectPrinter.cc index cf790629d6..d05478c304 100644 --- a/Print/src/TrkCaloIntersectPrinter.cc +++ b/Print/src/TrkCaloIntersectPrinter.cc @@ -10,8 +10,7 @@ mu2e::TrkCaloIntersectPrinter::Print(art::Event const& event, if(verbose()<1) return; if(tags().empty()) { // if a list of instances not specified, print all instances - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) Print(ah); } else { // print requested instances diff --git a/ProditionsService/inc/ProditionsService.hh b/ProditionsService/inc/ProditionsService.hh index 9b5b0124ec..68ce8436ec 100644 --- a/ProditionsService/inc/ProditionsService.hh +++ b/ProditionsService/inc/ProditionsService.hh @@ -15,7 +15,7 @@ #include "fhiclcpp/types/OptionalSequence.h" #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "cetlib_except/exception.h" #include "Mu2eInterfaces/inc/ProditionsEntity.hh" diff --git a/ProditionsService/src/ProditionsService_service.cc b/ProditionsService/src/ProditionsService_service.cc index 41e9b9d175..f3d8e9ef82 100644 --- a/ProditionsService/src/ProditionsService_service.cc +++ b/ProditionsService/src/ProditionsService_service.cc @@ -3,6 +3,7 @@ // #include #include +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "DbService/inc/DbService.hh" #include "GeometryService/inc/GeometryService.hh" #include "ProditionsService/inc/ProditionsService.hh" diff --git a/ProditionsService/src/SConscript b/ProditionsService/src/SConscript index 7c0ffdc7b3..2d413a3962 100644 --- a/ProditionsService/src/SConscript +++ b/ProditionsService/src/SConscript @@ -46,7 +46,7 @@ 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', @@ -54,10 +54,11 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', 'pthread', 'xerces-c' ] ) diff --git a/RecoDataProducts/inc/CaloHit.hh b/RecoDataProducts/inc/CaloHit.hh index d441ddaba6..c8311cd39c 100644 --- a/RecoDataProducts/inc/CaloHit.hh +++ b/RecoDataProducts/inc/CaloHit.hh @@ -27,16 +27,20 @@ namespace mu2e { eDepErr_(0),timeErr_(0) {} - int crystalID () const { return crystalId_; } - int nSiPMs () const { return nSiPMs_;} - float time () const { return time_;} - float timeErr () const { return timeErr_;} - float energyDep () const { return eDep_;} - float energyDepErr () const { return eDepErr_;} - float energyDepTot () const { return eDep_*nSiPMs_;} + int crystalID () const { return crystalId_; } + int nSiPMs () const { return nSiPMs_;} + float time () const { return time_;} + float timeErr () const { return timeErr_;} + float energyDep () const { return eDep_;} + float energyDepErr () const { return eDepErr_;} + float energyDepTot () const { return eDep_*nSiPMs_;} float energyDepTotErr() const { return eDepErr_*nSiPMs_;} const std::vector>& recoCaloDigis () const { return recoCaloDigis_;} + void setCrystalID (int ID) { crystalId_ = ID; } + void setNSiPMs (int N) { nSiPMs_ = N; } + void setTime (float T) { time_ = T; } + void setEDep (float E) { eDep_ = E; } private: int crystalId_; diff --git a/RecoDataProducts/src/ComboHit.cc b/RecoDataProducts/src/ComboHit.cc index 40a324038b..93b628aefa 100644 --- a/RecoDataProducts/src/ComboHit.cc +++ b/RecoDataProducts/src/ComboHit.cc @@ -58,9 +58,8 @@ namespace mu2e { void ComboHitCollection::setParentHandle(art::Event const& event, art::Handle& phandle) const { // set the handle to an invalid state in case we find no such phandle = art::Handle(); - vector > all_handles; + vector > all_handles = event.getMany(); // exhaustive search is fast enough - event.getManyByType(all_handles); for (auto const& handle : all_handles) { if(_parent == handle.id()){ phandle = handle; diff --git a/RecoDataProducts/src/SConscript b/RecoDataProducts/src/SConscript index aaed484111..6dd62331ee 100644 --- a/RecoDataProducts/src/SConscript +++ b/RecoDataProducts/src/SConscript @@ -39,7 +39,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_DataProducts', 'CLHEP', 'Hist', 'Core', - 'boost_system' ] ) helper.make_dict_and_map( [ mainlib, @@ -63,7 +62,6 @@ helper.make_dict_and_map( [ mainlib, 'Core', 'art_Persistency_Common', 'art_Utilities', - 'boost_system' ], [ '-fvar-tracking-assignments-toggle'] ) diff --git a/Sandbox/inc/BarService.hh b/Sandbox/inc/BarService.hh index 71a96cd186..d8e2d0a4ee 100644 --- a/Sandbox/inc/BarService.hh +++ b/Sandbox/inc/BarService.hh @@ -13,7 +13,7 @@ #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" #include "art/Framework/Principal/Run.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" namespace mu2e { diff --git a/Sandbox/inc/Bug01Service.hh b/Sandbox/inc/Bug01Service.hh index 2c0314112e..623d8b7fd0 100644 --- a/Sandbox/inc/Bug01Service.hh +++ b/Sandbox/inc/Bug01Service.hh @@ -12,7 +12,7 @@ #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" #include "art/Framework/Principal/Run.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" namespace mu2e { diff --git a/Sandbox/inc/FooService.hh b/Sandbox/inc/FooService.hh index f4323b67a8..5d42053c86 100644 --- a/Sandbox/inc/FooService.hh +++ b/Sandbox/inc/FooService.hh @@ -13,7 +13,7 @@ #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" #include "art/Framework/Principal/Run.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" namespace mu2e { diff --git a/Sandbox/inc/XBarService.hh b/Sandbox/inc/XBarService.hh index 0b1b26c2b6..619197db8d 100644 --- a/Sandbox/inc/XBarService.hh +++ b/Sandbox/inc/XBarService.hh @@ -16,7 +16,7 @@ #include "art/Framework/Services/Registry/ActivityRegistry.h" #include "art/Framework/Services/Registry/ServiceHandle.h" #include "art/Framework/Principal/Run.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" namespace mu2e { diff --git a/Sandbox/src/BarService_service.cc b/Sandbox/src/BarService_service.cc index 9f5d94862c..8180e5ec44 100644 --- a/Sandbox/src/BarService_service.cc +++ b/Sandbox/src/BarService_service.cc @@ -48,6 +48,7 @@ // Framework include files #include "canvas/Persistency/Provenance/RunID.h" #include "art/Framework/Services/Registry/ServiceHandle.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" using namespace std; diff --git a/Sandbox/src/BarTest_module.cc b/Sandbox/src/BarTest_module.cc index d78c51b6ba..2e49de46b1 100644 --- a/Sandbox/src/BarTest_module.cc +++ b/Sandbox/src/BarTest_module.cc @@ -11,6 +11,7 @@ #include "art/Framework/Core/EDAnalyzer.h" #include "art/Framework/Core/ModuleMacros.h" #include "art/Framework/Principal/Event.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // C++ includes. #include diff --git a/Sandbox/src/Bug01Service_service.cc b/Sandbox/src/Bug01Service_service.cc index 0acf27138d..3c05a106c8 100644 --- a/Sandbox/src/Bug01Service_service.cc +++ b/Sandbox/src/Bug01Service_service.cc @@ -11,6 +11,7 @@ #include "canvas/Persistency/Provenance/RunID.h" #include "art/Framework/Services/Registry/ServiceHandle.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "cetlib_except/exception.h" diff --git a/Sandbox/src/FooService_service.cc b/Sandbox/src/FooService_service.cc index 4408afd0cb..c90146909e 100644 --- a/Sandbox/src/FooService_service.cc +++ b/Sandbox/src/FooService_service.cc @@ -12,6 +12,7 @@ // Framework include files #include "canvas/Persistency/Provenance/RunID.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" using namespace std; diff --git a/Sandbox/src/FooTest_module.cc b/Sandbox/src/FooTest_module.cc index e171a7d2a8..4f9c5d04d2 100644 --- a/Sandbox/src/FooTest_module.cc +++ b/Sandbox/src/FooTest_module.cc @@ -11,6 +11,7 @@ #include "art/Framework/Core/EDAnalyzer.h" #include "art/Framework/Core/ModuleMacros.h" #include "art/Framework/Principal/Event.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // C++ includes. #include diff --git a/Sandbox/src/SConscript b/Sandbox/src/SConscript index c0f386bd90..c8f71ab135 100644 --- a/Sandbox/src/SConscript +++ b/Sandbox/src/SConscript @@ -34,12 +34,13 @@ common = [ 'mu2e_SeedService_SeedService_service', 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', ] services = [ 'BarService_service.cc', @@ -60,7 +61,6 @@ helper.make_plugin( 'FooService_service.cc', 'canvas', 'fhiclcpp', 'boost_filesystem', - 'boost_system', 'Core' ], ) @@ -77,7 +77,6 @@ helper.make_plugin( 'BarService_service.cc', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', 'Core' ], ) @@ -94,7 +93,6 @@ helper.make_plugin( 'XBarService_service.cc', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', 'Core' ], ) @@ -111,7 +109,6 @@ helper.make_plugin( 'Bug01Service_service.cc', 'cetlib', 'cetlib_except', 'boost_filesystem', - 'boost_system', 'Core' ], ) @@ -148,7 +145,6 @@ helper.make_plugins( [ mainlib, 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', 'tbb', 'hep_concurrency' ], diff --git a/Sandbox/src/XBarService_service.cc b/Sandbox/src/XBarService_service.cc index b72e1d7422..1b167a2d32 100644 --- a/Sandbox/src/XBarService_service.cc +++ b/Sandbox/src/XBarService_service.cc @@ -16,6 +16,7 @@ // Framework include files #include "canvas/Persistency/Provenance/RunID.h" #include "art/Framework/Services/Registry/ServiceHandle.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" using namespace std; diff --git a/Sandbox/src/XBarTest_module.cc b/Sandbox/src/XBarTest_module.cc index faeacc8d96..ac6a49d66b 100644 --- a/Sandbox/src/XBarTest_module.cc +++ b/Sandbox/src/XBarTest_module.cc @@ -11,6 +11,7 @@ #include "art/Framework/Core/EDAnalyzer.h" #include "art/Framework/Core/ModuleMacros.h" #include "art/Framework/Principal/Event.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" // C++ includes. #include diff --git a/SeedService/inc/SeedService.hh b/SeedService/inc/SeedService.hh index c72c6eb4a2..f641f9c75f 100644 --- a/SeedService/inc/SeedService.hh +++ b/SeedService/inc/SeedService.hh @@ -98,7 +98,7 @@ // From art and its tool chain. #include "art/Framework/Core/detail/EngineCreator.h" #include "art/Framework/Services/Optional/RandomNumberGenerator.h" -#include "art/Framework/Services/Registry/ServiceMacros.h" +#include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" #include "fhiclcpp/ParameterSet.h" #include diff --git a/SeedService/src/SConscript b/SeedService/src/SConscript index 85ab18b269..75333408da 100644 --- a/SeedService/src/SConscript +++ b/SeedService/src/SConscript @@ -32,12 +32,13 @@ helper.make_plugin( 'SeedService_service.cc', 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', ] ) helper.make_plugins( [ @@ -58,7 +59,6 @@ helper.make_plugins( [ 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', ], [ 'SeedService_service.cc', ], ) diff --git a/SeedService/src/SeedService_service.cc b/SeedService/src/SeedService_service.cc index f08cccf98d..6bf2200636 100644 --- a/SeedService/src/SeedService_service.cc +++ b/SeedService/src/SeedService_service.cc @@ -18,6 +18,7 @@ #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/SubRun.h" #include "art/Framework/Services/Registry/ActivityRegistry.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "art/Persistency/Provenance/ModuleContext.h" #include "art/Persistency/Provenance/ModuleDescription.h" #include "canvas/Persistency/Provenance/EventID.h" diff --git a/SimulationConditions/src/SConscript b/SimulationConditions/src/SConscript index 291810d3cf..908c644759 100644 --- a/SimulationConditions/src/SConscript +++ b/SimulationConditions/src/SConscript @@ -36,11 +36,12 @@ mainlib = helper.make_mainlib ( [ 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'MathCore', - 'boost_system', rootlibs ] ) diff --git a/SimulationConditions/src/SimBookkeeperCache.cc b/SimulationConditions/src/SimBookkeeperCache.cc index 78d27b897b..3e9d5cd4b7 100644 --- a/SimulationConditions/src/SimBookkeeperCache.cc +++ b/SimulationConditions/src/SimBookkeeperCache.cc @@ -2,6 +2,8 @@ // SimBookkeeperCache for ProditionsCache // +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + #include "SimulationConditions/inc/SimBookkeeperCache.hh" namespace mu2e { diff --git a/Sources/src/SConscript b/Sources/src/SConscript index 48d06de5b0..017a45b154 100644 --- a/Sources/src/SConscript +++ b/Sources/src/SConscript @@ -29,20 +29,21 @@ mainlib = helper.make_mainlib(['mu2e_GlobalConstantsService', 'art_Persistency_Common', 'art_Framework_Services_Registry', 'art_Framework_Services_Optional_RandomNumberGenerator_service', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Framework_Principal', 'art_Framework_Core', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'MF_MessageLogger', 'cetlib', 'cetlib_except', 'CLHEP', 'HepPDT', 'HepPID', - 'boost_system', 'gsl', ] ) @@ -59,12 +60,13 @@ helper.make_plugins( [ mainlib, 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', 'mu2e_GeometryService', 'mu2e_SeedService_SeedService_service', 'mu2e_CalorimeterGeom', diff --git a/TEveEventDisplay/src/SConscript b/TEveEventDisplay/src/SConscript index b3956e1efd..98df179a7e 100644 --- a/TEveEventDisplay/src/SConscript +++ b/TEveEventDisplay/src/SConscript @@ -17,14 +17,14 @@ babarlibs = env['BABARLIBS'] rootlibs = env['ROOTLIBS'] extrarootlibs = [ 'Geom', 'Geom', 'GeomPainter', 'Ged', 'Graf3d', 'Eve','EG', 'RGL','Gui', "Gdml" , "Core", "Rint"] -userlibs = [ rootlibs, +userlibs = [ rootlibs, extrarootlibs, babarlibs, 'mu2e_DataProducts', 'mu2e_Mu2eBTrk', - 'mu2e_TrkReco', + 'mu2e_TrkReco', 'mu2e_BTrkData', - 'mu2e_Mu2eUtilities', + 'mu2e_Mu2eUtilities', 'mu2e_MCDataProducts', 'mu2e_RecoDataProducts', 'mu2e_GlobalConstantsService_GlobalConstantsService_service', @@ -42,7 +42,7 @@ userlibs = [ rootlibs, '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', @@ -50,6 +50,8 @@ userlibs = [ rootlibs, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'Trajectory', @@ -63,7 +65,7 @@ userlibs = [ rootlibs, ] -# when using ClassDef, tell the build to include the +# when using ClassDef, tell the build to include the # dictionary in the mainlib helper.classDef(True) @@ -79,5 +81,3 @@ helper.make_plugins( [ 'mu2e_TEveEventDisplay',userlibs ] ) # Local Variables: # mode:python # End: - - diff --git a/TrackCaloMatching/src/SConscript b/TrackCaloMatching/src/SConscript index 46384ddb18..e67c8261ba 100644 --- a/TrackCaloMatching/src/SConscript +++ b/TrackCaloMatching/src/SConscript @@ -32,7 +32,6 @@ mainlib = helper.make_mainlib ( [ 'CLHEP', 'cetlib', 'cetlib_except', - 'boost_system' ] ) helper.make_plugins( [ @@ -51,7 +50,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -59,13 +58,14 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', rootlibs, extrarootlibs, 'boost_filesystem', - 'boost_system', ] ) diff --git a/TrackerConditions/src/SConscript b/TrackerConditions/src/SConscript index b88d31fb09..2848d41e02 100644 --- a/TrackerConditions/src/SConscript +++ b/TrackerConditions/src/SConscript @@ -34,11 +34,12 @@ mainlib = helper.make_mainlib ( [ 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'MathCore', - 'boost_system', rootlibs ] ) diff --git a/TrackerGeom/src/SConscript b/TrackerGeom/src/SConscript index f1b46f3a7f..0a7b4d225f 100644 --- a/TrackerGeom/src/SConscript +++ b/TrackerGeom/src/SConscript @@ -15,7 +15,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_DataProducts', 'mu2e_Mu2eInterfaces', 'cetlib_except', 'CLHEP', - 'boost_system', 'Core' ] ) diff --git a/TrackerMC/src/MakeStrawGasSteps_module.cc b/TrackerMC/src/MakeStrawGasSteps_module.cc index 94327dbc52..6684593d28 100644 --- a/TrackerMC/src/MakeStrawGasSteps_module.cc +++ b/TrackerMC/src/MakeStrawGasSteps_module.cc @@ -11,6 +11,7 @@ #include "cetlib_except/exception.h" #include "fhiclcpp/types/Atom.h" #include "canvas/Utilities/InputTag.h" +#include "messagefacility/MessageLogger/MessageLogger.h" #include "TrackerGeom/inc/Tracker.hh" #include "GeometryService/inc/GeomHandle.hh" @@ -201,8 +202,7 @@ namespace mu2e { auto StrawGasStepCollectionGetter = event.productGetter(StrawGasStepCollectionPID); // Get all of the tracker StepPointMC collections from the event: // This selector will select only data products with the given instance name. - SPMCCHV stepsHandles; - event.getMany( _selector, stepsHandles); + SPMCCHV stepsHandles = event.getMany( _selector); // const Tracker& tracker = *GeomHandle(); // Informational message on the first event. if ( _firstEvent && _debug>0 ) { diff --git a/TrackerMC/src/SConscript b/TrackerMC/src/SConscript index e2fc1dc861..a52d9d1a5d 100644 --- a/TrackerMC/src/SConscript +++ b/TrackerMC/src/SConscript @@ -21,7 +21,7 @@ mainlib = helper.make_mainlib ( [ 'mu2e_TrackerConditions', 'mu2e_DataProducts', 'art_Persistency_Provenance', 'art_Persistency_Common', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Utilities', @@ -30,7 +30,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_TrackerConditions', 'cetlib_except', 'CLHEP', rootlibs, - 'boost_system', rootlibs ] ) @@ -53,7 +52,7 @@ 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', @@ -61,13 +60,14 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'BTrk_BField', 'CLHEP', 'HepPDT', 'boost_filesystem', - 'boost_system', rootlibs, 'pthread' ] ) diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index 12ed901e2d..d3ad5e1e3c 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -15,6 +15,7 @@ #include "art_root_io/TFileService.h" #include "SeedService/inc/SeedService.hh" #include "cetlib_except/exception.h" +#include "messagefacility/MessageLogger/MessageLogger.h" // conditions #include "ProditionsService/inc/ProditionsHandle.hh" #include "ConditionsService/inc/ConditionsHandle.hh" @@ -537,8 +538,7 @@ namespace mu2e { art::Event const& event, StrawClusterMap & hmap){ // Get all of the tracker StrawGasStep collections from the event: typedef vector< art::Handle > HandleVector; - HandleVector stepsHandles; - event.getMany( _selector, stepsHandles); + HandleVector stepsHandles = event.getMany( _selector); // Informational message on the first event. if ( _firstEvent ) { mf::LogInfo log(_messageCategory); diff --git a/Trigger/src/DigiFilter_module.cc b/Trigger/src/DigiFilter_module.cc index 56b55ed05b..b2be1095fd 100644 --- a/Trigger/src/DigiFilter_module.cc +++ b/Trigger/src/DigiFilter_module.cc @@ -14,7 +14,7 @@ #include "RecoDataProducts/inc/StrawDigiCollection.hh" #include "RecoDataProducts/inc/CaloDigi.hh" #include "RecoDataProducts/inc/CaloDigi.hh" -#include "RecoDataProducts/inc/TriggerInfo.hh" +// #include "RecoDataProducts/inc/TriggerInfo.hh" // c++ #include #include @@ -36,7 +36,7 @@ namespace mu2e art::InputTag _cdTag; bool _useSD; //flag for using the StrawDigi bool _useCD; //flag for using the CaloDigi - std::string _trigPath; + // std::string _trigPath; //list of the parameters used to perform the filtering int _minnsd; //minimum number of StrawDigi required @@ -56,7 +56,7 @@ namespace mu2e _cdTag (pset.get("caloDigiCollection")), _useSD (pset.get("useStrawDigi")), _useCD (pset.get("useCaloDigi")), - _trigPath (pset.get("triggerPath")), + // _trigPath (pset.get("triggerPath")), _minnsd (pset.get("minNStrawDigi")), _maxnsd (pset.get("maxNStrawDigi")), _minncd (pset.get("minNCaloDigi")), @@ -65,12 +65,12 @@ namespace mu2e _debug (pset.get("debugLevel",0)), _nevt(0), _npass(0) { - produces(); + // produces(); } bool DigiFilter::filter(art::Event& event){ // create output - unique_ptr triginfo(new TriggerInfo); + // unique_ptr triginfo(new TriggerInfo); ++_nevt; bool retval(false), retvalSD(false), retvalCD(false); // preset to fail // find the collection @@ -117,16 +117,16 @@ namespace mu2e if (retval){ ++_npass; - if (retvalSD) triginfo->_triggerBits.merge(TriggerFlag::strawDigis); - if (retvalCD) triginfo->_triggerBits.merge(TriggerFlag::caloDigis ); - triginfo->_triggerPath = _trigPath; + // if (retvalSD) triginfo->_triggerBits.merge(TriggerFlag::strawDigis); + // if (retvalCD) triginfo->_triggerBits.merge(TriggerFlag::caloDigis ); + // triginfo->_triggerPath = _trigPath; if(_debug > 1){ cout << moduleDescription().moduleLabel() << " passed event " << event.id() << endl; } } - event.put(std::move(triginfo)); + // event.put(std::move(triginfo)); return retval; } diff --git a/Trigger/src/MergeTriggerInfo_module.cc b/Trigger/src/MergeTriggerInfo_module.cc index 3fc5fff978..054db1fe63 100644 --- a/Trigger/src/MergeTriggerInfo_module.cc +++ b/Trigger/src/MergeTriggerInfo_module.cc @@ -53,13 +53,13 @@ namespace mu2e { // art::ModuleLabelSelector(""));// && // art::ProcessNameSelector("*")); std::vector > list_of_triggerInfo; - event.getMany(selector, list_of_triggerInfo); + event.getMany(selector); if(_debug > 0){ std::cout << "["<push_back(trigInfo); } diff --git a/Trigger/src/PrescaleEvent_module.cc b/Trigger/src/PrescaleEvent_module.cc index 8b69dd9381..ea0f9241e4 100644 --- a/Trigger/src/PrescaleEvent_module.cc +++ b/Trigger/src/PrescaleEvent_module.cc @@ -16,7 +16,7 @@ #include "canvas/Utilities/InputTag.h" #include "fhiclcpp/ParameterSet.h" #include "messagefacility/MessageLogger/MessageLogger.h" -#include "RecoDataProducts/inc/TriggerInfo.hh" +// #include "RecoDataProducts/inc/TriggerInfo.hh" #include #include @@ -47,7 +47,7 @@ namespace mu2e uint32_t nPrescale_; bool useFilteredEvts_; int _debug; - TriggerFlag _trigFlag; + // TriggerFlag _trigFlag; std::string _trigPath; unsigned _nevt, _npass; @@ -58,16 +58,15 @@ namespace mu2e nPrescale_ (p.get("nPrescale")), useFilteredEvts_(p.get ("useFilteredEvents",false)), _debug (p.get ("debugLevel",0)), - _trigFlag (p.get >("triggerFlag")), + // _trigFlag (p.get >("triggerFlag")), _trigPath (p.get("triggerPath")), _nevt(0), _npass(0) { - produces(); + // produces(); } inline bool PrescaleEvent::filter(art::Event & e) { - std::unique_ptr trigInfo(new TriggerInfo); ++_nevt; bool retval(false); bool condition = e.event() % nPrescale_ == 0; @@ -75,12 +74,11 @@ namespace mu2e if(condition) { ++_npass; - // trigInfo->_triggerBits.merge(TriggerFlag::prescaleRandom); - trigInfo->_triggerBits.merge(_trigFlag); - trigInfo->_triggerPath = _trigPath; + // trigInfo->_triggerBits.merge(_trigFlag); + // trigInfo->_triggerPath = _trigPath; retval = true; } - e.put(std::move(trigInfo)); + // e.put(std::move(trigInfo)); return retval; } diff --git a/Trigger/src/SConscript b/Trigger/src/SConscript index 020dbab021..866420ba5c 100644 --- a/Trigger/src/SConscript +++ b/Trigger/src/SConscript @@ -49,7 +49,7 @@ 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_Framework_Services_System', 'art_Framework_Services_System_TriggerNamesService_service', @@ -59,6 +59,8 @@ helper.make_plugins( [ mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -68,7 +70,6 @@ helper.make_plugins( [ mainlib, extrarootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', 'hep_concurrency', ] ) diff --git a/TrkDiag/src/SConscript b/TrkDiag/src/SConscript index 062ef637c7..1f194ffdaf 100644 --- a/TrkDiag/src/SConscript +++ b/TrkDiag/src/SConscript @@ -36,13 +36,15 @@ mainlib = helper.make_mainlib ( [ 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'Trajectory', @@ -53,7 +55,6 @@ mainlib = helper.make_mainlib ( [ 'HepPID', 'xerces-c', 'boost_filesystem', - 'boost_system', 'hep_concurrency', ] ) @@ -88,7 +89,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Framework_Services_System_TriggerNamesService_service', 'art_Persistency_Common', @@ -97,6 +98,8 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -107,7 +110,6 @@ helper.make_plugins( [ rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', 'hep_concurrency', 'pthread' ] ) diff --git a/TrkDiag/src/TrackAnalysisReco_module.cc b/TrkDiag/src/TrackAnalysisReco_module.cc index f129312dfa..c65a316716 100644 --- a/TrkDiag/src/TrackAnalysisReco_module.cc +++ b/TrkDiag/src/TrackAnalysisReco_module.cc @@ -776,8 +776,7 @@ namespace mu2e { template std::vector > TrackAnalysisReco::createSpecialBranch(const art::Event& event, const std::string& branchname, std::vector >& handles, TI& infostruct, const std::string& selection) { - std::vector > outputHandles; - event.getManyByType(handles); + std::vector > outputHandles = event.getMany(); if (handles.size()>0) { std::vector labels; for (const auto& i_handle : handles) { diff --git a/TrkExt/src/SConscript b/TrkExt/src/SConscript index 92809fbad3..f147d3f0bf 100644 --- a/TrkExt/src/SConscript +++ b/TrkExt/src/SConscript @@ -31,18 +31,19 @@ mainlib = helper.make_mainlib ( [ 'mu2e_Mu2eBTrk', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', - 'boost_system', ] ) helper.make_plugins( [ mainlib, @@ -61,7 +62,7 @@ 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', @@ -74,7 +75,6 @@ helper.make_plugins( [ mainlib, 'CLHEP', rootlibs, 'boost_filesystem', - 'boost_system', ] ) # This tells emacs to view this file in python mode. diff --git a/TrkFilters/fcl/prolog_trigger.fcl b/TrkFilters/fcl/prolog_trigger.fcl index 4c6a5a7b08..f18a416ddc 100644 --- a/TrkFilters/fcl/prolog_trigger.fcl +++ b/TrkFilters/fcl/prolog_trigger.fcl @@ -1658,11 +1658,11 @@ TrkFilters : { # sequences for different trigger paths. Early triggers are prescaled sequences : { # #trkpatrec tracking - tprTimeClusterDeM : [ tprTimeClusterDeMEventPrescale, tprTimeClusterDeMSDCountFilter, + tprTimeClusterDeM : [ tprTimeClusterDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprTimeClusterDeMTCFilter ] - tprTimeClusterDeP : [ tprTimeClusterDePEventPrescale, tprTimeClusterDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprTimeClusterDeP : [ tprTimeClusterDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprTimeClusterDePTCFilter ] @@ -1671,99 +1671,99 @@ TrkFilters : { # tprHelixDeP : [ tprDePHelixEventPrescale, tprDePHelixSDCountFilter, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, # TTtimeClusterFinder, tprHelixDePTCFilter, TThelixFinder, TTHelixMergerDeP, tprHelixDePHSFilter ] - tprSeedDeM : [ tprSeedDeMEventPrescale, tprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDeM : [ tprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprSeedDeMHSFilter, TTKSFDeM, tprSeedDeMTSFilter, tprSeedDeMTriggerInfoMerger ] - tprSeedDeP : [ tprSeedDePEventPrescale, tprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDeP : [ tprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprSeedDePTCFilter, TThelixFinder,TTHelixMergerDeP, tprSeedDePHSFilter, TTKSFDeP, tprSeedDePTSFilter, tprSeedDePTriggerInfoMerger ] - tprLowPSeedDeM : [ tprLowPSeedDeMEventPrescale, tprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDeM : [ tprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprLowPSeedDeMHSFilter, TTKSFDeM, tprLowPSeedDeMTSFilter, tprLowPSeedDeMTriggerInfoMerger ] - tprLowPSeedDeP : [ tprLowPSeedDePEventPrescale, tprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDeP : [ tprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDePTCFilter, TThelixFinder,TTHelixMergerDeP, tprLowPSeedDePHSFilter, TTKSFDeP, tprLowPSeedDePTSFilter, tprLowPSeedDePTriggerInfoMerger ] - tprCosmicSeedDeM : [ tprCosmicSeedDeMEventPrescale, tprCosmicSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprCosmicSeedDeM : [ tprCosmicSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprCosmicSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprCosmicSeedDeMHSFilter, TTKSFDeM, tprCosmicSeedDeMTSFilter, tprCosmicSeedDeMTriggerInfoMerger ] - tprCosmicSeedDeP : [ tprCosmicSeedDePEventPrescale, tprCosmicSeedDePSDCountFilter, @sequence::CaloClusterTrigger.Reco, + tprCosmicSeedDeP : [ tprCosmicSeedDePEventPrescale, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprCosmicSeedDePTCFilter, TThelixFinder,TTHelixMergerDeP, tprCosmicSeedDePHSFilter, TTKSFDeP, tprCosmicSeedDePTSFilter, tprCosmicSeedDePTriggerInfoMerger ] - tprCosmicHelixDeM : [ tprCosmicHelixDeMEventPrescale, tprCosmicHelixDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprCosmicHelixDeM : [ tprCosmicHelixDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprCosmicHelixDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprCosmicHelixDeMHSFilter, tprCosmicHelixDeMTriggerInfoMerger ] - tprCosmicHelixDeP : [ tprCosmicHelixDePEventPrescale, tprCosmicHelixDePSDCountFilter, @sequence::CaloClusterTrigger.Reco, + tprCosmicHelixDeP : [ tprCosmicHelixDePEventPrescale, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprCosmicHelixDePTCFilter, TThelixFinder,TTHelixMergerDeP, tprCosmicHelixDePHSFilter, tprCosmicHelixDePTriggerInfoMerger ] - tprCosmicHelixUeM : [ tprCosmicHelixUeMEventPrescale, tprCosmicHelixUeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprCosmicHelixUeM : [ tprCosmicHelixUeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprCosmicHelixUeMTCFilter, TThelixFinder, TTHelixMergerUeM, tprCosmicHelixUeMHSFilter, tprCosmicHelixUeMTriggerInfoMerger ] - tprCosmicHelixUeP : [ tprCosmicHelixUePEventPrescale, tprCosmicHelixUePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprCosmicHelixUeP : [ tprCosmicHelixUePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprCosmicHelixUePTCFilter, TThelixFinder,TTHelixMergerUeP, tprCosmicHelixUePHSFilter, tprCosmicHelixUePTriggerInfoMerger ] # sequences that use a collection of combohits filtered using the calorimeter cluster info - tprSeedUCCDeM : [ tprSeedUCCDeMEventPrescale, tprSeedUCCDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedUCCDeM : [ tprSeedUCCDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, TTtimeClusterFinderUCC, tprSeedUCCDeMTCFilter, TThelixFinderUCC, TTHelixUCCMergerDeM, tprSeedUCCDeMHSFilter, TTKSFUCCDeM, tprSeedUCCDeMTSFilter, tprSeedUCCDeMTriggerInfoMerger ] - tprSeedUCCDeP : [ tprSeedUCCDePEventPrescale, tprSeedUCCDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedUCCDeP : [ tprSeedUCCDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, TTtimeClusterFinderUCC, tprSeedUCCDePTCFilter, TThelixFinderUCC, TTHelixUCCMergerDeP, tprSeedUCCDePHSFilter, TTKSFUCCDeP, tprSeedUCCDePTSFilter, tprSeedUCCDeMTriggerInfoMerger ] # calibration with DIO-Michel form Inner Proton Absorber - tprHelixCalibIPADeM : [ tprHelixCalibIPADeMEventPrescale, tprHelixCalibIPADeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprHelixCalibIPADeM : [ tprHelixCalibIPADeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprHelixCalibIPADeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprHelixCalibIPADeMHSFilter, tprHelixCalibIPADeMTriggerInfoMerger ] # beam monitoring using the e- from the DIO in the IPA - tprHelixIPADeM : [ tprHelixIPADeMEventPrescale, tprHelixIPADeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprHelixIPADeM : [ tprHelixIPADeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprHelixIPADeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprHelixIPADeMHSFilter, tprHelixIPADeMTriggerInfoMerger ] #calo-seeded tracking - cprSeedDeM : [ cprSeedDeMEventPrescale, cprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDeM : [ cprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprSeedDeMHSFilter, TTCalSeedFitDem, cprSeedDeMTSFilter, cprSeedDeMTriggerInfoMerger ] - cprSeedDeP : [ cprSeedDePEventPrescale, cprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDeP : [ cprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprSeedDePHSFilter, TTCalSeedFitDep, cprSeedDePTSFilter, cprSeedDePTriggerInfoMerger ] - cprLowPSeedDeM : [ cprLowPSeedDeMEventPrescale, cprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDeM : [ cprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprLowPSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprLowPSeedDeMHSFilter, TTCalSeedFitDem, cprLowPSeedDeMTSFilter, cprLowPSeedDeMTriggerInfoMerger ] - cprLowPSeedDeP : [ cprLowPSeedDePEventPrescale, cprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDeP : [ cprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprLowPSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprLowPSeedDePHSFilter, TTCalSeedFitDep, cprLowPSeedDePTSFilter, cprLowPSeedDePTriggerInfoMerger ] - cprCosmicSeedDeM : [ cprCosmicSeedDeMEventPrescale, cprCosmicSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprCosmicSeedDeM : [ cprCosmicSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprCosmicSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprCosmicSeedDeMHSFilter, TTCalSeedFitDem, cprCosmicSeedDeMTSFilter, cprCosmicSeedDeMTriggerInfoMerger ] - cprCosmicSeedDeP : [ cprCosmicSeedDePEventPrescale, cprCosmicSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprCosmicSeedDeP : [ cprCosmicSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprCosmicSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprCosmicSeedDePHSFilter, TTCalSeedFitDep, cprCosmicSeedDePTSFilter, cprCosmicSeedDePTriggerInfoMerger ] - cprCosmicHelixDeM : [ cprCosmicHelixDeMEventPrescale, cprCosmicHelixDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprCosmicHelixDeM : [ cprCosmicHelixDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprCosmicHelixDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprCosmicHelixDeMHSFilter, cprCosmicHelixDeMTriggerInfoMerger ] - cprCosmicHelixDeP : [ cprCosmicHelixDePEventPrescale, cprCosmicHelixDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprCosmicHelixDeP : [ cprCosmicHelixDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprCosmicHelixDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprCosmicHelixDePHSFilter, cprCosmicHelixDePTriggerInfoMerger ] - cprSeedUCCDeM : [ cprSeedUCCDeMEventPrescale, cprSeedUCCDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedUCCDeM : [ cprSeedUCCDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, TTCalTimePeakFinderUCC, cprSeedUCCDeMTCFilter, TTCalHelixFinderUCCDe, TTCalHelixUCCMergerDeM, cprSeedUCCDeMHSFilter, TTCalSeedFitUCCDem, cprSeedUCCDeMTSFilter, cprSeedUCCDeMTriggerInfoMerger ] - cprSeedUCCDeP : [ cprSeedUCCDePEventPrescale, cprSeedUCCDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedUCCDeP : [ cprSeedUCCDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, TTCalTimePeakFinderUCC, cprSeedUCCDePTCFilter, TTCalHelixFinderUCCDe, TTCalHelixUCCMergerDeP, cprSeedUCCDePHSFilter, TTCalSeedFitUCCDep, cprSeedUCCDePTSFilter, cprSeedUCCDePTriggerInfoMerger ] @@ -1777,102 +1777,102 @@ TrkFilters : { # sequences for doing timing tests - tprSeedDeMTiming0 : [ tprSeedDeMEventPrescale, tprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDeMTiming0 : [ tprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprSeedDeMHSFilter, TTKSFDeM, tprSeedDeMTriggerInfoMerger ] - tprSeedDeMTiming1 : [ tprSeedDeMEventPrescale, tprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDeMTiming1 : [ tprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM ] - tprSeedDeMTiming2 : [ tprSeedDeMEventPrescale, tprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDeMTiming2 : [ tprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder ] - tprSeedDePTiming0 : [ tprSeedDePEventPrescale, tprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDePTiming0 : [ tprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprSeedDePTCFilter, TThelixFinder, TTHelixMergerDeP, tprSeedDePHSFilter, TTKSFDeP, tprSeedDePTriggerInfoMerger ] - tprSeedDePTiming1 : [ tprSeedDePEventPrescale, tprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprSeedDePTiming1 : [ tprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprSeedDePTCFilter, TThelixFinder, TTHelixMergerDeP ] - tprSeedDePTiming2 : [ tprSeedDePEventPrescale, tprSeedDePSDCountFilter, @sequence::CaloClusterTrigger.Reco, + tprSeedDePTiming2 : [ tprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder ] - cprSeedDeMTiming0 : [ cprSeedDeMEventPrescale, cprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDeMTiming0 : [ cprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprSeedDeMHSFilter, TTCalSeedFitDem, cprSeedDeMTriggerInfoMerger ] - cprSeedDeMTiming1 : [ cprSeedDeMEventPrescale, cprSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDeMTiming1 : [ cprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM ] - cprSeedDeMTiming2 : [ cprSeedDeMEventPrescale, cprSeedDeMSDCountFilter, @sequence::CaloClusterTrigger.Reco, + cprSeedDeMTiming2 : [ cprSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder ] - cprSeedDePTiming0 : [ cprSeedDePEventPrescale, cprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDePTiming0 : [ cprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprSeedDePHSFilter, TTCalSeedFitDep, cprSeedDePTriggerInfoMerger ] - cprSeedDePTiming1 : [ cprSeedDePEventPrescale, cprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDePTiming1 : [ cprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP ] - cprSeedDePTiming2 : [ cprSeedDePEventPrescale, cprSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprSeedDePTiming2 : [ cprSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder ] - tprLowPSeedDeMTiming0 : [ tprLowPSeedDeMEventPrescale, tprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDeMTiming0 : [ tprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprLowPSeedDeMHSFilter, TTKSFDeM, tprLowPSeedDeMPrescale, tprLowPSeedDeMTriggerInfoMerger ] - tprLowPSeedDeMTiming1 : [ tprLowPSeedDeMEventPrescale, tprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDeMTiming1 : [ tprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprLowPSeedDeMPrescale ] - tprLowPSeedDeMTiming2 : [ tprLowPSeedDeMEventPrescale, tprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDeMTiming2 : [ tprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDeMPrescale ] - tprLowPSeedDePTiming0 : [ tprLowPSeedDePEventPrescale, tprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDePTiming0 : [ tprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDePTCFilter, TThelixFinder, TTHelixMergerDeP, tprLowPSeedDePHSFilter, TTKSFDeP, tprLowPSeedDePTriggerInfoMerger ] - tprLowPSeedDePTiming1 : [ tprLowPSeedDePEventPrescale, tprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDePTiming1 : [ tprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDePTCFilter, TThelixFinder, TTHelixMergerDeP, tprLowPSeedDePPrescale ] - tprLowPSeedDePTiming2 : [ tprLowPSeedDePEventPrescale, tprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + tprLowPSeedDePTiming2 : [ tprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTtimeClusterFinder, tprLowPSeedDePPrescale ] - cprLowPSeedDeMTiming0 : [ cprLowPSeedDeMEventPrescale, cprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDeMTiming0 : [ cprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprLowPSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprLowPSeedDeMHSFilter, TTCalSeedFitDem, cprLowPSeedDeMTriggerInfoMerger ] - cprLowPSeedDeMTiming1 : [ cprLowPSeedDeMEventPrescale, cprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDeMTiming1 : [ cprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprLowPSeedDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM] - cprLowPSeedDeMTiming2 : [ cprLowPSeedDeMEventPrescale, cprLowPSeedDeMSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDeMTiming2 : [ cprLowPSeedDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder] - cprLowPSeedDePTiming0 : [ cprLowPSeedDePEventPrescale, cprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDePTiming0 : [ cprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprLowPSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprLowPSeedDePHSFilter, TTCalSeedFitDep, cprLowPSeedDePTriggerInfoMerger ] - cprLowPSeedDePTiming1 : [ cprLowPSeedDePEventPrescale, cprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDePTiming1 : [ cprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder, cprLowPSeedDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP ] - cprLowPSeedDePTiming2 : [ cprLowPSeedDePEventPrescale, cprLowPSeedDePSDCountFilter, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + cprLowPSeedDePTiming2 : [ cprLowPSeedDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, TTCalTimePeakFinder ] diff --git a/TrkFilters/src/SConscript b/TrkFilters/src/SConscript index e32fe24426..8a8db1e234 100644 --- a/TrkFilters/src/SConscript +++ b/TrkFilters/src/SConscript @@ -30,20 +30,21 @@ mainlib = helper.make_mainlib ( [ 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', 'HepPDT', 'xerces-c', - 'boost_system', ] ) # Fixme: split into link lists for each module. @@ -66,7 +67,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -82,7 +83,6 @@ helper.make_plugins( [ 'General', rootlibs, 'boost_filesystem', - 'boost_system', ] ) diff --git a/TrkHitReco/src/SConscript b/TrkHitReco/src/SConscript index 24ecce0bcd..e41d3ac54f 100755 --- a/TrkHitReco/src/SConscript +++ b/TrkHitReco/src/SConscript @@ -24,7 +24,7 @@ mainlib = helper.make_mainlib([ 'mu2e_GlobalConstantsService', 'mu2e_DataProducts', 'mu2e_GeneralUtilities', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_Framework_Services_Registry', 'art_root_io_tfile_support', 'art_Framework_Principal', @@ -32,10 +32,11 @@ mainlib = helper.make_mainlib([ 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, - 'boost_system' ]) helper.make_plugins([mainlib, @@ -57,18 +58,19 @@ 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_Persistency_Common', 'art_Persistency_Provenance', 'art_Utilities', 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'boost_filesystem', - 'boost_system', rootlibs, 'TMVA', 'xerces-c', # only needed for MakeStereoHits_module.cc diff --git a/TrkHitReco/src/StrawHitReco_module.cc b/TrkHitReco/src/StrawHitReco_module.cc index 18d5ceba83..85d16d5143 100644 --- a/TrkHitReco/src/StrawHitReco_module.cc +++ b/TrkHitReco/src/StrawHitReco_module.cc @@ -39,7 +39,7 @@ #include "TH1F.h" #include - +#include namespace mu2e { diff --git a/TrkPatRec/src/SConscript b/TrkPatRec/src/SConscript index e6d73ea7a7..16c58c83f5 100644 --- a/TrkPatRec/src/SConscript +++ b/TrkPatRec/src/SConscript @@ -35,18 +35,19 @@ mainlib = helper.make_mainlib(['mu2e_Mu2eBTrk', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', - 'boost_system', ]) helper.make_plugins([mainlib, @@ -74,7 +75,7 @@ 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', @@ -82,6 +83,8 @@ helper.make_plugins([mainlib, 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -89,7 +92,6 @@ helper.make_plugins([mainlib, extrarootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', 'pthread' ]) diff --git a/TrkPatRec/src/TimeAndPhiClusterFinder_module.cc b/TrkPatRec/src/TimeAndPhiClusterFinder_module.cc index 787f6d876e..7a170e70ee 100644 --- a/TrkPatRec/src/TimeAndPhiClusterFinder_module.cc +++ b/TrkPatRec/src/TimeAndPhiClusterFinder_module.cc @@ -28,7 +28,7 @@ #include "TrkPatRec/inc/TimeAndPhiClusterFinder_types.hh" #include - +#include namespace @@ -221,7 +221,7 @@ namespace mu2e { chcol_ = chH.product(); art::Handle ccH{}; - if (usecc_) {event.getByToken(ccToken_, ccH);} + if (usecc_) {ccH = event.getHandle(ccToken_);} if (testflag_) { diff --git a/TrkPatRec/src/TimeClusterFinder_module.cc b/TrkPatRec/src/TimeClusterFinder_module.cc index 5ecb2df878..13e89d4a49 100644 --- a/TrkPatRec/src/TimeClusterFinder_module.cc +++ b/TrkPatRec/src/TimeClusterFinder_module.cc @@ -224,7 +224,7 @@ namespace mu2e { art::Handle ccH{}; // need to cache for later Ptr creation if(_usecc){ - event.getByToken(_ccToken, ccH); + ccH = event.getHandle(_ccToken); _cccol = ccH.product(); } diff --git a/TrkReco/src/SConscript b/TrkReco/src/SConscript index f8d4009af9..a523d481fa 100644 --- a/TrkReco/src/SConscript +++ b/TrkReco/src/SConscript @@ -33,13 +33,15 @@ mainlib = helper.make_mainlib ( [ 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'Trajectory', @@ -48,7 +50,6 @@ mainlib = helper.make_mainlib ( [ 'CLHEP', 'HepPDT', 'xerces-c', - 'boost_system', ] ) # Fixme: split into link lists for each module. @@ -74,7 +75,7 @@ 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_Framework_Services_Optional_RandomNumberGenerator_service', 'art_Persistency_Common', 'art_Persistency_Provenance', @@ -82,6 +83,8 @@ helper.make_plugins( [ 'canvas', 'MF_MessageLogger', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', @@ -89,7 +92,6 @@ helper.make_plugins( [ rootlibs, 'xerces-c', 'boost_filesystem', - 'boost_system', ] ) # Fixme: do I need all of babarlibs below? @@ -103,7 +105,6 @@ helper.make_dict_and_map( [ 'cetlib_except', 'CLHEP', 'Core', - 'boost_system' ] ) diff --git a/UtilityModules/src/SConscript b/UtilityModules/src/SConscript index cefb7531df..897a17a4ad 100644 --- a/UtilityModules/src/SConscript +++ b/UtilityModules/src/SConscript @@ -27,16 +27,19 @@ common = [ 'mu2e_MCDataProducts', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', ] -mainlib = helper.make_mainlib ( [ 'MF_MessageLogger' +mainlib = helper.make_mainlib ( [ 'MF_MessageLogger', + 'fhiclcpp_types', + 'tbb', ] ) # Each service requires a custom link list so make them one at a time. @@ -62,12 +65,13 @@ helper.make_plugins( [ mainlib, 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', 'CLHEP', 'Core', 'boost_filesystem', - 'boost_system', ] ) diff --git a/Validation/src/SConscript b/Validation/src/SConscript index 56add5fc5d..26caae7ac7 100644 --- a/Validation/src/SConscript +++ b/Validation/src/SConscript @@ -27,7 +27,7 @@ mainlib = helper.make_mainlib ( [ 'mu2e_Validation_root', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', @@ -39,7 +39,6 @@ mainlib = helper.make_mainlib ( [ 'mu2e_Validation_root', 'General', rootlibs, 'CLHEP', - 'boost_system' ] ) @@ -55,18 +54,19 @@ helper.make_plugins( [ mainlib,'mu2e_Validation_root', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', - 'art_root_io_TFileService_service', + 'art_root_io_TFileService', 'art_root_io_tfile_support', 'art_Persistency_Provenance', 'art_Persistency_Common', 'art_Utilities', 'canvas', 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', 'cetlib', 'cetlib_except', rootlibs, 'CLHEP', - 'boost_system', 'boost_filesystem' ] ) diff --git a/Validation/src/ValKalSeed.cc b/Validation/src/ValKalSeed.cc index 955949ae53..b191bbecf2 100644 --- a/Validation/src/ValKalSeed.cc +++ b/Validation/src/ValKalSeed.cc @@ -190,8 +190,7 @@ double mu2e::ValKalSeed::mcTrkP(art::Event const& event) { // this will be the simparticle numbers which belong to the conv ele std::vector cea; - std::vector< art::Handle > vah; - event.getManyByType(vah); + std::vector< art::Handle > vah = event.getMany(); for (auto const & ah : vah) { // loop over all SimParticle coll auto const& simpcoll = *ah; //SimParticleCollection for(auto sp : simpcoll) { // loop over SimParticles @@ -210,8 +209,7 @@ double mu2e::ValKalSeed::mcTrkP(art::Event const& event) { CLHEP::Hep3Vector pv; - std::vector< art::Handle > vah2; - event.getManyByType(vah2); + std::vector< art::Handle > vah2 = event.getMany(); for (auto const & ah : vah2) { // loop over SPMC colls if(ah.provenance()->productInstanceName()=="virtualdetector") { auto const& spmccoll = *ah; //StepPointMCCollection diff --git a/Validation/src/Validation_module.cc b/Validation/src/Validation_module.cc index 7b1a2a17dc..978db21f6e 100644 --- a/Validation/src/Validation_module.cc +++ b/Validation/src/Validation_module.cc @@ -173,8 +173,7 @@ int mu2e::Validation::analyzeProduct( art::Event const& event) { // get all instances of products of type T - std::vector> vah; - event.getManyByType(vah); + std::vector> vah = event.getMany(); std::string name; // loop over the list of instances of products of this type diff --git a/scripts/build/python/sconstruct_helper.py b/scripts/build/python/sconstruct_helper.py index f9ef5b70c5..695b64d855 100644 --- a/scripts/build/python/sconstruct_helper.py +++ b/scripts/build/python/sconstruct_helper.py @@ -74,7 +74,6 @@ def cppPath(mu2eOpts): os.environ['CETLIB_EXCEPT_INC'], os.environ['BOOST_INC'], os.environ['CLHEP_INC'], - os.environ['CPPUNIT_DIR']+'/include', os.environ['HEPPDT_INC'], os.environ['ROOT_INC'], os.environ['XERCES_C_INC'], @@ -112,7 +111,6 @@ def libPath(mu2eOpts): os.environ['CETLIB_EXCEPT_LIB'], os.environ['BOOST_LIB'], os.environ['CLHEP_LIB_DIR'], - os.environ['CPPUNIT_DIR']+'/lib', os.environ['HEPPDT_LIB'], os.environ['ROOTSYS']+'/lib', os.environ['XERCESCROOT']+'/lib', diff --git a/setup.sh b/setup.sh index 88d86aa635..8e93c0f27b 100644 --- a/setup.sh +++ b/setup.sh @@ -101,7 +101,7 @@ build=$($MU2E_BASE_RELEASE/buildopts --build) # and is therefore different from the value shown in # SETUP_ environment vars, or by the "ups active" command. export MU2E_UPS_QUALIFIERS=+e20:+${build} -export MU2E_ART_SQUALIFIER=s105 +export MU2E_ART_SQUALIFIER=s109 MU2E_G4_GRAPHICS_QUALIFIER='' if [[ $($MU2E_BASE_RELEASE/buildopts --g4vis) == qt ]]; then @@ -121,29 +121,30 @@ fi export MU2E_G4_EXTRA_QUALIFIER='' # Setup the framework and its dependent products -setup -B art v3_06_03 -q${MU2E_UPS_QUALIFIERS} -setup -B art_root_io v1_05_01 -q${MU2E_UPS_QUALIFIERS} +setup -B art v3_09_01 -q${MU2E_UPS_QUALIFIERS} +setup -B art_root_io v1_08_01 -q${MU2E_UPS_QUALIFIERS} # Geant4 and its cross-section files. if [[ $($MU2E_BASE_RELEASE/buildopts --trigger) == "off" ]]; then - setup -B geant4 v4_10_6_p03 -q${MU2E_UPS_QUALIFIERS}${MU2E_G4_GRAPHICS_QUALIFIER}${MU2E_G4_VECGEOM_QUALIFIER}${MU2E_G4_MT_QUALIFIER}${MU2E_G4_EXTRA_QUALIFIER} + setup -B geant4 v4_10_7_p01c -q${MU2E_UPS_QUALIFIERS}${MU2E_G4_GRAPHICS_QUALIFIER}${MU2E_G4_VECGEOM_QUALIFIER}${MU2E_G4_MT_QUALIFIER}${MU2E_G4_EXTRA_QUALIFIER} else setup -B xerces_c v3_2_3 -q${MU2E_UPS_QUALIFIERS} fi # Get access to raw data formats. -setup -B mu2e_artdaq_core v1_05_06b -q${MU2E_UPS_QUALIFIERS}:+${MU2E_ART_SQUALIFIER} +setup -B mu2e_artdaq_core v1_06_01 -q${MU2E_UPS_QUALIFIERS}:+${MU2E_ART_SQUALIFIER} setup -B heppdt v03_04_02 -q${MU2E_UPS_QUALIFIERS} -setup -B BTrk v1_02_30 -q${MU2E_UPS_QUALIFIERS}:p383b -setup -B KinKal v00_01_06 -q${MU2E_UPS_QUALIFIERS}:p383b +setup cetpkgsupport +setup -B KinKal v00_01_06b -q${MU2E_UPS_QUALIFIERS}:p392 +setup -B BTrk v1_02_32 -q${MU2E_UPS_QUALIFIERS}:p392 setup -B cry v1_7n -q${MU2E_UPS_QUALIFIERS} setup -B gsl v2_6a setup curl v7_64_1 setup cryptopp v08_02_00 -q${MU2E_UPS_QUALIFIERS} # The build system. -setup -B scons v3_1_2 -q +p383b +setup -B scons v3_1_2a -q +p392 # The debugger setup -B gdb v9_2 diff --git a/ups_install/install.sh b/ups_install/install.sh index 8171f32c17..862bc66f38 100644 --- a/ups_install/install.sh +++ b/ups_install/install.sh @@ -7,10 +7,11 @@ # export COMPILER_CODE=e20 -export DEBUG_LEVEL=prof +export ${MU2E_SETUP_BUILDOPTS} +export DEBUG_LEVEL=${build} export PACKAGE_NAME=offline export PACKAGE_SOURCE=${MU2E_BASE_RELEASE} -export PACKAGE_VERSION=v09_11_02 +export PACKAGE_VERSION=v09_11_03 # Check that the installation directoy has been defined. if [ "${PRODUCTS_INSTALL}" = '' ];then diff --git a/ups_install/installTableFile.sh b/ups_install/installTableFile.sh index 47ea0911b3..2032ed7c52 100755 --- a/ups_install/installTableFile.sh +++ b/ups_install/installTableFile.sh @@ -15,6 +15,7 @@ destination_file=$1 art_ver=`ups active | awk '$1 == "art" {print $2}'` heppdt_ver=`ups active | awk '$1 == "heppdt" {print $2}'` btrk_ver=`ups active | awk '$1 == "BTrk" {print $2}'` +kinkal_ver=`ups active | awk '$1 == "KinKal" {print $2}'` xerces_ver=`ups active | awk '$1 == "xerces_c" {print $2}'` mu2e_artdaq_core_ver=`ups active | awk '$1 == "mu2e_artdaq_core" {print $2}'` @@ -57,6 +58,7 @@ Qualifiers = "${qualifiers_value}:debug" envSet (MU2E_UPS_QUALIFIERS, +${mu2e_ups_qualifiers}:+debug ) setupRequired( art ${art_ver} -q +${mu2e_ups_qualifiers}:+debug ) setupRequired( BTrk ${btrk_ver} -q +${mu2e_ups_qualifiers}:+debug:+p383b ) + setupRequired( KinKal ${kinkal_ver} -q +${mu2e_ups_qualifiers}:+debug:+p383b ) setupRequired( heppdt ${heppdt_ver} -q +${mu2e_ups_qualifiers}:+debug ) setupRequired( xerces_c ${xerces_ver} -q +${mu2e_ups_qualifiers}:+debug ) @@ -71,6 +73,7 @@ Qualifiers = "${qualifiers_value}:prof" envSet (MU2E_UPS_QUALIFIERS, +\${mu2e_ups_qualifiers}:+prof ) setupRequired( art ${art_ver} -q +${mu2e_ups_qualifiers}:+prof ) setupRequired( BTrk ${btrk_ver} -q +${mu2e_ups_qualifiers}:+prof:+p383b ) + setupRequired( KinKal ${kinkal_ver} -q +${mu2e_ups_qualifiers}:+prof:+p383b ) setupRequired( heppdt ${heppdt_ver} -q +${mu2e_ups_qualifiers}:+prof ) setupRequired( xerces_c ${xerces_ver} -q +${mu2e_ups_qualifiers}:+prof ) @@ -85,6 +88,7 @@ Qualifiers = "${qualifiers_value}:trig:debug" envSet (MU2E_UPS_QUALIFIERS, +${mu2e_ups_qualifiers}:+debug ) setupRequired( art ${art_ver} -q +${mu2e_ups_qualifiers}:+debug ) setupRequired( BTrk ${btrk_ver} -q +${mu2e_ups_qualifiers}:+debug:+p383b ) + setupRequired( KinKal ${kinkal_ver} -q +${mu2e_ups_qualifiers}:+debug:+p383b ) setupRequired( heppdt ${heppdt_ver} -q +${mu2e_ups_qualifiers}:+debug ) setupRequired( xerces_c ${xerces_ver} -q +${mu2e_ups_qualifiers}:+debug ) setupRequired( mu2e_artdaq_core ${mu2e_artdaq_core_ver} -q ${mu2e_ups_qualifiers}:+${MU2E_ART_SQUALIFIER}:+debug ) @@ -100,6 +104,7 @@ Qualifiers = "${qualifiers_value}:trig:prof" envSet (MU2E_UPS_QUALIFIERS, +\${mu2e_ups_qualifiers}:+prof ) setupRequired( art ${art_ver} -q +${mu2e_ups_qualifiers}:+prof ) setupRequired( BTrk ${btrk_ver} -q +${mu2e_ups_qualifiers}:+prof:+p383b ) + setupRequired( KinKal ${kinkal_ver} -q +${mu2e_ups_qualifiers}:+prof:+p383b ) setupRequired( heppdt ${heppdt_ver} -q +${mu2e_ups_qualifiers}:+prof ) setupRequired( xerces_c ${xerces_ver} -q +${mu2e_ups_qualifiers}:+prof ) setupRequired( mu2e_artdaq_core ${mu2e_artdaq_core_ver} -q ${mu2e_ups_qualifiers}:+${MU2E_ART_SQUALIFIER}:+prof ) @@ -133,6 +138,7 @@ EOF unset art_ver unset heppdt_ver unset btrk_ver +unset kinkal_ver unset xerces_ver unset mu2e_artdaq_core_ver unset qualifiers_value