Skip to content

Commit

Permalink
Merge pull request #536 from macndev/art_30903
Browse files Browse the repository at this point in the history 
updates for art v3_09_03, envset p011
  • Loading branch information
@kutschke
kutschke authored Jul 24, 2021
2 parents ce761a8 + 8c9b72f commit 9ddb4e5
Show file tree
Hide file tree
Showing 39 changed files with 44 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .muse
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# prefer to build with this environment
ENVSET p010
ENVSET p011
# add these to python path
PYTHONPATH TrackerAlignment/scripts
PYTHONPATH Trigger/python
Expand Down
1 change: 1 addition & 0 deletions Analyses/src/ProtonBunchIntensityAnalyzer_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "art/Framework/Core/ModuleMacros.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Principal/SubRun.h"
#include "art_root_io/TFileService.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"

Expand Down
1 change: 1 addition & 0 deletions CaloMC/src/CaloShowerROMaker_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "canvas/Utilities/InputTag.h"
#include "art_root_io/TFileService.h"
#include "art_root_io/TFileDirectory.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/CaloMC/inc/CaloPhotonPropagation.hh"
#include "Offline/CalorimeterGeom/inc/Calorimeter.hh"
Expand Down
1 change: 1 addition & 0 deletions CaloReco/src/CaloHitMakerFast_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "art/Framework/Core/ModuleMacros.h"
#include "Offline/GeneralUtilities/inc/ParameterSetHelpers.hh"
#include "art/Framework/Principal/Handle.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/CalorimeterGeom/inc/Calorimeter.hh"
#include "Offline/ConditionsService/inc/ConditionsHandle.hh"
Expand Down
1 change: 1 addition & 0 deletions CommonMC/src/GenerateMuonLife_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Handle.h"
#include "canvas/Utilities/InputTag.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/MCDataProducts/inc/SimParticle.hh"
#include "Offline/MCDataProducts/inc/SimParticleCollection.hh"
Expand Down
1 change: 1 addition & 0 deletions CommonMC/src/GenerateProtonTimes_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <memory>

#include "fhiclcpp/types/OptionalTable.h"
#include "fhiclcpp/types/Sequence.h"
#include "messagefacility/MessageLogger/MessageLogger.h"

#include "CLHEP/Random/RandGaussQ.h"
Expand Down
1 change: 1 addition & 0 deletions CommonMC/src/SimParticleDaughterSelector_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "art_root_io/TFileService.h"
#include "fhiclcpp/types/Sequence.h"

// Mu2e includes.
#include "Offline/DataProducts/inc/PDGCode.hh"
Expand Down
1 change: 1 addition & 0 deletions Compression/src/CompressDetStepMCs_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "fhiclcpp/ParameterSet.h"
#include "messagefacility/MessageLogger/MessageLogger.h"
#include "art_root_io/TFileService.h"
#include "fhiclcpp/types/Sequence.h"

#include <memory>

Expand Down
1 change: 1 addition & 0 deletions Compression/src/CompressDigiMCs_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "art/Framework/Principal/SubRun.h"
#include "canvas/Utilities/InputTag.h"
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"
#include "messagefacility/MessageLogger/MessageLogger.h"
#include "art_root_io/TFileService.h"

Expand Down
1 change: 1 addition & 0 deletions CosmicReco/src/CosmicSeedFilter_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include "Offline/RecoDataProducts/inc/TrkFitFlag.hh"
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/RecoDataProducts/inc/CosmicTrackSeed.hh"
#include "Offline/RecoDataProducts/inc/TriggerInfo.hh"
Expand Down
1 change: 1 addition & 0 deletions CosmicReco/src/SimpleTimeCluster_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//Purpose: To improve TimeClustering for Cosmics
#include "art/Framework/Principal/Event.h"
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Core/ModuleMacros.h"
Expand Down
1 change: 1 addition & 0 deletions DAQ/src/StrawHitRecoFromFragments_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// framework
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Principal/Run.h"
#include "Offline/GeometryService/inc/GeomHandle.hh"
#include "art/Framework/Core/EDProducer.h"
#include "Offline/GeometryService/inc/DetectorSystem.hh"
Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/CORSIKAEventGenerator_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "art/Framework/Core/ModuleMacros.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Principal/SubRun.h"
#include "fhiclcpp/ParameterSet.h"
#include "messagefacility/MessageLogger/MessageLogger.h"

Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/ExtMonFNALGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/SeedService/inc/SeedService.hh"
#include "Offline/MCDataProducts/inc/GenParticleCollection.hh"
Expand Down
2 changes: 2 additions & 0 deletions EventGenerator/src/InFlightParticleSampler_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"

#include "fhiclcpp/types/Sequence.h"

#include "Offline/SeedService/inc/SeedService.hh"
#include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh"
#include "Offline/GlobalConstantsService/inc/ParticleDataTable.hh"
Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/MuStopProductsGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/DelegatedParameter.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh"
#include "Offline/SeedService/inc/SeedService.hh"
Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/PBIWeight_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Run.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Principal/SubRun.h"
#include "canvas/Utilities/InputTag.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "art_root_io/TFileService.h"
Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/RMCGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "art_root_io/TFileService.h"
#include "fhiclcpp/types/Sequence.h"

// Mu2e includes
#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh"
Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/RPCGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "art_root_io/TFileService.h"
#include "Offline/ConditionsService/inc/ConditionsHandle.hh"
#include "Offline/ConditionsService/inc/AcceleratorParams.hh"
#include "fhiclcpp/types/Sequence.h"

// Mu2e includes
#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh"
Expand Down
1 change: 1 addition & 0 deletions EventGenerator/src/StoppedMuonRMCGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "art_root_io/TFileService.h"
#include "fhiclcpp/types/Sequence.h"

// Mu2e includes
#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh"
Expand Down
2 changes: 2 additions & 0 deletions EventGenerator/src/StoppedMuonXRayGammaRayGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

#include "cetlib_except/exception.h"

#include "fhiclcpp/types/Sequence.h"

#include "CLHEP/Vector/ThreeVector.h"
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Random/RandomEngine.h"
Expand Down
2 changes: 2 additions & 0 deletions EventGenerator/src/StoppedMuplusDecayGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include "cetlib_except/exception.h"

#include "fhiclcpp/types/Sequence.h"

#include "CLHEP/Vector/ThreeVector.h"
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Random/RandomEngine.h"
Expand Down
2 changes: 2 additions & 0 deletions EventGenerator/src/StoppedParticleReactionGun_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include "cetlib_except/exception.h"

#include "fhiclcpp/types/Sequence.h"

#include "CLHEP/Vector/ThreeVector.h"
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Random/RandomEngine.h"
Expand Down
1 change: 1 addition & 0 deletions EventMixing/src/ProtonBunchIntensityFlat_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Core/ModuleMacros.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/SubRun.h"

#include "Offline/SeedService/inc/SeedService.hh"
#include "Offline/MCDataProducts/inc/ProtonBunchIntensity.hh"
Expand Down
1 change: 1 addition & 0 deletions EventMixing/src/ProtonBunchIntensityLogNormal_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Core/ModuleMacros.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/SubRun.h"

#include "Offline/SeedService/inc/SeedService.hh"
#include "Offline/Mu2eUtilities/inc/artURBG.hh"
Expand Down
1 change: 1 addition & 0 deletions Filters/src/CompressPhysicalVolumes_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// art includes.
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"
#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/SubRun.h"
Expand Down
1 change: 1 addition & 0 deletions Filters/src/FilterCosmicsStage1_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

// art includes.
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"
#include "art/Framework/Core/EDFilter.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Run.h"
Expand Down
1 change: 1 addition & 0 deletions Filters/src/FilterG4Out_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

// art includes.
#include "fhiclcpp/types/OptionalSequence.h"
#include "fhiclcpp/types/Sequence.h"
#include "messagefacility/MessageLogger/MessageLogger.h"

#include "art/Framework/Core/EDFilter.h"
Expand Down
1 change: 1 addition & 0 deletions Filters/src/FilterStepPointMomentum_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

// art includes.
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"
#include "art/Framework/Core/EDFilter.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/Run.h"
Expand Down
2 changes: 2 additions & 0 deletions Filters/src/StepPointMCCollectionUpdater_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

#include "cetlib_except/exception.h"

#include "fhiclcpp/types/Sequence.h"

#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Core/ModuleMacros.h"
#include "art/Framework/Principal/Event.h"
Expand Down
1 change: 1 addition & 0 deletions Filters/src/TriggerResultsFilter_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "art/Framework/Core/ModuleMacros.h"
#include "canvas/Persistency/Common/TriggerResults.h"
#include "cetlib_except/exception.h"
#include "fhiclcpp/types/Sequence.h"
// mu2e includes
#include "Offline/Mu2eUtilities/inc/TriggerResultsNavigator.hh"

Expand Down
1 change: 1 addition & 0 deletions Mu2eG4/src/IonProducer_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Core/ModuleMacros.h"
#include "art/Framework/Principal/Event.h"
#include "art/Framework/Principal/SubRun.h"

#include "Offline/DataProducts/inc/PDGCode.hh"
#include "Offline/MCDataProducts/inc/SimParticleCollection.hh"
Expand Down
1 change: 1 addition & 0 deletions Mu2eUtilities/inc/RootTreeSampler.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "fhiclcpp/types/OptionalAtom.h"
#include "fhiclcpp/types/TupleAs.h"
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"

#include "CLHEP/Random/RandomEngine.h"
#include "CLHEP/Random/RandFlat.h"
Expand Down
1 change: 1 addition & 0 deletions Sources/inc/CosmicCORSIKA.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "fhiclcpp/ParameterSet.h"
#include "art/Framework/Services/Registry/ServiceHandle.h"
#include "messagefacility/MessageLogger/MessageLogger.h"
#include "fhiclcpp/types/Sequence.h"

#include "Offline/GeometryService/inc/GeomHandle.hh"
#include "Offline/GeometryService/inc/GeometryService.hh"
Expand Down
1 change: 1 addition & 0 deletions TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "art/Framework/Principal/Event.h"
#include "fhiclcpp/ParameterSet.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Principal/Run.h"
#include "Offline/GeometryService/inc/GeomHandle.hh"
#include "art/Framework/Core/EDProducer.h"
#include "Offline/GeometryService/inc/DetectorSystem.hh"
Expand Down
1 change: 1 addition & 0 deletions TrkHitReco/src/StrawHitReco_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "Offline/GeometryService/inc/DetectorSystem.hh"
#include "art/Framework/Core/ModuleMacros.h"
#include "art_root_io/TFileService.h"
#include "art/Framework/Principal/Run.h"

// conditions
#include "Offline/ProditionsService/inc/ProditionsHandle.hh"
Expand Down
1 change: 1 addition & 0 deletions TrkPatRec/src/KalSeedFit_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "art/Framework/Core/ModuleMacros.h"
#include "art_root_io/TFileService.h"
#include "art/Utilities/make_tool.h"
#include "art/Framework/Principal/Run.h"
// conditions
#include "Offline/ConditionsService/inc/ConditionsHandle.hh"
#include "Offline/TrackerGeom/inc/Tracker.hh"
Expand Down
1 change: 1 addition & 0 deletions TrkPatRec/src/TimeClusterFinder_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// framework
#include "art/Framework/Principal/Event.h"
#include "fhiclcpp/ParameterSet.h"
#include "fhiclcpp/types/Sequence.h"
#include "art/Framework/Principal/Handle.h"
#include "art/Framework/Core/EDProducer.h"
#include "art/Framework/Core/ModuleMacros.h"
Expand Down
1 change: 1 addition & 0 deletions TrkReco/src/MergeHelices_module.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// on MergeHelixFinder. P. Murat, D. Brown (LBNL)
//
#include "fhiclcpp/types/Atom.h"
#include "fhiclcpp/types/Sequence.h"
#include "canvas/Utilities/InputTag.h"
#include "canvas/Persistency/Common/Ptr.h"
#include "art/Framework/Core/EDProducer.h"
Expand Down

0 comments on commit 9ddb4e5

Please sign in to comment.