Skip to content

Commit bc3fd88

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45525 from Dr15Jones/rntupleNoSplit
Tell RNTuple not to split some classes
2 parents 5958df3 + 705e4f4 commit bc3fd88

File tree

18 files changed

+44
-44
lines changed

18 files changed

+44
-44
lines changed

‎DataFormats/BTauReco/src/classes_def.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
<class name="edm::ValueMap<edm::Ptr<reco::BaseTagInfo> >" />
393393
<class name="edm::Wrapper<edm::ValueMap<edm::Ptr<reco::BaseTagInfo> > >" />
394394
<class name="std::vector<reco::BaseTagInfo *>" />
395-
<class name="edm::OwnVector<reco::BaseTagInfo, edm::ClonePolicy<reco::BaseTagInfo> >" />
395+
<class name="edm::OwnVector<reco::BaseTagInfo, edm::ClonePolicy<reco::BaseTagInfo> >" rntupleSplit="false"/>
396396
<exclusion>
397397
<class name="edm::OwnVector<reco::BaseTagInfo, edm::ClonePolicy<reco::BaseTagInfo> >">
398398
<method name="sort" />

‎DataFormats/CSCRecHit/src/classes_def.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<class name="std::map<CSCDetId,std::pair<unsigned long,unsigned long> >"/>
1414
<class name="std::pair<CSCDetId,std::pair<unsigned int,unsigned int> >"/> <!-- Root6 -->
1515
<class name="std::pair<CSCDetId,std::pair<unsigned long,unsigned long> >"/><!-- Root6 -->
16-
<class name="edm::OwnVector<CSCRecHit2D,edm::ClonePolicy<CSCRecHit2D> >"/>
16+
<class name="edm::OwnVector<CSCRecHit2D,edm::ClonePolicy<CSCRecHit2D> >" rntupleSplit="false" />
1717
<class name="edm::ClonePolicy<CSCRecHit2D>"/> <!-- Root6 -->
1818
<class name="edm::RangeMap<CSCDetId,edm::OwnVector<CSCRecHit2D,edm::ClonePolicy<CSCRecHit2D> >,edm::ClonePolicy<CSCRecHit2D> >"/>
1919
<class name="edm::Wrapper<edm::RangeMap<CSCDetId,edm::OwnVector<CSCRecHit2D,edm::ClonePolicy<CSCRecHit2D> >,edm::ClonePolicy<CSCRecHit2D> > >"/>
@@ -24,7 +24,7 @@
2424
<version ClassVersion="11" checksum="160361831"/>
2525
<version ClassVersion="10" checksum="3002485899"/>
2626
</class>
27-
<class name="edm::OwnVector<CSCSegment,edm::ClonePolicy<CSCSegment> >"/>
27+
<class name="edm::OwnVector<CSCSegment,edm::ClonePolicy<CSCSegment> >" rntupleSplit="false" />
2828
<class name="edm::RangeMap<CSCDetId,edm::OwnVector<CSCSegment,edm::ClonePolicy<CSCSegment> >,edm::ClonePolicy<CSCSegment> >"/>
2929
<class name="edm::ClonePolicy<CSCSegment>"/> <!-- Root6 -->
3030
<class name="edm::Wrapper<edm::RangeMap<CSCDetId,edm::OwnVector<CSCSegment,edm::ClonePolicy<CSCSegment> >,edm::ClonePolicy<CSCSegment> > >"/>

‎DataFormats/Candidate/src/classes_def.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@
203203
<class name="std::vector<reco::Particle>" />
204204
<class name="std::vector<reco::Candidate *>" />
205205
<class name="std::vector<reco::LeafCandidate>" />
206-
<class name="reco::CandidateCollection" />
207-
<class name="reco::CandidateBaseRef" />
206+
<class name="reco::CandidateCollection" rntupleSplit="false"/>
207+
<class name="reco::CandidateBaseRef" rntupleSplit="false"/>
208208

209209
<class name="edm::Wrapper<reco::CandidateCollection>" />
210210
<class name="edm::Wrapper<std::vector<reco::Particle> >" />

‎DataFormats/Common/src/classes_def.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version ClassVersion="11" checksum="2247759761"/>
99
<version ClassVersion="10" checksum="2702412727"/>
1010
</class>
11-
<class name="edm::RefCore" ClassVersion="11">
11+
<class name="edm::RefCore" ClassVersion="11" rntupleSplit="false">
1212
<version ClassVersion="10" checksum="641105393"/>
1313
<version ClassVersion="11" checksum="3425324092"/>
1414
<field name="cachePtr_" transient = "true"/>
@@ -20,7 +20,7 @@
2020
edm::refcoreimpl::setCacheIsProductGetter(cachePtr_, getter);
2121
]]>
2222
</ioread>
23-
<class name="edm::RefCoreWithIndex" ClassVersion="11">
23+
<class name="edm::RefCoreWithIndex" ClassVersion="11" rntupleSplit="false">
2424
<version ClassVersion="11" checksum="2602044085"/>
2525
<field name="cachePtr_" transient = "true"/>
2626
</class>

‎DataFormats/DTRecHit/src/classes_def.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<class name="std::pair<DTLayerId,std::pair<unsigned int,unsigned int> >"/>
1515
<class name="std::map<DTLayerId,std::pair<unsigned long,unsigned long> >"/>
1616
<class name="std::pair<DTLayerId,std::pair<unsigned long,unsigned long> >"/>
17-
<class name="edm::OwnVector<DTRecHit1DPair,edm::ClonePolicy<DTRecHit1DPair> >"/>
17+
<class name="edm::OwnVector<DTRecHit1DPair,edm::ClonePolicy<DTRecHit1DPair> >" rntupleSplit="false"/>
1818
<class name="edm::ClonePolicy<DTRecHit1DPair>" /> <!-- Root6 -->
1919
<class name="edm::RangeMap <DTLayerId,edm::OwnVector<DTRecHit1DPair,edm::ClonePolicy<DTRecHit1DPair> >,edm::ClonePolicy<DTRecHit1DPair> >"/>
2020
<class name="edm::Wrapper<edm::RangeMap <DTLayerId, edm::OwnVector<DTRecHit1DPair,edm::ClonePolicy<DTRecHit1DPair> >,edm::ClonePolicy<DTRecHit1DPair> > >"/>
@@ -25,7 +25,7 @@
2525
<version ClassVersion="10" checksum="2463285514"/>
2626
</class>
2727
<class name="std::vector<DTSLRecCluster*>"/>
28-
<class name="edm::OwnVector<DTSLRecCluster,edm::ClonePolicy<DTSLRecCluster> >"/>
28+
<class name="edm::OwnVector<DTSLRecCluster,edm::ClonePolicy<DTSLRecCluster> >" rntupleSplit="false"/>
2929
<class name="edm::RangeMap <DTSuperLayerId, edm::OwnVector<DTSLRecCluster,edm::ClonePolicy<DTSLRecCluster> >,edm::ClonePolicy<DTSLRecCluster> >"/>
3030
<class name="edm::Wrapper<edm::RangeMap <DTSuperLayerId, edm::OwnVector<DTSLRecCluster,edm::ClonePolicy<DTSLRecCluster> >,edm::ClonePolicy<DTSLRecCluster> > >"/>
3131
<class name="DTRecSegment2D" ClassVersion="11">
@@ -39,7 +39,7 @@
3939
<class name="std::vector<DTSLRecSegment2D*>"/>
4040
<class name="std::map<DTSuperLayerId,std::pair<unsigned int,unsigned int> >"/>
4141
<class name="std::map<DTSuperLayerId,std::pair<unsigned long,unsigned long> >"/>
42-
<class name="edm::OwnVector<DTSLRecSegment2D,edm::ClonePolicy<DTSLRecSegment2D> >"/>
42+
<class name="edm::OwnVector<DTSLRecSegment2D,edm::ClonePolicy<DTSLRecSegment2D> >" rntupleSplit="false"/>
4343
<class name="edm::RangeMap <DTSuperLayerId, edm::OwnVector<DTSLRecSegment2D,edm::ClonePolicy<DTSLRecSegment2D> >,edm::ClonePolicy<DTSLRecSegment2D> >"/>
4444
<class name="edm::Wrapper<edm::RangeMap <DTSuperLayerId, edm::OwnVector<DTSLRecSegment2D,edm::ClonePolicy<DTSLRecSegment2D> >,edm::ClonePolicy<DTSLRecSegment2D> > >"/>
4545
<class name="DTChamberRecSegment2D" ClassVersion="11">
@@ -56,7 +56,7 @@
5656
<class name="std::pair<DTChamberId,std::pair<unsigned int,unsigned int> >"/>
5757
<class name="std::map<DTChamberId,std::pair<unsigned long,unsigned long> >"/>
5858
<class name="std::pair<DTChamberId,std::pair<unsigned long,unsigned long> >"/>
59-
<class name="edm::OwnVector<DTRecSegment4D,edm::ClonePolicy<DTRecSegment4D> >"/>
59+
<class name="edm::OwnVector<DTRecSegment4D,edm::ClonePolicy<DTRecSegment4D> >" rntupleSplit="false"/>
6060
<class name="edm::ClonePolicy<DTRecSegment4D>" /> <!-- Root6 -->
6161
<class name="edm::RangeMap <DTChamberId, edm::OwnVector<DTRecSegment4D,edm::ClonePolicy<DTRecSegment4D> >,edm::ClonePolicy<DTRecSegment4D> >"/>
6262
<class name="edm::Wrapper<edm::RangeMap <DTChamberId, edm::OwnVector<DTRecSegment4D,edm::ClonePolicy<DTRecSegment4D> >,edm::ClonePolicy<DTRecSegment4D> > >"/>

‎DataFormats/EgammaReco/src/classes_def.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<lcgdict>
22

3-
<class name="edm::RefToBase<reco::CaloCluster>"/>
3+
<class name="edm::RefToBase<reco::CaloCluster>" rntupleSplit="false"/>
44
<class name="edm::reftobase::BaseHolder<reco::CaloCluster>"/>
55
<class name="edm::reftobase::IndirectHolder<reco::CaloCluster>" />
66

‎DataFormats/GEMRecHit/src/classes_def.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<class name="std::vector<GEMRecHit*>" splitLevel="0"/>
1010
<class name="std::map<GEMDetId, std::pair<unsigned int, unsigned int> >" splitLevel="0"/>
1111
<class name="std::map<GEMDetId, std::pair<unsigned long, unsigned long> >" splitLevel="0"/>
12-
<class name="edm::OwnVector<GEMRecHit, edm::ClonePolicy<GEMRecHit> >" splitLevel="0"/>
12+
<class name="edm::OwnVector<GEMRecHit, edm::ClonePolicy<GEMRecHit> >" splitLevel="0" rntupleSplit="false"/>
1313
<class name="edm::RangeMap<GEMDetId, edm::OwnVector<GEMRecHit, edm::ClonePolicy<GEMRecHit> >, edm::ClonePolicy<GEMRecHit> >" splitLevel="0"/>
1414
<class name="edm::Wrapper<edm::RangeMap<GEMDetId, edm::OwnVector<GEMRecHit, edm::ClonePolicy<GEMRecHit> >, edm::ClonePolicy<GEMRecHit> > >" splitLevel="0"/>
1515

@@ -21,7 +21,7 @@
2121
<class name="std::vector<ME0RecHit*>" splitLevel="0"/>
2222
<class name="std::map<ME0DetId, std::pair<unsigned int, unsigned int> >" splitLevel="0"/>
2323
<class name="std::map<ME0DetId, std::pair<unsigned long, unsigned long> >" splitLevel="0"/>
24-
<class name="edm::OwnVector<ME0RecHit, edm::ClonePolicy<ME0RecHit> >" splitLevel="0"/>
24+
<class name="edm::OwnVector<ME0RecHit, edm::ClonePolicy<ME0RecHit> >" splitLevel="0" rntupleSplit="false"/>
2525
<class name="edm::RangeMap<ME0DetId, edm::OwnVector<ME0RecHit, edm::ClonePolicy<ME0RecHit> >, edm::ClonePolicy<ME0RecHit> >" splitLevel="0"/>
2626
<class name="edm::Wrapper<edm::RangeMap<ME0DetId, edm::OwnVector<ME0RecHit, edm::ClonePolicy<ME0RecHit> >, edm::ClonePolicy<ME0RecHit> > >" splitLevel="0"/>
2727

@@ -31,7 +31,7 @@
3131
<version ClassVersion="10" checksum="2470665576"/>
3232
</class>
3333
<class name="std::vector<GEMCSCSegment*>" splitLevel="0"/>
34-
<class name="edm::OwnVector<GEMCSCSegment,edm::ClonePolicy<GEMCSCSegment> >" splitLevel="0"/>
34+
<class name="edm::OwnVector<GEMCSCSegment,edm::ClonePolicy<GEMCSCSegment> >" splitLevel="0" rntupleSplit="false"/>
3535
<class name="edm::RangeMap<CSCDetId,edm::OwnVector<GEMCSCSegment,edm::ClonePolicy<GEMCSCSegment> >,edm::ClonePolicy<GEMCSCSegment> >" splitLevel="0"/>
3636
<class name="edm::Wrapper<edm::RangeMap<CSCDetId,edm::OwnVector<GEMCSCSegment,edm::ClonePolicy<GEMCSCSegment> >,edm::ClonePolicy<GEMCSCSegment> > >" splitLevel="0"/>
3737
<class name="GEMCSCSegmentRef" splitLevel="0"/>
@@ -44,7 +44,7 @@
4444
</ioread>
4545
</class>
4646
<class name="std::vector<GEMSegment*>" splitLevel="0"/>
47-
<class name="edm::OwnVector<GEMSegment,edm::ClonePolicy<GEMSegment> >" splitLevel="0"/>
47+
<class name="edm::OwnVector<GEMSegment,edm::ClonePolicy<GEMSegment> >" splitLevel="0" rntupleSplit="false"/>
4848
<class name="edm::RangeMap<GEMDetId,edm::OwnVector<GEMSegment,edm::ClonePolicy<GEMSegment> >,edm::ClonePolicy<GEMSegment> >" splitLevel="0"/>
4949
<class name="edm::Wrapper<edm::RangeMap<GEMDetId,edm::OwnVector<GEMSegment,edm::ClonePolicy<GEMSegment> >,edm::ClonePolicy<GEMSegment> > >" splitLevel="0"/>
5050
<class name="GEMSegmentRef" splitLevel="0"/>
@@ -56,7 +56,7 @@
5656
<version ClassVersion="10" checksum="2562385753"/>
5757
</class>
5858
<class name="std::vector<ME0Segment*>" splitLevel="0"/>
59-
<class name="edm::OwnVector<ME0Segment,edm::ClonePolicy<ME0Segment> >" splitLevel="0"/>
59+
<class name="edm::OwnVector<ME0Segment,edm::ClonePolicy<ME0Segment> >" splitLevel="0" rntupleSplit="false" />
6060
<class name="edm::RangeMap<ME0DetId,edm::OwnVector<ME0Segment,edm::ClonePolicy<ME0Segment> >,edm::ClonePolicy<ME0Segment> >" splitLevel="0"/>
6161
<class name="edm::Wrapper<edm::RangeMap<ME0DetId,edm::OwnVector<ME0Segment,edm::ClonePolicy<ME0Segment> >,edm::ClonePolicy<ME0Segment> > >" splitLevel="0"/>
6262
<class name="ME0SegmentRef" splitLevel="0"/>

‎DataFormats/Histograms/src/classes_def.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@
3333
<class name="MEtoEDM<int>"/>
3434
<class name="MEtoEDM<long long>"/>
3535
<class name="MEtoEDM<TString>"/>
36-
<class name="MEtoEDM<TH1F>::MEtoEDMObject"/>
37-
<class name="MEtoEDM<TH1S>::MEtoEDMObject"/>
38-
<class name="MEtoEDM<TH1D>::MEtoEDMObject"/>
39-
<class name="MEtoEDM<TH1I>::MEtoEDMObject"/>
40-
<class name="MEtoEDM<TH2F>::MEtoEDMObject"/>
41-
<class name="MEtoEDM<TH2S>::MEtoEDMObject"/>
42-
<class name="MEtoEDM<TH2D>::MEtoEDMObject"/>
43-
<class name="MEtoEDM<TH2I>::MEtoEDMObject"/>
44-
<class name="MEtoEDM<TH3F>::MEtoEDMObject"/>
45-
<class name="MEtoEDM<TProfile>::MEtoEDMObject"/>
46-
<class name="MEtoEDM<TProfile2D>::MEtoEDMObject"/>
47-
<class name="MEtoEDM<double>::MEtoEDMObject"/>
48-
<class name="MEtoEDM<int>::MEtoEDMObject"/>
49-
<class name="MEtoEDM<long long>::MEtoEDMObject"/>
50-
<class name="MEtoEDM<TString>::MEtoEDMObject"/>
36+
<class name="MEtoEDM<TH1F>::MEtoEDMObject" rntupleSplit="false"/>
37+
<class name="MEtoEDM<TH1S>::MEtoEDMObject" rntupleSplit="false"/>
38+
<class name="MEtoEDM<TH1D>::MEtoEDMObject" rntupleSplit="false"/>
39+
<class name="MEtoEDM<TH1I>::MEtoEDMObject" rntupleSplit="false"/>
40+
<class name="MEtoEDM<TH2F>::MEtoEDMObject" rntupleSplit="false"/>
41+
<class name="MEtoEDM<TH2S>::MEtoEDMObject" rntupleSplit="false"/>
42+
<class name="MEtoEDM<TH2D>::MEtoEDMObject" rntupleSplit="false"/>
43+
<class name="MEtoEDM<TH2I>::MEtoEDMObject" rntupleSplit="false"/>
44+
<class name="MEtoEDM<TH3F>::MEtoEDMObject" rntupleSplit="false"/>
45+
<class name="MEtoEDM<TProfile>::MEtoEDMObject" rntupleSplit="false"/>
46+
<class name="MEtoEDM<TProfile2D>::MEtoEDMObject" rntupleSplit="false"/>
47+
<class name="MEtoEDM<double>::MEtoEDMObject" rntupleSplit="false"/>
48+
<class name="MEtoEDM<int>::MEtoEDMObject" rntupleSplit="false"/>
49+
<class name="MEtoEDM<long long>::MEtoEDMObject" rntupleSplit="false"/>
50+
<class name="MEtoEDM<TString>::MEtoEDMObject" rntupleSplit="false"/>
5151
<class name="std::vector<MEtoEDM<TH1F>::MEtoEDMObject>"/>
5252
<class name="std::vector<MEtoEDM<TH1S>::MEtoEDMObject>"/>
5353
<class name="std::vector<MEtoEDM<TH1D>::MEtoEDMObject>"/>

‎DataFormats/JetReco/src/classes_def_3.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<class name="edm::RefToBaseProd<reco::Jet>" >
107107
<!-- <field name="view_" transient="true" /> -->
108108
</class>
109-
<class name="edm::RefToBase<reco::Jet>" />
109+
<class name="edm::RefToBase<reco::Jet>" rntupleSplit="false"/>
110110
<class name="edm::reftobase::BaseHolder<reco::Jet>" />
111111
<class name="edm::reftobase::IndirectHolder<reco::Jet>" />
112112
<class name="edm::reftobase::IndirectVectorHolder<reco::Jet>" />

‎DataFormats/ParticleFlowReco/src/classes_def_2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
</class>
150150
<class name="std::map<reco::PFBlockElement::Type,reco::PFMultiLinksTC>" />
151151
<class name="std::vector<reco::PFBlockElement *>" />
152-
<class name="edm::OwnVector<reco::PFBlockElement, edm::ClonePolicy<reco::PFBlockElement> >"/>
152+
<class name="edm::OwnVector<reco::PFBlockElement, edm::ClonePolicy<reco::PFBlockElement> >" rntupleSplit="false"/>
153153
<class name="edm::Wrapper<edm::OwnVector<reco::PFBlockElement, edm::ClonePolicy<reco::PFBlockElement> > >" />
154154

155155
<class name="reco::PFBlockElementTrack" ClassVersion="16">

0 commit comments

Comments
 (0)