From d9f5a9ad5f07b9c68a24f16a60532f32a3e370e9 Mon Sep 17 00:00:00 2001
From: Jeongeun Lee <jeongeun.lee@cern.ch>
Date: Thu, 19 Oct 2023 06:32:32 +0200
Subject: [PATCH 1/2] remove deprecated edm::RefToBase

---
 DataFormats/BTauReco/src/classes_def.xml                  | 1 -
 DataFormats/Candidate/interface/CompositeCandidateFwd.h   | 8 ++++----
 .../Candidate/interface/NamedCompositeCandidateFwd.h      | 4 ++--
 .../Candidate/interface/VertexCompositeCandidateFwd.h     | 8 ++++----
 .../Candidate/interface/VertexCompositePtrCandidateFwd.h  | 4 ++--
 DataFormats/EgammaCandidates/src/classes_def.xml          | 6 ------
 DataFormats/EgammaReco/src/classes_def.xml                | 1 -
 DataFormats/MuonSeed/src/classes_def.xml                  | 2 --
 DataFormats/ParticleFlowReco/src/classes_def_1.xml        | 1 -
 DataFormats/TauReco/src/classes_def_2.xml                 | 4 ----
 SimDataFormats/TrackingHit/interface/PSimHitContainer.h   | 3 ---
 SimDataFormats/TrackingHit/src/classes_def.xml            | 2 --
 12 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml
index 148a0bda78d20..45749f7675ba8 100644
--- a/DataFormats/BTauReco/src/classes_def.xml
+++ b/DataFormats/BTauReco/src/classes_def.xml
@@ -302,7 +302,6 @@
   <class name="std::vector<Measurement1D>"/>
 
   <!-- RefToBase stuff -->
-  <class name="edm::RefToBase<reco::BaseTagInfo>" />
   <class name="edm::reftobase::BaseHolder<reco::BaseTagInfo>" />
   <class name="edm::reftobase::IndirectHolder<reco::BaseTagInfo>" />
   <class name="edm::reftobase::Holder<reco::BaseTagInfo, reco::BaseTagInfoRef>" />
diff --git a/DataFormats/Candidate/interface/CompositeCandidateFwd.h b/DataFormats/Candidate/interface/CompositeCandidateFwd.h
index 2d6ac11c53476..71e9c7c1f21fb 100644
--- a/DataFormats/Candidate/interface/CompositeCandidateFwd.h
+++ b/DataFormats/Candidate/interface/CompositeCandidateFwd.h
@@ -21,12 +21,12 @@ namespace reco {
   typedef edm::View<CompositeCandidate> CompositeCandidateView;
   /// persistent reference to an object in a collection of Candidate objects
   typedef edm::Ref<CompositeCandidateCollection> CompositeCandidateRef;
-  /// persistent reference to an object in a collection of Candidate objects
-  typedef edm::RefToBase<CompositeCandidate> CompositeCandidateBaseRef;
+  //  /// persistent reference to an object in a collection of Candidate objects
+  //  typedef edm::RefToBase<CompositeCandidate> CompositeCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<CompositeCandidateCollection> CompositeCandidateRefVector;
-  /// vector of references to objects in the same collection of Candidate objects via base type
-  typedef edm::RefToBaseVector<CompositeCandidate> CompositeCandidateBaseRefVector;
+  //  /// vector of references to objects in the same collection of Candidate objects via base type
+  //  typedef edm::RefToBaseVector<CompositeCandidate> CompositeCandidateBaseRefVector;
   /// reference to a collection of Candidate objects
   typedef edm::RefProd<CompositeCandidateCollection> CompositeCandidateRefProd;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h b/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
index 8eb21ac6c7b54..bb2e6c5ccdc33 100644
--- a/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
+++ b/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
@@ -25,8 +25,8 @@ namespace reco {
   typedef edm::RefToBase<NamedCompositeCandidate> NamedCompositeCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<NamedCompositeCandidateCollection> NamedCompositeCandidateRefVector;
-  /// vector of references to objects in the same collection of Candidate objects via base type
-  typedef edm::RefToBaseVector<NamedCompositeCandidate> NamedCompositeCandidateBaseRefVector;
+  //  /// vector of references to objects in the same collection of Candidate objects via base type
+  //  typedef edm::RefToBaseVector<NamedCompositeCandidate> NamedCompositeCandidateBaseRefVector;
   /// reference to a collection of Candidate objects
   typedef edm::RefProd<NamedCompositeCandidateCollection> NamedCompositeCandidateRefProd;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h b/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
index b02383e860608..f4d4a5bcefc8d 100644
--- a/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
+++ b/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
@@ -21,12 +21,12 @@ namespace reco {
   typedef edm::View<VertexCompositeCandidate> VertexCompositeCandidateView;
   /// persistent reference to an object in a collection of Candidate objects
   typedef edm::Ref<VertexCompositeCandidateCollection> VertexCompositeCandidateRef;
-  /// persistent reference to an object in a collection of Candidate objects
-  typedef edm::RefToBase<VertexCompositeCandidate> VertexCompositeCandidateBaseRef;
+  //  /// persistent reference to an object in a collection of Candidate objects
+  //  typedef edm::RefToBase<VertexCompositeCandidate> VertexCompositeCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<VertexCompositeCandidateCollection> VertexCompositeCandidateRefVector;
-  /// vector of references to objects in the same collection of Candidate objects via base type
-  typedef edm::RefToBaseVector<VertexCompositeCandidate> VertexCompositeCandidateBaseRefVector;
+  //  /// vector of references to objects in the same collection of Candidate objects via base type
+  //  typedef edm::RefToBaseVector<VertexCompositeCandidate> VertexCompositeCandidateBaseRefVector;
   /// reference to a collection of Candidate objects
   typedef edm::RefProd<VertexCompositeCandidateCollection> VertexCompositeCandidateRefProd;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h b/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
index 1aace494420b3..8c5dd01cc04ca 100644
--- a/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
+++ b/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
@@ -21,8 +21,8 @@ namespace reco {
   typedef edm::View<VertexCompositePtrCandidate> VertexCompositePtrCandidateView;
   /// persistent reference to an object in a collection of Candidate objects
   typedef edm::Ref<VertexCompositePtrCandidateCollection> VertexCompositePtrCandidateRef;
-  /// persistent reference to an object in a collection of Candidate objects
-  typedef edm::RefToBase<VertexCompositePtrCandidate> VertexCompositePtrCandidateBaseRef;
+  //  /// persistent reference to an object in a collection of Candidate objects
+  //  typedef edm::RefToBase<VertexCompositePtrCandidate> VertexCompositePtrCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<VertexCompositePtrCandidateCollection> VertexCompositePtrCandidateRefVector;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/EgammaCandidates/src/classes_def.xml b/DataFormats/EgammaCandidates/src/classes_def.xml
index 20137d71f63d4..b4f32e71cdae3 100644
--- a/DataFormats/EgammaCandidates/src/classes_def.xml
+++ b/DataFormats/EgammaCandidates/src/classes_def.xml
@@ -81,11 +81,8 @@
   
   <class name="std::vector<reco::PhotonCore>"/>
   <class name="edm::reftobase::BaseHolder<reco::PhotonCore>"/>
-  <class name="edm::RefToBase<reco::PhotonCore>"/>
   <class name="edm::reftobase::IndirectHolder<reco::PhotonCore>" />
   <class name="edm::RefToBaseProd<reco::PhotonCore>" />
-  <class name="edm::RefToBaseVector<reco::PhotonCore>" />
-  <class name="edm::Wrapper<edm::RefToBaseVector<reco::PhotonCore> >" />
   <class name="edm::reftobase::BaseVectorHolder<reco::PhotonCore>" />
   <class name="edm::Wrapper<std::vector<reco::PhotonCore> >"/>
   <class name="edm::Ref<std::vector<reco::PhotonCore>,reco::PhotonCore,edm::refhelper::FindUsingAdvance<std::vector<reco::PhotonCore>,reco::PhotonCore> >"/>
@@ -144,11 +141,8 @@
 
   <class name="std::vector<reco::GsfElectronCore>"/>
   <class name="edm::reftobase::BaseHolder<reco::GsfElectronCore>"/>
-  <class name="edm::RefToBase<reco::GsfElectronCore>"/>
   <class name="edm::reftobase::IndirectHolder<reco::GsfElectronCore>" />
   <class name="edm::RefToBaseProd<reco::GsfElectronCore>" />
-  <class name="edm::RefToBaseVector<reco::GsfElectronCore>" />
-  <class name="edm::Wrapper<edm::RefToBaseVector<reco::GsfElectronCore> >" />
   <class name="edm::reftobase::BaseVectorHolder<reco::GsfElectronCore>" />
   <class name="edm::Wrapper<std::vector<reco::GsfElectronCore> >"/>
   <class name="edm::Ref<std::vector<reco::GsfElectronCore>,reco::GsfElectronCore,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfElectronCore>,reco::GsfElectronCore> >"/>
diff --git a/DataFormats/EgammaReco/src/classes_def.xml b/DataFormats/EgammaReco/src/classes_def.xml
index 41b86c005dfb1..560917fe0521e 100644
--- a/DataFormats/EgammaReco/src/classes_def.xml
+++ b/DataFormats/EgammaReco/src/classes_def.xml
@@ -107,7 +107,6 @@
   <class name="edm::Wrapper<std::vector<reco::ElectronSeed> >"/>
   <class name="edm::RefVector<std::vector<reco::ElectronSeed>,reco::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronSeed>,reco::ElectronSeed> >"/>
   <class name="edm::Wrapper<edm::RefVector<std::vector<reco::ElectronSeed>,reco::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronSeed>,reco::ElectronSeed> > >"/>
-  <class name="edm::RefToBase<reco::ElectronSeed>"/>
   <class name="edm::reftobase::BaseHolder<reco::ElectronSeed>" />
   <class name="edm::reftobase::IndirectHolder<reco::ElectronSeed>" />
   <class name="edm::reftobase::RefHolder<edm::Ref<std::vector<reco::ElectronSeed>,reco::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronSeed>,reco::ElectronSeed> > >"/>
diff --git a/DataFormats/MuonSeed/src/classes_def.xml b/DataFormats/MuonSeed/src/classes_def.xml
index 2c1b36fe9fd23..337ad474d4ee1 100644
--- a/DataFormats/MuonSeed/src/classes_def.xml
+++ b/DataFormats/MuonSeed/src/classes_def.xml
@@ -4,7 +4,6 @@
        <version ClassVersion="11" checksum="541533207"/>
        <version ClassVersion="10" checksum="2502730614"/>
       </class>
-      <class name="edm::RefToBase<L2MuonTrajectorySeed>"/>
       <class name="edm::reftobase::BaseHolder<L2MuonTrajectorySeed>" />
       <class name="edm::reftobase::IndirectHolder<L2MuonTrajectorySeed>" />
     
@@ -34,7 +33,6 @@
        <version ClassVersion="11" checksum="981061883"/>
        <version ClassVersion="10" checksum="2200485484"/>
       </class>
-      <class name="edm::RefToBase<L3MuonTrajectorySeed>"/>
       <class name="edm::reftobase::BaseHolder<L3MuonTrajectorySeed>" />
       <class name="edm::reftobase::IndirectHolder<L3MuonTrajectorySeed>" />
     
diff --git a/DataFormats/ParticleFlowReco/src/classes_def_1.xml b/DataFormats/ParticleFlowReco/src/classes_def_1.xml
index 58b21e59e3c35..01e4066163830 100644
--- a/DataFormats/ParticleFlowReco/src/classes_def_1.xml
+++ b/DataFormats/ParticleFlowReco/src/classes_def_1.xml
@@ -53,7 +53,6 @@
   <class name="edm::Wrapper<std::vector<reco::ConvBremSeed> >"/>
   <class name="edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/>
   <class name="edm::Wrapper<edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
-  <class name="edm::RefToBase<reco::ConvBremSeed>"/>
   <class name="edm::reftobase::BaseHolder<reco::ConvBremSeed>" />
   <class name="edm::reftobase::RefHolder<edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
   <class name="edm::reftobase::Holder<reco::ConvBremSeed,edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
diff --git a/DataFormats/TauReco/src/classes_def_2.xml b/DataFormats/TauReco/src/classes_def_2.xml
index 1e5ca39918ec8..2e585c918b3b0 100644
--- a/DataFormats/TauReco/src/classes_def_2.xml
+++ b/DataFormats/TauReco/src/classes_def_2.xml
@@ -41,12 +41,8 @@
   <class name="edm::RefToBaseProd<reco::PFTau>" >
      <!-- <field name="view_" transient="true" /> -->
   </class>
-  <class name="edm::RefToBase<reco::PFTau>" />
   <class name="edm::reftobase::BaseHolder<reco::PFTau>" />
   <class name="edm::reftobase::IndirectHolder<reco::PFTau>" />
-    <!---<class name="edm::reftobase::Holder<reco::PFTau,edm::RefToBase<reco::PFTau> > "/>-->
-  <class name="edm::RefToBaseVector<reco::PFTau>"/>
-  <class name="edm::Wrapper<edm::RefToBaseVector<reco::PFTau> >"/>
   <class name="edm::reftobase::BaseVectorHolder<reco::PFTau>"/>
   <class name="edm::reftobase::Holder<reco::PFTau, reco::PFTauRef>" />
   <class name="edm::reftobase::RefHolder<reco::PFTauRef>" />
diff --git a/SimDataFormats/TrackingHit/interface/PSimHitContainer.h b/SimDataFormats/TrackingHit/interface/PSimHitContainer.h
index 1ba4a29aadc08..1ccc8ac5ab625 100644
--- a/SimDataFormats/TrackingHit/interface/PSimHitContainer.h
+++ b/SimDataFormats/TrackingHit/interface/PSimHitContainer.h
@@ -14,9 +14,6 @@ namespace edm {
 typedef edm::Ref<edm::PSimHitContainer> TrackPSimHitRef;
 typedef edm::RefProd<edm::PSimHitContainer> TrackPSimHitRefProd;
 
-typedef std::vector<edm::RefToBase<PSimHit> > TrackPSimHitRefToBaseVector;
-typedef edm::RefToBase<PSimHit> TrackPSimHitRefToBase;
-typedef std::vector<edm::RefToBase<PSimHit> > TrackPSimHitRefToBaseVector;
 typedef edm::reftobase::Holder<PSimHit, TrackPSimHitRef> TrackPSimHitRefToBaseHolder;
 
 #endif
diff --git a/SimDataFormats/TrackingHit/src/classes_def.xml b/SimDataFormats/TrackingHit/src/classes_def.xml
index 7f35f2eb15775..9c815102df851 100644
--- a/SimDataFormats/TrackingHit/src/classes_def.xml
+++ b/SimDataFormats/TrackingHit/src/classes_def.xml
@@ -9,8 +9,6 @@
   <class name="edm::Ref<std::vector<PSimHit>,PSimHit,edm::refhelper::FindUsingAdvance<std::vector<PSimHit>,PSimHit> >"/>
 
   <class name="edm::reftobase::BaseHolder<PSimHit>"/>
-  <class name="edm::RefToBase<PSimHit>"/>
-  <class name="std::vector<edm::RefToBase<PSimHit> >"/>
   <class name="edm::reftobase::Holder<PSimHit,edm::Ref<std::vector<PSimHit>,PSimHit,edm::refhelper::FindUsingAdvance<std::vector<PSimHit>,PSimHit> > >"/>
 
 </lcgdict>

From 6af155e09336038e48ac5b3611b72eba9a28f681 Mon Sep 17 00:00:00 2001
From: Jeongeun Lee <jeongeun.lee@cern.ch>
Date: Thu, 19 Oct 2023 06:51:02 +0200
Subject: [PATCH 2/2] minor fix

---
 DataFormats/Candidate/interface/CompositeCandidateFwd.h       | 4 ----
 DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h  | 2 --
 DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h | 4 ----
 .../Candidate/interface/VertexCompositePtrCandidateFwd.h      | 2 --
 4 files changed, 12 deletions(-)

diff --git a/DataFormats/Candidate/interface/CompositeCandidateFwd.h b/DataFormats/Candidate/interface/CompositeCandidateFwd.h
index 71e9c7c1f21fb..f97279e182f54 100644
--- a/DataFormats/Candidate/interface/CompositeCandidateFwd.h
+++ b/DataFormats/Candidate/interface/CompositeCandidateFwd.h
@@ -21,12 +21,8 @@ namespace reco {
   typedef edm::View<CompositeCandidate> CompositeCandidateView;
   /// persistent reference to an object in a collection of Candidate objects
   typedef edm::Ref<CompositeCandidateCollection> CompositeCandidateRef;
-  //  /// persistent reference to an object in a collection of Candidate objects
-  //  typedef edm::RefToBase<CompositeCandidate> CompositeCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<CompositeCandidateCollection> CompositeCandidateRefVector;
-  //  /// vector of references to objects in the same collection of Candidate objects via base type
-  //  typedef edm::RefToBaseVector<CompositeCandidate> CompositeCandidateBaseRefVector;
   /// reference to a collection of Candidate objects
   typedef edm::RefProd<CompositeCandidateCollection> CompositeCandidateRefProd;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h b/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
index bb2e6c5ccdc33..30ec92ee8ab6b 100644
--- a/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
+++ b/DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
@@ -25,8 +25,6 @@ namespace reco {
   typedef edm::RefToBase<NamedCompositeCandidate> NamedCompositeCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<NamedCompositeCandidateCollection> NamedCompositeCandidateRefVector;
-  //  /// vector of references to objects in the same collection of Candidate objects via base type
-  //  typedef edm::RefToBaseVector<NamedCompositeCandidate> NamedCompositeCandidateBaseRefVector;
   /// reference to a collection of Candidate objects
   typedef edm::RefProd<NamedCompositeCandidateCollection> NamedCompositeCandidateRefProd;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h b/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
index f4d4a5bcefc8d..df47f0975725d 100644
--- a/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
+++ b/DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
@@ -21,12 +21,8 @@ namespace reco {
   typedef edm::View<VertexCompositeCandidate> VertexCompositeCandidateView;
   /// persistent reference to an object in a collection of Candidate objects
   typedef edm::Ref<VertexCompositeCandidateCollection> VertexCompositeCandidateRef;
-  //  /// persistent reference to an object in a collection of Candidate objects
-  //  typedef edm::RefToBase<VertexCompositeCandidate> VertexCompositeCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<VertexCompositeCandidateCollection> VertexCompositeCandidateRefVector;
-  //  /// vector of references to objects in the same collection of Candidate objects via base type
-  //  typedef edm::RefToBaseVector<VertexCompositeCandidate> VertexCompositeCandidateBaseRefVector;
   /// reference to a collection of Candidate objects
   typedef edm::RefProd<VertexCompositeCandidateCollection> VertexCompositeCandidateRefProd;
   /// vector of references to objects in the same collection of Candidate objects via base type
diff --git a/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h b/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
index 8c5dd01cc04ca..dbe7f45239147 100644
--- a/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
+++ b/DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
@@ -21,8 +21,6 @@ namespace reco {
   typedef edm::View<VertexCompositePtrCandidate> VertexCompositePtrCandidateView;
   /// persistent reference to an object in a collection of Candidate objects
   typedef edm::Ref<VertexCompositePtrCandidateCollection> VertexCompositePtrCandidateRef;
-  //  /// persistent reference to an object in a collection of Candidate objects
-  //  typedef edm::RefToBase<VertexCompositePtrCandidate> VertexCompositePtrCandidateBaseRef;
   /// vector of references to objects in the same  collection of Candidate objects
   typedef edm::RefVector<VertexCompositePtrCandidateCollection> VertexCompositePtrCandidateRefVector;
   /// vector of references to objects in the same collection of Candidate objects via base type