From 40fca09cf66310110c09c03bcecec04b99320f52 Mon Sep 17 00:00:00 2001
From: Alexei Strelchenko <astrel@fnal.gov>
Date: Wed, 19 Aug 2026 14:59:40 -0500
Subject: [PATCH 1/2] Added required dictionaries explicitly to fix unnecessary
 runtime autoparsing.

---
 DataFormats/BTauReco/src/classes_def.xml           | 2 ++
 DataFormats/EgammaCandidates/src/classes_def.xml   | 1 +
 DataFormats/EgammaReco/src/classes_def.xml         | 1 +
 DataFormats/HcalIsolatedTrack/src/classes_def.xml  | 1 +
 DataFormats/L1TCorrelator/src/classes_def.xml      | 1 +
 DataFormats/L1TMuon/src/classes_def.xml            | 1 +
 DataFormats/L1TParticleFlow/src/classes_def.xml    | 2 ++
 DataFormats/ParticleFlowReco/src/classes_def_2.xml | 1 +
 DataFormats/RecoCandidate/src/classes_def.xml      | 3 +++
 9 files changed, 13 insertions(+)

diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml
index 6b84387e328fc..d0ecce23d9d54 100644
--- a/DataFormats/BTauReco/src/classes_def.xml
+++ b/DataFormats/BTauReco/src/classes_def.xml
@@ -46,6 +46,8 @@
   <class name="reco::SecondaryVertexTagInfoRefVector"/>
   <class name="edm::Wrapper<reco::SecondaryVertexTagInfoCollection>"/>
 
+  <class name="reco::TemplatedSecondaryVertexTagInfo<reco::IPTagInfo<vector<edm::Ptr<reco::io_v1::Candidate> >,reco::io_v1::JetTagInfo>,reco::io_v1::VertexCompositePtrCandidate>"/>
+
   <class name="reco::TemplatedSecondaryVertexTagInfo<reco::CandIPTagInfo,reco::io_v1::VertexCompositePtrCandidate>::VertexData"/>
   <class name="std::vector<reco::CandSecondaryVertexTagInfo::VertexData>"/>
   <class name="reco::CandSecondaryVertexTagInfo"/>
diff --git a/DataFormats/EgammaCandidates/src/classes_def.xml b/DataFormats/EgammaCandidates/src/classes_def.xml
index ec9c5dba3054a..2fa2458eb1470 100644
--- a/DataFormats/EgammaCandidates/src/classes_def.xml
+++ b/DataFormats/EgammaCandidates/src/classes_def.xml
@@ -59,6 +59,7 @@
 
   <class name="std::vector<reco::io_v1::Photon>"/>
   <class name="edm::Wrapper<std::vector<reco::io_v1::Photon> >"/>
+  <class name="edm::refhelper::FindUsingAdvance<vector<reco::io_v1::Photon>,reco::io_v1::Photon>"/>
   <class name="edm::Ref<std::vector<reco::io_v1::Photon>,reco::io_v1::Photon,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::Photon>,reco::io_v1::Photon> >"/>
   <class name="std::vector<edm::Ref<std::vector<reco::io_v1::Photon>,reco::io_v1::Photon,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::Photon>,reco::io_v1::Photon> > >"/>
   <class name="edm::RefProd<std::vector<reco::io_v1::Photon> >"/>
diff --git a/DataFormats/EgammaReco/src/classes_def.xml b/DataFormats/EgammaReco/src/classes_def.xml
index 781a233719119..f15768e954e99 100644
--- a/DataFormats/EgammaReco/src/classes_def.xml
+++ b/DataFormats/EgammaReco/src/classes_def.xml
@@ -1,5 +1,6 @@
 <lcgdict>
 
+  <class name="std::vector<reco::io_v1::ElectronSeed::PMVars>"/>	
   <class name="edm::RefToBase<reco::io_v1::CaloCluster>"  rntupleStreamerMode="true"/>
   <class name="edm::reftobase::BaseHolder<reco::io_v1::CaloCluster>"/>
   <class name="edm::reftobase::IndirectHolder<reco::io_v1::CaloCluster>" />
diff --git a/DataFormats/HcalIsolatedTrack/src/classes_def.xml b/DataFormats/HcalIsolatedTrack/src/classes_def.xml
index 223b57b525480..0d933a167e508 100644
--- a/DataFormats/HcalIsolatedTrack/src/classes_def.xml
+++ b/DataFormats/HcalIsolatedTrack/src/classes_def.xml
@@ -11,6 +11,7 @@
   <class name="reco::IsolatedPixelTrackCandidateRefProd"/>
   <class name="edm::Wrapper<reco::IsolatedPixelTrackCandidateCollection>"/>
   <class name="edm::reftobase::Holder<reco::io_v1::Candidate, edm::Ref<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate> > >" />
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate>"/>					  
   <class name="edm::Ref<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate> >"/>
   <class name="std::vector<edm::Ref<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::IsolatedPixelTrackCandidate>,reco::IsolatedPixelTrackCandidate> > >"/>
 
diff --git a/DataFormats/L1TCorrelator/src/classes_def.xml b/DataFormats/L1TCorrelator/src/classes_def.xml
index 2ba68a5f58872..cfee2c03822a1 100644
--- a/DataFormats/L1TCorrelator/src/classes_def.xml
+++ b/DataFormats/L1TCorrelator/src/classes_def.xml
@@ -13,6 +13,7 @@
   </class>
   <class name="std::vector<l1t::io_v1::TkEm>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkEm> >"/>
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron>"/>
   <class name="edm::Ref<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm> >"/>
   <class name="std::vector<edm::Ref<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm> > >"/>
   <class name="edm::RefProd<l1t::TkEmCollection>" />
diff --git a/DataFormats/L1TMuon/src/classes_def.xml b/DataFormats/L1TMuon/src/classes_def.xml
index 20fc5c0e6c849..95f643ca61428 100644
--- a/DataFormats/L1TMuon/src/classes_def.xml
+++ b/DataFormats/L1TMuon/src/classes_def.xml
@@ -76,6 +76,7 @@
   <class name="edm::Wrapper<L1MuKBMTCombinedStubCollection >"/>
 
  <class name="edm::Ref<L1MuKBMTCombinedStubCollection>" splitLevel="0"/>
+ <class name="std::vector<edm::Ref<L1MuKBMTCombinedStubCollection>>"/>	 
  <class name="edm::Wrapper<edm::Ref<L1MuKBMTCombinedStubCollection > >"/>
 
 
diff --git a/DataFormats/L1TParticleFlow/src/classes_def.xml b/DataFormats/L1TParticleFlow/src/classes_def.xml
index 0bc23121ef7c3..698ad600e5a0e 100644
--- a/DataFormats/L1TParticleFlow/src/classes_def.xml
+++ b/DataFormats/L1TParticleFlow/src/classes_def.xml
@@ -29,6 +29,8 @@
   <class name="l1t::RegionalOutput<l1t::PFCandidateCollection>" />
   <class name="edm::Wrapper<l1t::RegionalOutput<l1t::PFCandidateCollection>>" />
 
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::PFJet>,l1t::io_v1::PFJet>"/>
+
   <class name="l1t::io_v1::PFJet"  ClassVersion="3">
         <version ClassVersion="3" checksum="1164493406"/>
   </class>
diff --git a/DataFormats/ParticleFlowReco/src/classes_def_2.xml b/DataFormats/ParticleFlowReco/src/classes_def_2.xml
index 7ac885d410bd1..8b1a160e743cf 100644
--- a/DataFormats/ParticleFlowReco/src/classes_def_2.xml
+++ b/DataFormats/ParticleFlowReco/src/classes_def_2.xml
@@ -202,6 +202,7 @@
   <class name="edm::ValueMap<reco::PreIdRef>"/>
   <class name="std::vector<reco::PreIdRef>"/>
   <class name="edm::Wrapper<edm::ValueMap<reco::PreIdRef> >"/>
+  <class name="edm::refhelper::FindUsingAdvance<vector<reco::io_v1::PreId>,reco::io_v1::PreId>" />
   <class name="edm::Ref<std::vector<reco::io_v1::PreId>,reco::io_v1::PreId,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::PreId>,reco::io_v1::PreId> >" />
 
   <class name="reco::PFBlockElementSuperCluster" ClassVersion="3">
diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml
index b49cf12da7f19..54f5ec3541e3c 100644
--- a/DataFormats/RecoCandidate/src/classes_def.xml
+++ b/DataFormats/RecoCandidate/src/classes_def.xml
@@ -28,6 +28,9 @@
     <!-- <field name="fixed_" transient="true"/> -->
   </class>
 
+  <class name="std::pair<reco::isodeposit::Direction::Distance,float>"/>
+  <class name="std::map<reco::isodeposit::Direction::Distance,float>"/>
+
   <class name="std::vector<reco::io_v1::RecoChargedCandidate>"/>
   <class name="edm::Wrapper<std::vector<reco::io_v1::RecoChargedCandidate> >"/>
   <class name="edm::Ref<std::vector<reco::io_v1::RecoChargedCandidate>,reco::io_v1::RecoChargedCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::RecoChargedCandidate>,reco::io_v1::RecoChargedCandidate> >"/>

From 489d9069950d03dbeb23839f31e083d27368a7a7 Mon Sep 17 00:00:00 2001
From: Alexei Strelchenko <astrel@fnal.gov>
Date: Thu, 20 Aug 2026 13:20:24 -0500
Subject: [PATCH 2/2] addressed PR comments

---
 DataFormats/EgammaReco/src/classes_def.xml      | 2 +-
 DataFormats/L1TCorrelator/src/classes_def.xml   | 2 +-
 DataFormats/L1TParticleFlow/src/classes_def.xml | 3 +--
 DataFormats/RecoCandidate/src/classes_def.xml   | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/DataFormats/EgammaReco/src/classes_def.xml b/DataFormats/EgammaReco/src/classes_def.xml
index f15768e954e99..92c6fd01240ea 100644
--- a/DataFormats/EgammaReco/src/classes_def.xml
+++ b/DataFormats/EgammaReco/src/classes_def.xml
@@ -1,6 +1,5 @@
 <lcgdict>
 
-  <class name="std::vector<reco::io_v1::ElectronSeed::PMVars>"/>	
   <class name="edm::RefToBase<reco::io_v1::CaloCluster>"  rntupleStreamerMode="true"/>
   <class name="edm::reftobase::BaseHolder<reco::io_v1::CaloCluster>"/>
   <class name="edm::reftobase::IndirectHolder<reco::io_v1::CaloCluster>" />
@@ -95,6 +94,7 @@
   </class>
 
   <class name="std::vector<reco::io_v1::ElectronSeed>"/>
+  <class name="std::vector<reco::io_v1::ElectronSeed::PMVars>"/>
   <class name="edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::ElectronSeed>,reco::io_v1::ElectronSeed>"/>
   <class name="edm::Ref<std::vector<reco::io_v1::ElectronSeed>,reco::io_v1::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::ElectronSeed>,reco::io_v1::ElectronSeed> >"/>
   <class name="edm::RefProd<std::vector<reco::io_v1::ElectronSeed> >"/>
diff --git a/DataFormats/L1TCorrelator/src/classes_def.xml b/DataFormats/L1TCorrelator/src/classes_def.xml
index cfee2c03822a1..1c57d09c9d53b 100644
--- a/DataFormats/L1TCorrelator/src/classes_def.xml
+++ b/DataFormats/L1TCorrelator/src/classes_def.xml
@@ -13,7 +13,6 @@
   </class>
   <class name="std::vector<l1t::io_v1::TkEm>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkEm> >"/>
-  <class name="edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron>"/>
   <class name="edm::Ref<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm> >"/>
   <class name="std::vector<edm::Ref<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkEm>,l1t::io_v1::TkEm> > >"/>
   <class name="edm::RefProd<l1t::TkEmCollection>" />
@@ -46,6 +45,7 @@
   </class>
   <class name="std::vector<l1t::io_v1::TkElectron>"/>
   <class name="edm::Wrapper<std::vector<l1t::io_v1::TkElectron> >"/>
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron>"/>
   <class name="edm::Ref<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron> >"/>
   <class name="std::vector<edm::Ref<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::TkElectron>,l1t::io_v1::TkElectron> > >"/>
   <class name="edm::RefProd<l1t::TkElectronCollection>" />
diff --git a/DataFormats/L1TParticleFlow/src/classes_def.xml b/DataFormats/L1TParticleFlow/src/classes_def.xml
index 698ad600e5a0e..d54858f4b7431 100644
--- a/DataFormats/L1TParticleFlow/src/classes_def.xml
+++ b/DataFormats/L1TParticleFlow/src/classes_def.xml
@@ -29,13 +29,12 @@
   <class name="l1t::RegionalOutput<l1t::PFCandidateCollection>" />
   <class name="edm::Wrapper<l1t::RegionalOutput<l1t::PFCandidateCollection>>" />
 
-  <class name="edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::PFJet>,l1t::io_v1::PFJet>"/>
-
   <class name="l1t::io_v1::PFJet"  ClassVersion="3">
         <version ClassVersion="3" checksum="1164493406"/>
   </class>
   <class name="l1t::PFJetCollection" />
   <class name="edm::Wrapper<l1t::PFJetCollection>" />
+  <class name="edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::PFJet>,l1t::io_v1::PFJet>"/>
   <class name="edm::Ref<l1t::PFJetCollection>" />
   <class name="edm::RefVector<l1t::PFJetCollection>" />
   <class name="std::vector<edm::Ref<std::vector<l1t::io_v1::PFJet>,l1t::io_v1::PFJet,edm::refhelper::FindUsingAdvance<std::vector<l1t::io_v1::PFJet>,l1t::io_v1::PFJet> > >" />
diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml
index 54f5ec3541e3c..9658e454aadbc 100644
--- a/DataFormats/RecoCandidate/src/classes_def.xml
+++ b/DataFormats/RecoCandidate/src/classes_def.xml
@@ -28,9 +28,6 @@
     <!-- <field name="fixed_" transient="true"/> -->
   </class>
 
-  <class name="std::pair<reco::isodeposit::Direction::Distance,float>"/>
-  <class name="std::map<reco::isodeposit::Direction::Distance,float>"/>
-
   <class name="std::vector<reco::io_v1::RecoChargedCandidate>"/>
   <class name="edm::Wrapper<std::vector<reco::io_v1::RecoChargedCandidate> >"/>
   <class name="edm::Ref<std::vector<reco::io_v1::RecoChargedCandidate>,reco::io_v1::RecoChargedCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::io_v1::RecoChargedCandidate>,reco::io_v1::RecoChargedCandidate> >"/>
@@ -129,6 +126,9 @@
   </class>
   <class name="std::multimap<reco::io_v1::IsoDeposit::Direction::Distance,float>"/>
 
+  <class name="std::pair<reco::isodeposit::Direction::Distance,float>"/>
+  <class name="std::map<reco::isodeposit::Direction::Distance,float>"/>
+
   <class name="edm::ValueMap<reco::io_v1::IsoDeposit>::const_iterator">
     <field name="values_" transient="true"/>
     <field name="i_" transient="true"/>