Skip to content

[20_0_X] Move stored types in io_v1 namespace, reset class versions to 3 #50968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
makortel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[20_0_X] Move stored types in io_v1 namespace, reset class versions to 3 #50968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7095d7a
Move stored types in io_v1 namespace, reset class versions to 3
makortel May 15, 2026
b4d5481
Move sources of CaloCluster and CaloTower inside io_v1 namespace (to …
makortel May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "DataFormats/MuonReco/interface/MuonFwd.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"

//Framework
#include "FWCore/Framework/interface/ConsumesCollector.h"
Expand All @@ -12,9 +13,6 @@
//STL
#include <vector>

namespace reco {
class Track;
}
namespace edm {
class Event;
class EventSetup;
Expand Down
5 changes: 1 addition & 4 deletions Alignment/MillePedeAlignmentAlgorithm/interface/MillePedeMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"

#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand All @@ -33,10 +34,6 @@ class TDirectory;

class TrackerTopology;

namespace reco {
class Track;
}

class Alignable;
class AlignableDetOrUnitPtr;
class TrajectoryStateOnSurface;
Expand Down
25 changes: 12 additions & 13 deletions AnalysisDataFormats/SUSYBSMObjects/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<lcgdict>
<class name="susybsm::HSCParticle" ClassVersion="12">
<version ClassVersion="12" checksum="3951465682"/>
<class name="susybsm::HSCParticle" ClassVersion="3">
<version ClassVersion="3" checksum="3986912460"/>
</class>
<class name="susybsm::RPCBetaMeasurement" ClassVersion="10">
<version ClassVersion="10" checksum="2621605308"/>
<class name="susybsm::RPCBetaMeasurement" ClassVersion="3">
<version ClassVersion="3" checksum="2621605308"/>
</class>
<class name="susybsm::HSCParticleCollection"/>
<class name="susybsm::HSCParticleRef"/>
Expand All @@ -14,17 +14,16 @@
<field name="transientMap_" transient="true"/>
</class>
<class name="edm::Wrapper<susybsm::TracksEcalRecHitsMap>"/>
<class name="susybsm::HSCPIsolation" ClassVersion="10">
<version ClassVersion="10" checksum="3676296078"/>
<class name="susybsm::HSCPIsolation" ClassVersion="3">
<version ClassVersion="3" checksum="3676296078"/>
</class>
<class name="susybsm::HSCPIsolationCollection"/>
<class name="susybsm::HSCPIsolationValueMap"/>
<class name="edm::Wrapper<susybsm::HSCPIsolation>"/>
<class name="edm::Wrapper<susybsm::HSCPIsolationCollection>"/>
<class name="edm::Wrapper<susybsm::HSCPIsolationValueMap>"/>
<class name="susybsm::HSCPCaloInfo" ClassVersion="12">
<version ClassVersion="12" checksum="2407040083"/>
<version ClassVersion="11" checksum="1170741674"/>
<class name="susybsm::HSCPCaloInfo" ClassVersion="3">
<version ClassVersion="3" checksum="2407040083"/>
</class>
<class name="susybsm::HSCPCaloInfoCollection"/>
<class name="susybsm::HSCPCaloInfoValueMap"/>
Expand All @@ -35,8 +34,8 @@
<class name="edm::Wrapper<susybsm::HSCPCaloInfoCollection>"/>
<class name="edm::Wrapper<susybsm::HSCPCaloInfoValueMap>"/>

<class name="susybsm::HSCPDeDxInfo" ClassVersion="13">
<version ClassVersion="13" checksum="2821313007"/>
<class name="susybsm::HSCPDeDxInfo" ClassVersion="3">
<version ClassVersion="3" checksum="2821313007"/>
</class>
<class name="susybsm::HSCPDeDxInfoCollection"/>
<class name="susybsm::HSCPDeDxInfoValueMap"/>
Expand All @@ -47,8 +46,8 @@
<class name="edm::Wrapper<susybsm::HSCPDeDxInfoCollection>"/>
<class name="edm::Wrapper<susybsm::HSCPDeDxInfoValueMap>"/>

<class name="susybsm::MuonSegment" ClassVersion="10">
<version ClassVersion="10" checksum="3541168201"/>
<class name="susybsm::MuonSegment" ClassVersion="3">
<version ClassVersion="3" checksum="3857645521"/>
</class>
<class name="susybsm::MuonSegmentCollection"/>
<class name="susybsm::MuonSegmentRef"/>
Expand Down
56 changes: 23 additions & 33 deletions AnalysisDataFormats/TopObjects/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
<lcgdict>
<class name="TtGenEvent" ClassVersion="12">
<version ClassVersion="12" checksum="3953108735"/>
<version ClassVersion="11" checksum="3979818069"/>
<version ClassVersion="10" checksum="2353612425"/>
<class name="TtGenEvent" ClassVersion="3">
<version ClassVersion="3" checksum="2709360007"/>
</class>
<class name="StGenEvent" ClassVersion="11">
<version ClassVersion="11" checksum="712808804"/>
<version ClassVersion="10" checksum="3161795320"/>
<class name="StGenEvent" ClassVersion="3">
<version ClassVersion="3" checksum="816344636"/>
</class>
<class name="TopGenEvent" ClassVersion="10">
<version ClassVersion="10" checksum="4112324732"/>
<class name="TopGenEvent" ClassVersion="3">
<version ClassVersion="3" checksum="4215860564"/>
</class>
<class name="TtEvent" ClassVersion="11">
<version ClassVersion="11" checksum="1688727696"/>
<class name="TtEvent" ClassVersion="3">
<version ClassVersion="3" checksum="67438550"/>
</class>
<class name="TtFullLeptonicEvent" ClassVersion="11">
<version ClassVersion="11" checksum="4030394490"/>
<version ClassVersion="10" checksum="1854988496"/>
<class name="TtFullLeptonicEvent" ClassVersion="3">
<version ClassVersion="3" checksum="3754713216"/>
</class>
<class name="TtSemiLeptonicEvent" ClassVersion="11">
<version ClassVersion="11" checksum="3559376459"/>
<version ClassVersion="10" checksum="4150310883"/>
<class name="TtSemiLeptonicEvent" ClassVersion="3">
<version ClassVersion="3" checksum="2068896689"/>
</class>
<class name="TtFullHadronicEvent" ClassVersion="11">
<version ClassVersion="11" checksum="350583477"/>
<version ClassVersion="10" checksum="3848919223"/>
<class name="TtFullHadronicEvent" ClassVersion="3">
<version ClassVersion="3" checksum="3024261627"/>
</class>
<class name="edm::Wrapper<TtGenEvent>" />
<class name="edm::Wrapper<StGenEvent>" />
<class name="edm::Wrapper<TopGenEvent>" />
<class name="edm::Wrapper<TtFullLeptonicEvent>" />
<class name="edm::Wrapper<TtSemiLeptonicEvent>" />
<class name="edm::Wrapper<TtFullHadronicEvent>" />
<class name="edm::Wrapper<reco::CompositeCandidate>" />

<class name="edm::RefProd<TtGenEvent>" />
<class name="edm::RefProd<StGenEvent>" />
Expand All @@ -42,24 +35,21 @@
<class name="edm::RefProd<TtFullHadronicEvent>" />

<class name="std::pair<WDecay::LeptonType, WDecay::LeptonType>" />
<class name="std::pair<reco::CompositeCandidate, std::vector<int> >" />
<class name="std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > >" />
<class name="edm::Wrapper<std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > > >" />

<class name="std::map<TtEvent::HypoClassKey, int>" />
<class name="std::map<TtEvent::HypoClassKey, std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > > >" />
<class name="std::map<TtEvent::HypoClassKey, std::vector<std::pair<reco::io_v1::CompositeCandidate, std::vector<int> > > >" />

<class name="TtDilepEvtSolution" ClassVersion="10">
<version ClassVersion="10" checksum="3903965368"/>
<class name="TtDilepEvtSolution" ClassVersion="3">
<version ClassVersion="3" checksum="2760008840"/>
</class>
<class name="TtSemiEvtSolution" ClassVersion="10">
<version ClassVersion="10" checksum="702702553"/>
<class name="TtSemiEvtSolution" ClassVersion="3">
<version ClassVersion="3" checksum="3136151227"/>
</class>
<class name="TtHadEvtSolution" ClassVersion="10">
<version ClassVersion="10" checksum="4003976374"/>
<class name="TtHadEvtSolution" ClassVersion="3">
<version ClassVersion="3" checksum="236483958"/>
</class>
<class name="StEvtSolution" ClassVersion="10">
<version ClassVersion="10" checksum="520926643"/>
<class name="StEvtSolution" ClassVersion="3">
<version ClassVersion="3" checksum="2664175531"/>
</class>
<class name="std::vector<TtDilepEvtSolution>" />
<class name="std::vector<TtSemiEvtSolution>" />
Expand Down
17 changes: 8 additions & 9 deletions AnalysisDataFormats/TrackInfo/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<lcgdict>
<class name="reco::TrackingRecHitInfo" ClassVersion="11">
<version ClassVersion="11" checksum="803167075"/>
<version ClassVersion="10" checksum="2470257581"/>
<class name="reco::TrackingRecHitInfo" ClassVersion="3">
<version ClassVersion="3" checksum="803167075"/>
</class>
<class name="reco::TrackingStateInfo"/>
<class name="std::pair<reco::StateType, reco::TrackingStateInfo>"/>
<class name="std::map<reco::StateType, reco::TrackingStateInfo>"/>
<class name="std::pair< edm::Ref< edm::OwnVector< TrackingRecHit, edm::ClonePolicy<TrackingRecHit> >,TrackingRecHit,edm::refhelper::FindUsingAdvance<edm::OwnVector<TrackingRecHit,edm::ClonePolicy<TrackingRecHit> >,TrackingRecHit> >, reco::TrackingRecHitInfo >"/>
<class name="std::map< edm::Ref< edm::OwnVector< TrackingRecHit, edm::ClonePolicy<TrackingRecHit> >,TrackingRecHit,edm::refhelper::FindUsingAdvance<edm::OwnVector<TrackingRecHit,edm::ClonePolicy<TrackingRecHit> >,TrackingRecHit> >, reco::TrackingRecHitInfo >"/>
<class name="reco::TrackInfo" ClassVersion="10">
<version ClassVersion="10" checksum="604971424"/>
<class name="reco::TrackInfo" ClassVersion="3">
<version ClassVersion="3" checksum="189107500"/>
</class>
<class name="std::vector<reco::TrackInfo>"/>
<class name="edm::Wrapper<std::vector<reco::TrackInfo> >"/>
Expand All @@ -24,16 +23,16 @@
</class>
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<reco::TrackInfo>,unsigned int> > >" />

<class name="TPtoRecoTrack" ClassVersion="10">
<version ClassVersion="10" checksum="909265596"/>
<class name="TPtoRecoTrack" ClassVersion="3">
<version ClassVersion="3" checksum="1673086488"/>
</class>
<class name="edm::Wrapper<TPtoRecoTrack>"/>

<class name="std::vector<TPtoRecoTrack>"/>
<class name="edm::Wrapper<std::vector<TPtoRecoTrack> >"/>

<class name="RecoTracktoTP" ClassVersion="10">
<version ClassVersion="10" checksum="3470602586"/>
<class name="RecoTracktoTP" ClassVersion="3">
<version ClassVersion="3" checksum="3098877748"/>
</class>
<class name="edm::Wrapper<RecoTracktoTP>"/>

Expand Down
3 changes: 2 additions & 1 deletion DPGAnalysis/MuonTools/interface/MuNtupleUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
#include <array>
#include <string>

#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigiFwd.h"

class L1MuDTChambPhDigi;
class L1Phase2MuDTPhDigi;

namespace nano_mu {

Expand Down
3 changes: 2 additions & 1 deletion DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@
#include <string>
#include <map>

#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigiFwd.h"

class DTGeometry;
class DTTrigGeomUtils;
class L1MuDTChambPhDigi;
class L1MuDTChambThDigi;
class L1Phase2MuDTPhDigi;
class DTTPGCompareUnit;
class DTTimeEvolutionHisto;

Expand Down
6 changes: 1 addition & 5 deletions DQM/GEM/plugins/GEMEffByGEMCSCSegmentSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@ void GEMEffByGEMCSCSegmentSource::analyze(const edm::Event& event, const edm::Ev
findMatchedME11Segments(muon_collection);
}

for (edm::OwnVector<GEMCSCSegment>::const_iterator iter = gemcsc_segment_collection->begin();
iter != gemcsc_segment_collection->end();
iter++) {
const GEMCSCSegment& gemcsc_segment = *iter;

for (const GEMCSCSegment& gemcsc_segment : *gemcsc_segment_collection) {
const CSCDetId csc_id = gemcsc_segment.cscDetId();
if (csc_id.isME11()) {
analyzeGE11ME11Segment(gemcsc_segment, oh_status_collection, vfat_status_collection);
Expand Down
1 change: 1 addition & 0 deletions DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayTOF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"

class SiStripFineDelayTOF {
public:
static double timeOfFlight(bool cosmics, bool field, double* trackParameters, double* hit, double* phit, bool onDisk);
Expand Down
18 changes: 8 additions & 10 deletions DataFormats/Alignment/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<lcgdict>
<!-- for LAS interface to track-based alignment !-->
<class name="SiStripLaserRecHit2D" ClassVersion="11">
<version ClassVersion="11" checksum="3638900806"/>
<version ClassVersion="10" checksum="3516129645"/>
<class name="SiStripLaserRecHit2D" ClassVersion="3">
<version ClassVersion="3" checksum="1878671762"/>
</class>
<class name="std::vector<SiStripLaserRecHit2D>"/>
<class name="TkLasBeam" ClassVersion="10">
<version ClassVersion="10" checksum="1460656577"/>
<class name="TkLasBeam" ClassVersion="3">
<version ClassVersion="3" checksum="1460656577"/>
</class>
<class name="TkLasBeamCollection"/>
<class name="edm::Wrapper<TkLasBeamCollection>"/>

<class name="TkFittedLasBeam" ClassVersion="11">
<version ClassVersion="11" checksum="4076174061"/>
<version ClassVersion="10" checksum="903692518"/>
<class name="TkFittedLasBeam" ClassVersion="3">
<version ClassVersion="3" checksum="4076174061"/>
</class>
<class name="TkFittedLasBeamCollection"/>
<class name="edm::Wrapper<TkFittedLasBeamCollection>"/>
Expand All @@ -22,8 +20,8 @@
<class name="AliClusterValueMap"/>
<class name="edm::ValueMap<AlignmentClusterFlag >"/>
<class name="edm::Wrapper< edm::ValueMap<AlignmentClusterFlag > >"/>
<class name="AlignmentClusterFlag" ClassVersion="10">
<version ClassVersion="10" checksum="3955968420"/>
<class name="AlignmentClusterFlag" ClassVersion="3">
<version ClassVersion="3" checksum="3955968420"/>
</class>
<class name="std::vector<AlignmentClusterFlag>"/>

Expand Down
34 changes: 19 additions & 15 deletions DataFormats/BTauReco/interface/BaseTagInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,32 @@
#include "DataFormats/BTauReco/interface/TaggingVariable.h"

namespace reco {
namespace io_v1 {

class BaseTagInfo {
public:
BaseTagInfo(void) {}
class BaseTagInfo {
public:
BaseTagInfo(void) {}

virtual ~BaseTagInfo(void) {}
virtual ~BaseTagInfo(void) {}

/// clone
virtual BaseTagInfo* clone(void) const { return new BaseTagInfo(*this); }
/// clone
virtual BaseTagInfo* clone(void) const { return new BaseTagInfo(*this); }

/// returns a polymorphic reference to the tagged jet
virtual edm::RefToBase<Jet> jet(void) const { return edm::RefToBase<Jet>(); }
/// returns a polymorphic reference to the tagged jet
virtual edm::RefToBase<Jet> jet(void) const { return edm::RefToBase<Jet>(); }

/// returns a list of tracks associated to the jet
virtual TrackRefVector tracks(void) const { return TrackRefVector(); }
/// returns a list of tracks associated to the jet
virtual TrackRefVector tracks(void) const { return TrackRefVector(); }

/// check if the algorithm is using the tracks or not
virtual bool hasTracks(void) const { return false; }
/// check if the algorithm is using the tracks or not
virtual bool hasTracks(void) const { return false; }

/// returns a description of the extended informations in a TaggingVariableList
virtual TaggingVariableList taggingVariables(void) const { return TaggingVariableList(); }
};
/// returns a description of the extended informations in a TaggingVariableList
virtual TaggingVariableList taggingVariables(void) const { return TaggingVariableList(); }
};

} // namespace io_v1
using BaseTagInfo = io_v1::BaseTagInfo;

DECLARE_EDM_REFS(BaseTagInfo)

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/BTauReco/interface/IPTagInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ namespace reco {
const Track* selectedTrack(size_t i) const { return reco::btag::toTrack(m_selected[i]); }

// Used by ROOT storage
CMS_CLASS_VERSION(11)
CMS_CLASS_VERSION(3)

private:
std::vector<btag::TrackIPData> m_data;
Expand Down
Loading