diff --git a/AnalysisDataFormats/TrackInfo/src/classes_def.xml b/AnalysisDataFormats/TrackInfo/src/classes_def.xml index 5df56f94c2da1..49eafce253a2b 100644 --- a/AnalysisDataFormats/TrackInfo/src/classes_def.xml +++ b/AnalysisDataFormats/TrackInfo/src/classes_def.xml @@ -8,8 +8,8 @@ - - + + diff --git a/DataFormats/EgammaReco/src/classes_def.xml b/DataFormats/EgammaReco/src/classes_def.xml index e084c7b362ad4..1fdd9eb267dca 100644 --- a/DataFormats/EgammaReco/src/classes_def.xml +++ b/DataFormats/EgammaReco/src/classes_def.xml @@ -87,7 +87,7 @@ - + diff --git a/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h b/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h index 5b7c0955f2a3d..5120e582866d7 100644 --- a/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h +++ b/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h @@ -15,41 +15,44 @@ #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h" #include "DataFormats/TrajectoryState/interface/PTrajectoryStateOnDet.h" -class L2MuonTrajectorySeed : public TrajectorySeed { -public: - /// Default constructor - L2MuonTrajectorySeed(); - - /// Constructor - L2MuonTrajectorySeed(PTrajectoryStateOnDet const& ptsos, - RecHitContainer const& rh, - PropagationDirection dir, - l1extra::L1MuonParticleRef l1Ref); - - /// Constructor for stage2 L1 - L2MuonTrajectorySeed(PTrajectoryStateOnDet const& ptsos, - RecHitContainer const& rh, - PropagationDirection dir, - l1t::MuonRef l1Ref); - - L2MuonTrajectorySeed(PTrajectoryStateOnDet const& ptsos, - RecHitContainer const& rh, - PropagationDirection dir, - l1t::TrackerMuonRef l1TkMuRef); - - /// Destructor - ~L2MuonTrajectorySeed() override {} - - // Operations - - /// Get L1 info - inline l1extra::L1MuonParticleRef l1Particle() const { return theL1Particle; } - inline l1t::MuonRef l1tParticle() const { return theL1TParticle; } - inline l1t::TrackerMuonRef l1TkMu() const { return theL1TkMu; } - -private: - l1extra::L1MuonParticleRef theL1Particle; - l1t::MuonRef theL1TParticle; - l1t::TrackerMuonRef theL1TkMu; -}; +namespace io_v1 { + class L2MuonTrajectorySeed : public TrajectorySeed { + public: + /// Default constructor + L2MuonTrajectorySeed(); + + /// Constructor + L2MuonTrajectorySeed(PTrajectoryStateOnDet const& ptsos, + RecHitContainer const& rh, + PropagationDirection dir, + l1extra::L1MuonParticleRef l1Ref); + + /// Constructor for stage2 L1 + L2MuonTrajectorySeed(PTrajectoryStateOnDet const& ptsos, + RecHitContainer const& rh, + PropagationDirection dir, + l1t::MuonRef l1Ref); + + L2MuonTrajectorySeed(PTrajectoryStateOnDet const& ptsos, + RecHitContainer const& rh, + PropagationDirection dir, + l1t::TrackerMuonRef l1TkMuRef); + + /// Destructor + ~L2MuonTrajectorySeed() override {} + + // Operations + + /// Get L1 info + inline l1extra::L1MuonParticleRef l1Particle() const { return theL1Particle; } + inline l1t::MuonRef l1tParticle() const { return theL1TParticle; } + inline l1t::TrackerMuonRef l1TkMu() const { return theL1TkMu; } + + private: + l1extra::L1MuonParticleRef theL1Particle; + l1t::MuonRef theL1TParticle; + l1t::TrackerMuonRef theL1TkMu; + }; +} // namespace io_v1 +using L2MuonTrajectorySeed = io_v1::L2MuonTrajectorySeed; #endif diff --git a/DataFormats/MuonSeed/src/classes_def.xml b/DataFormats/MuonSeed/src/classes_def.xml index 8540d89ca8dac..175dded2faac4 100644 --- a/DataFormats/MuonSeed/src/classes_def.xml +++ b/DataFormats/MuonSeed/src/classes_def.xml @@ -1,32 +1,32 @@ - - + + - - + + - - - - - - + + + + + + - - + + - - + + - - - + + + - + diff --git a/DataFormats/ParticleFlowReco/src/classes_def_1.xml b/DataFormats/ParticleFlowReco/src/classes_def_1.xml index 70a1528a29701..58436d832a985 100644 --- a/DataFormats/ParticleFlowReco/src/classes_def_1.xml +++ b/DataFormats/ParticleFlowReco/src/classes_def_1.xml @@ -42,10 +42,8 @@ - - - - + + diff --git a/DataFormats/TrackCandidate/src/classes_def.xml b/DataFormats/TrackCandidate/src/classes_def.xml index f5a5c805add54..ec92aa6ca52b6 100644 --- a/DataFormats/TrackCandidate/src/classes_def.xml +++ b/DataFormats/TrackCandidate/src/classes_def.xml @@ -1,9 +1,6 @@ - - - - - + + diff --git a/DataFormats/TrackReco/src/classes_def.xml b/DataFormats/TrackReco/src/classes_def.xml index bef46cb3793af..8bbe982b98163 100644 --- a/DataFormats/TrackReco/src/classes_def.xml +++ b/DataFormats/TrackReco/src/classes_def.xml @@ -319,7 +319,7 @@ - + diff --git a/DataFormats/TrajectorySeed/interface/TrajectorySeed.h b/DataFormats/TrajectorySeed/interface/TrajectorySeed.h index ca7c76d5a6f6a..160ba8219f89a 100644 --- a/DataFormats/TrajectorySeed/interface/TrajectorySeed.h +++ b/DataFormats/TrajectorySeed/interface/TrajectorySeed.h @@ -15,54 +15,57 @@ - a vector of RecHits (with Own_vector to store polimorphic) - a propagation direction **/ -class TrajectorySeed { -public: - typedef edm::OwnVector RecHitContainer; - typedef edm::Range RecHitRange; +namespace io_v1 { + class TrajectorySeed { + public: + typedef edm::OwnVector RecHitContainer; + typedef edm::Range RecHitRange; - TrajectorySeed() {} - virtual ~TrajectorySeed() {} + TrajectorySeed() {} + virtual ~TrajectorySeed() {} - TrajectorySeed(PTrajectoryStateOnDet const& ptsos, RecHitContainer const& rh, PropagationDirection dir) - : hits_(rh), tsos_(ptsos), dir_(dir) {} + TrajectorySeed(PTrajectoryStateOnDet const& ptsos, RecHitContainer const& rh, PropagationDirection dir) + : hits_(rh), tsos_(ptsos), dir_(dir) {} - TrajectorySeed(PTrajectoryStateOnDet const& ptsos, RecHitContainer&& rh, PropagationDirection dir) noexcept - : hits_(std::move(rh)), tsos_(ptsos), dir_(dir) {} + TrajectorySeed(PTrajectoryStateOnDet const& ptsos, RecHitContainer&& rh, PropagationDirection dir) noexcept + : hits_(std::move(rh)), tsos_(ptsos), dir_(dir) {} - void swap(PTrajectoryStateOnDet& ptsos, RecHitContainer& rh, PropagationDirection& dir) noexcept { - hits_.swap(rh); - std::swap(tsos_, ptsos); - std::swap(dir_, dir); - } + void swap(PTrajectoryStateOnDet& ptsos, RecHitContainer& rh, PropagationDirection& dir) noexcept { + hits_.swap(rh); + std::swap(tsos_, ptsos); + std::swap(dir_, dir); + } - void swap(TrajectorySeed& rh) noexcept { - hits_.swap(rh.hits_); - std::swap(tsos_, rh.tsos_); - std::swap(dir_, rh.dir_); - } + void swap(TrajectorySeed& rh) noexcept { + hits_.swap(rh.hits_); + std::swap(tsos_, rh.tsos_); + std::swap(dir_, rh.dir_); + } - TrajectorySeed(TrajectorySeed const& o) = default; + TrajectorySeed(TrajectorySeed const& o) = default; - TrajectorySeed& operator=(TrajectorySeed const& o) = default; + TrajectorySeed& operator=(TrajectorySeed const& o) = default; - TrajectorySeed(TrajectorySeed&& o) noexcept = default; + TrajectorySeed(TrajectorySeed&& o) noexcept = default; - TrajectorySeed& operator=(TrajectorySeed&& o) noexcept = default; + TrajectorySeed& operator=(TrajectorySeed&& o) noexcept = default; - RecHitRange recHits() const { return {hits_.begin(), hits_.end()}; } - unsigned int nHits() const { return hits_.size(); } - PropagationDirection direction() const { return dir_; } - PTrajectoryStateOnDet const& startingState() const { return tsos_; } + RecHitRange recHits() const { return {hits_.begin(), hits_.end()}; } + unsigned int nHits() const { return hits_.size(); } + PropagationDirection direction() const { return dir_; } + PTrajectoryStateOnDet const& startingState() const { return tsos_; } - virtual TrajectorySeed* clone() const { return new TrajectorySeed(*this); } + virtual TrajectorySeed* clone() const { return new TrajectorySeed(*this); } -private: - RecHitContainer hits_; - PTrajectoryStateOnDet tsos_; - PropagationDirection dir_ = invalidDirection; -}; + private: + RecHitContainer hits_; + PTrajectoryStateOnDet tsos_; + PropagationDirection dir_ = invalidDirection; + }; -inline void swap(TrajectorySeed& rh, TrajectorySeed& lh) noexcept { rh.swap(lh); } + inline void swap(TrajectorySeed& rh, TrajectorySeed& lh) noexcept { rh.swap(lh); } +} // namespace io_v1 +using TrajectorySeed = io_v1::TrajectorySeed; typedef TrajectorySeed BasicTrajectorySeed; diff --git a/DataFormats/TrajectorySeed/interface/TrajectorySeedFwd.h b/DataFormats/TrajectorySeed/interface/TrajectorySeedFwd.h index 593a99fe32bcc..1013175c3b926 100644 --- a/DataFormats/TrajectorySeed/interface/TrajectorySeedFwd.h +++ b/DataFormats/TrajectorySeed/interface/TrajectorySeedFwd.h @@ -1,6 +1,8 @@ #ifndef DataFormats_TrajectorySeed_TrajectorySeedFwd_h #define DataFormats_TrajectorySeed_TrajectorySeedFwd_h -class TrajectorySeed; - +namespace io_v1 { + class TrajectorySeed; +} +using TrajectorySeed = io_v1::TrajectorySeed; #endif diff --git a/DataFormats/TrajectorySeed/src/classes_def.xml b/DataFormats/TrajectorySeed/src/classes_def.xml index 2b9db6a7d6096..0d5a8f215fbf2 100644 --- a/DataFormats/TrajectorySeed/src/classes_def.xml +++ b/DataFormats/TrajectorySeed/src/classes_def.xml @@ -1,24 +1,23 @@ - - - + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/DataFormats/VertexReco/src/classes_def.xml b/DataFormats/VertexReco/src/classes_def.xml index c8f8f15b7bd22..f28b1c79b8380 100755 --- a/DataFormats/VertexReco/src/classes_def.xml +++ b/DataFormats/VertexReco/src/classes_def.xml @@ -9,7 +9,7 @@ - +