Skip to content

Commit 7b40d16

Browse files
makortelmakortel
committed
Move stored types in io_v1 namespace, reset class versions to 3
The io_v1 namespace allows schema evolution of complex cases (e.g. pointed-to container type of edm::Ref being changed) that ROOT's schema evolution can not support. Moving classes to io_v1 breaks backwards compatibility for these types that was agreed to be done in CMSSW_20_0_0 that serves a start of Phase 2 (only) targeting software. Taking advantage of the backwards compatiblity break, the class versions are reset to 3. In addition, include two complex schema evolution cases that were too difficult earlier - Make PFCandidate to no longer inherit from CompositeCandidate - Reduce use of RangeMap in muon code
1 parent 15be24b commit 7b40d16

896 files changed

Lines changed: 50509 additions & 50022 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "DataFormats/JetReco/interface/CaloJetCollection.h"
55
#include "DataFormats/MuonReco/interface/MuonFwd.h"
6+
#include "DataFormats/TrackReco/interface/TrackFwd.h"
67

78
//Framework
89
#include "FWCore/Framework/interface/ConsumesCollector.h"
@@ -12,9 +13,6 @@
1213
//STL
1314
#include <vector>
1415

15-
namespace reco {
16-
class Track;
17-
}
1816
namespace edm {
1917
class Event;
2018
class EventSetup;

‎Alignment/MillePedeAlignmentAlgorithm/interface/MillePedeMonitor.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

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

16+
#include "DataFormats/TrackReco/interface/TrackFwd.h"
1617
#include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h"
1718

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

3435
class TrackerTopology;
3536

36-
namespace reco {
37-
class Track;
38-
}
39-
4037
class Alignable;
4138
class AlignableDetOrUnitPtr;
4239
class TrajectoryStateOnSurface;

‎AnalysisDataFormats/SUSYBSMObjects/src/classes_def.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<lcgdict>
2-
<class name="susybsm::HSCParticle" ClassVersion="12">
3-
<version ClassVersion="12" checksum="3951465682"/>
2+
<class name="susybsm::HSCParticle" ClassVersion="3">
3+
<version ClassVersion="3" checksum="3986912460"/>
44
</class>
5-
<class name="susybsm::RPCBetaMeasurement" ClassVersion="10">
6-
<version ClassVersion="10" checksum="2621605308"/>
5+
<class name="susybsm::RPCBetaMeasurement" ClassVersion="3">
6+
<version ClassVersion="3" checksum="2621605308"/>
77
</class>
88
<class name="susybsm::HSCParticleCollection"/>
99
<class name="susybsm::HSCParticleRef"/>
@@ -14,17 +14,16 @@
1414
<field name="transientMap_" transient="true"/>
1515
</class>
1616
<class name="edm::Wrapper<susybsm::TracksEcalRecHitsMap>"/>
17-
<class name="susybsm::HSCPIsolation" ClassVersion="10">
18-
<version ClassVersion="10" checksum="3676296078"/>
17+
<class name="susybsm::HSCPIsolation" ClassVersion="3">
18+
<version ClassVersion="3" checksum="3676296078"/>
1919
</class>
2020
<class name="susybsm::HSCPIsolationCollection"/>
2121
<class name="susybsm::HSCPIsolationValueMap"/>
2222
<class name="edm::Wrapper<susybsm::HSCPIsolation>"/>
2323
<class name="edm::Wrapper<susybsm::HSCPIsolationCollection>"/>
2424
<class name="edm::Wrapper<susybsm::HSCPIsolationValueMap>"/>
25-
<class name="susybsm::HSCPCaloInfo" ClassVersion="12">
26-
<version ClassVersion="12" checksum="2407040083"/>
27-
<version ClassVersion="11" checksum="1170741674"/>
25+
<class name="susybsm::HSCPCaloInfo" ClassVersion="3">
26+
<version ClassVersion="3" checksum="2407040083"/>
2827
</class>
2928
<class name="susybsm::HSCPCaloInfoCollection"/>
3029
<class name="susybsm::HSCPCaloInfoValueMap"/>
@@ -35,8 +34,8 @@
3534
<class name="edm::Wrapper<susybsm::HSCPCaloInfoCollection>"/>
3635
<class name="edm::Wrapper<susybsm::HSCPCaloInfoValueMap>"/>
3736

38-
<class name="susybsm::HSCPDeDxInfo" ClassVersion="13">
39-
<version ClassVersion="13" checksum="2821313007"/>
37+
<class name="susybsm::HSCPDeDxInfo" ClassVersion="3">
38+
<version ClassVersion="3" checksum="2821313007"/>
4039
</class>
4140
<class name="susybsm::HSCPDeDxInfoCollection"/>
4241
<class name="susybsm::HSCPDeDxInfoValueMap"/>
@@ -47,8 +46,8 @@
4746
<class name="edm::Wrapper<susybsm::HSCPDeDxInfoCollection>"/>
4847
<class name="edm::Wrapper<susybsm::HSCPDeDxInfoValueMap>"/>
4948

50-
<class name="susybsm::MuonSegment" ClassVersion="10">
51-
<version ClassVersion="10" checksum="3541168201"/>
49+
<class name="susybsm::MuonSegment" ClassVersion="3">
50+
<version ClassVersion="3" checksum="3857645521"/>
5251
</class>
5352
<class name="susybsm::MuonSegmentCollection"/>
5453
<class name="susybsm::MuonSegmentRef"/>

‎AnalysisDataFormats/TopObjects/src/classes_def.xml‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
<lcgdict>
2-
<class name="TtGenEvent" ClassVersion="12">
3-
<version ClassVersion="12" checksum="3953108735"/>
4-
<version ClassVersion="11" checksum="3979818069"/>
5-
<version ClassVersion="10" checksum="2353612425"/>
2+
<class name="TtGenEvent" ClassVersion="3">
3+
<version ClassVersion="3" checksum="2709360007"/>
64
</class>
7-
<class name="StGenEvent" ClassVersion="11">
8-
<version ClassVersion="11" checksum="712808804"/>
9-
<version ClassVersion="10" checksum="3161795320"/>
5+
<class name="StGenEvent" ClassVersion="3">
6+
<version ClassVersion="3" checksum="816344636"/>
107
</class>
11-
<class name="TopGenEvent" ClassVersion="10">
12-
<version ClassVersion="10" checksum="4112324732"/>
8+
<class name="TopGenEvent" ClassVersion="3">
9+
<version ClassVersion="3" checksum="4215860564"/>
1310
</class>
14-
<class name="TtEvent" ClassVersion="11">
15-
<version ClassVersion="11" checksum="1688727696"/>
11+
<class name="TtEvent" ClassVersion="3">
12+
<version ClassVersion="3" checksum="67438550"/>
1613
</class>
17-
<class name="TtFullLeptonicEvent" ClassVersion="11">
18-
<version ClassVersion="11" checksum="4030394490"/>
19-
<version ClassVersion="10" checksum="1854988496"/>
14+
<class name="TtFullLeptonicEvent" ClassVersion="3">
15+
<version ClassVersion="3" checksum="3754713216"/>
2016
</class>
21-
<class name="TtSemiLeptonicEvent" ClassVersion="11">
22-
<version ClassVersion="11" checksum="3559376459"/>
23-
<version ClassVersion="10" checksum="4150310883"/>
17+
<class name="TtSemiLeptonicEvent" ClassVersion="3">
18+
<version ClassVersion="3" checksum="2068896689"/>
2419
</class>
25-
<class name="TtFullHadronicEvent" ClassVersion="11">
26-
<version ClassVersion="11" checksum="350583477"/>
27-
<version ClassVersion="10" checksum="3848919223"/>
20+
<class name="TtFullHadronicEvent" ClassVersion="3">
21+
<version ClassVersion="3" checksum="3024261627"/>
2822
</class>
2923
<class name="edm::Wrapper<TtGenEvent>" />
3024
<class name="edm::Wrapper<StGenEvent>" />
3125
<class name="edm::Wrapper<TopGenEvent>" />
3226
<class name="edm::Wrapper<TtFullLeptonicEvent>" />
3327
<class name="edm::Wrapper<TtSemiLeptonicEvent>" />
3428
<class name="edm::Wrapper<TtFullHadronicEvent>" />
35-
<class name="edm::Wrapper<reco::CompositeCandidate>" />
3629

3730
<class name="edm::RefProd<TtGenEvent>" />
3831
<class name="edm::RefProd<StGenEvent>" />
@@ -42,24 +35,21 @@
4235
<class name="edm::RefProd<TtFullHadronicEvent>" />
4336

4437
<class name="std::pair<WDecay::LeptonType, WDecay::LeptonType>" />
45-
<class name="std::pair<reco::CompositeCandidate, std::vector<int> >" />
46-
<class name="std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > >" />
47-
<class name="edm::Wrapper<std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > > >" />
4838

4939
<class name="std::map<TtEvent::HypoClassKey, int>" />
50-
<class name="std::map<TtEvent::HypoClassKey, std::vector<std::pair<reco::CompositeCandidate, std::vector<int> > > >" />
40+
<class name="std::map<TtEvent::HypoClassKey, std::vector<std::pair<reco::io_v1::CompositeCandidate, std::vector<int> > > >" />
5141

52-
<class name="TtDilepEvtSolution" ClassVersion="10">
53-
<version ClassVersion="10" checksum="3903965368"/>
42+
<class name="TtDilepEvtSolution" ClassVersion="3">
43+
<version ClassVersion="3" checksum="2760008840"/>
5444
</class>
55-
<class name="TtSemiEvtSolution" ClassVersion="10">
56-
<version ClassVersion="10" checksum="702702553"/>
45+
<class name="TtSemiEvtSolution" ClassVersion="3">
46+
<version ClassVersion="3" checksum="3136151227"/>
5747
</class>
58-
<class name="TtHadEvtSolution" ClassVersion="10">
59-
<version ClassVersion="10" checksum="4003976374"/>
48+
<class name="TtHadEvtSolution" ClassVersion="3">
49+
<version ClassVersion="3" checksum="236483958"/>
6050
</class>
61-
<class name="StEvtSolution" ClassVersion="10">
62-
<version ClassVersion="10" checksum="520926643"/>
51+
<class name="StEvtSolution" ClassVersion="3">
52+
<version ClassVersion="3" checksum="2664175531"/>
6353
</class>
6454
<class name="std::vector<TtDilepEvtSolution>" />
6555
<class name="std::vector<TtSemiEvtSolution>" />

‎AnalysisDataFormats/TrackInfo/src/classes_def.xml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<lcgdict>
2-
<class name="reco::TrackingRecHitInfo" ClassVersion="11">
3-
<version ClassVersion="11" checksum="803167075"/>
4-
<version ClassVersion="10" checksum="2470257581"/>
2+
<class name="reco::TrackingRecHitInfo" ClassVersion="3">
3+
<version ClassVersion="3" checksum="803167075"/>
54
</class>
65
<class name="reco::TrackingStateInfo"/>
76
<class name="std::pair<reco::StateType, reco::TrackingStateInfo>"/>
87
<class name="std::map<reco::StateType, reco::TrackingStateInfo>"/>
98
<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 >"/>
109
<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 >"/>
11-
<class name="reco::TrackInfo" ClassVersion="10">
12-
<version ClassVersion="10" checksum="604971424"/>
10+
<class name="reco::TrackInfo" ClassVersion="3">
11+
<version ClassVersion="3" checksum="189107500"/>
1312
</class>
1413
<class name="std::vector<reco::TrackInfo>"/>
1514
<class name="edm::Wrapper<std::vector<reco::TrackInfo> >"/>
@@ -24,16 +23,16 @@
2423
</class>
2524
<class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<reco::TrackInfo>,unsigned int> > >" />
2625

27-
<class name="TPtoRecoTrack" ClassVersion="10">
28-
<version ClassVersion="10" checksum="909265596"/>
26+
<class name="TPtoRecoTrack" ClassVersion="3">
27+
<version ClassVersion="3" checksum="1673086488"/>
2928
</class>
3029
<class name="edm::Wrapper<TPtoRecoTrack>"/>
3130

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

35-
<class name="RecoTracktoTP" ClassVersion="10">
36-
<version ClassVersion="10" checksum="3470602586"/>
34+
<class name="RecoTracktoTP" ClassVersion="3">
35+
<version ClassVersion="3" checksum="3098877748"/>
3736
</class>
3837
<class name="edm::Wrapper<RecoTracktoTP>"/>
3938

‎DPGAnalysis/MuonTools/interface/MuNtupleUtils.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
#include <array>
2828
#include <string>
2929

30+
#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigiFwd.h"
31+
3032
class L1MuDTChambPhDigi;
31-
class L1Phase2MuDTPhDigi;
3233

3334
namespace nano_mu {
3435

‎DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434
#include <string>
3535
#include <map>
3636

37+
#include "DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigiFwd.h"
38+
3739
class DTGeometry;
3840
class DTTrigGeomUtils;
3941
class L1MuDTChambPhDigi;
4042
class L1MuDTChambThDigi;
41-
class L1Phase2MuDTPhDigi;
4243
class DTTPGCompareUnit;
4344
class DTTimeEvolutionHisto;
4445

‎DQM/GEM/plugins/GEMEffByGEMCSCSegmentSource.cc‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,7 @@ void GEMEffByGEMCSCSegmentSource::analyze(const edm::Event& event, const edm::Ev
179179
findMatchedME11Segments(muon_collection);
180180
}
181181

182-
for (edm::OwnVector<GEMCSCSegment>::const_iterator iter = gemcsc_segment_collection->begin();
183-
iter != gemcsc_segment_collection->end();
184-
iter++) {
185-
const GEMCSCSegment& gemcsc_segment = *iter;
186-
182+
for (const GEMCSCSegment& gemcsc_segment : *gemcsc_segment_collection) {
187183
const CSCDetId csc_id = gemcsc_segment.cscDetId();
188184
if (csc_id.isME11()) {
189185
analyzeGE11ME11Segment(gemcsc_segment, oh_status_collection, vfat_status_collection);

‎DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayTOF.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
55
#include "DataFormats/TrackReco/interface/TrackFwd.h"
6+
67
class SiStripFineDelayTOF {
78
public:
89
static double timeOfFlight(bool cosmics, bool field, double* trackParameters, double* hit, double* phit, bool onDisk);

‎DataFormats/Alignment/src/classes_def.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
<lcgdict>
22
<!-- for LAS interface to track-based alignment !-->
3-
<class name="SiStripLaserRecHit2D" ClassVersion="11">
4-
<version ClassVersion="11" checksum="3638900806"/>
5-
<version ClassVersion="10" checksum="3516129645"/>
3+
<class name="SiStripLaserRecHit2D" ClassVersion="3">
4+
<version ClassVersion="3" checksum="1878671762"/>
65
</class>
76
<class name="std::vector<SiStripLaserRecHit2D>"/>
8-
<class name="TkLasBeam" ClassVersion="10">
9-
<version ClassVersion="10" checksum="1460656577"/>
7+
<class name="TkLasBeam" ClassVersion="3">
8+
<version ClassVersion="3" checksum="1460656577"/>
109
</class>
1110
<class name="TkLasBeamCollection"/>
1211
<class name="edm::Wrapper<TkLasBeamCollection>"/>
1312

14-
<class name="TkFittedLasBeam" ClassVersion="11">
15-
<version ClassVersion="11" checksum="4076174061"/>
16-
<version ClassVersion="10" checksum="903692518"/>
13+
<class name="TkFittedLasBeam" ClassVersion="3">
14+
<version ClassVersion="3" checksum="4076174061"/>
1715
</class>
1816
<class name="TkFittedLasBeamCollection"/>
1917
<class name="edm::Wrapper<TkFittedLasBeamCollection>"/>
@@ -22,8 +20,8 @@
2220
<class name="AliClusterValueMap"/>
2321
<class name="edm::ValueMap<AlignmentClusterFlag >"/>
2422
<class name="edm::Wrapper< edm::ValueMap<AlignmentClusterFlag > >"/>
25-
<class name="AlignmentClusterFlag" ClassVersion="10">
26-
<version ClassVersion="10" checksum="3955968420"/>
23+
<class name="AlignmentClusterFlag" ClassVersion="3">
24+
<version ClassVersion="3" checksum="3955968420"/>
2725
</class>
2826
<class name="std::vector<AlignmentClusterFlag>"/>
2927

0 commit comments

Comments
 (0)