Merge pull request #43080 from jeongeun/rmRefToBase_2

Clean up and migrating edm::RefToBase to edm::Ptr (list 2 for RNTuple)
cms-sw · Nov 1, 2023 · d40536b · d40536b
2 parents d746f22 + b001ace
commit d40536b
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 262 deletions.
diff --git a/AnalysisDataFormats/EWK/interface/WMuNuCandidate.h b/AnalysisDataFormats/EWK/interface/WMuNuCandidate.h
diff --git a/AnalysisDataFormats/EWK/interface/WMuNuCandidatePtr.h b/AnalysisDataFormats/EWK/interface/WMuNuCandidatePtr.h
diff --git a/AnalysisDataFormats/EWK/src/WMuNuCandidate.cc b/AnalysisDataFormats/EWK/src/WMuNuCandidate.cc
diff --git a/AnalysisDataFormats/EWK/src/WMuNuCandidatePtr.cc b/AnalysisDataFormats/EWK/src/WMuNuCandidatePtr.cc
diff --git a/AnalysisDataFormats/EWK/src/classes.h b/AnalysisDataFormats/EWK/src/classes.h
@@ -3,8 +3,6 @@
 #include "DataFormats/Common/interface/AssociationMap.h"
 #include "DataFormats/Common/interface/Association.h"
 #include "DataFormats/Candidate/interface/CompositeCandidate.h"
-#include "AnalysisDataFormats/EWK/interface/WMuNuCandidatePtr.h"
-#include "AnalysisDataFormats/EWK/interface/WMuNuCandidate.h"
 #include "DataFormats/Candidate/interface/ShallowCloneCandidate.h"
 #include "DataFormats/Candidate/interface/ShallowClonePtrCandidate.h"
 #include "DataFormats/Candidate/interface/NamedCompositeCandidate.h"

diff --git a/AnalysisDataFormats/EWK/src/classes_def.xml b/AnalysisDataFormats/EWK/src/classes_def.xml
diff --git a/CommonTools/RecoAlgos/plugins/CaloRecHitCandidateProducer.cc b/CommonTools/RecoAlgos/plugins/CaloRecHitCandidateProducer.cc
@@ -49,7 +49,7 @@ namespace reco {
         math::RhoEtaPhiVector p(1, eta, phi);
         p *= (energy / p.r());
         CaloRecHitCandidate *c = new CaloRecHitCandidate(Candidate::LorentzVector(p.x(), p.y(), p.z(), energy));
-        c->setCaloRecHit(RefToBase<CaloRecHit>(Ref<HitCollection>(hits, idx)));
+        c->setCaloRecHit(Ptr<CaloRecHit>(hits, idx));
         cands->push_back(c);
       }
       evt.put(std::move(cands));

diff --git a/DataFormats/CaloRecHit/src/classes_def.xml b/DataFormats/CaloRecHit/src/classes_def.xml
@@ -11,7 +11,7 @@
   <class name="edm::Wrapper<std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > > >"/>
   <class name="std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > >"/>
   <class name="std::pair<unsigned long, edm::Ptr<reco::CaloCluster> >"/>
-  <class name="edm::RefToBase<CaloRecHit>"/>
+  <class name="edm::Ptr<CaloRecHit>"/>
   <class name="edm::Ptr<reco::CaloCluster>"/>
   <class name="edm::PtrVector<reco::CaloCluster>"/>
   <class name="edm::Wrapper<edm::PtrVector<reco::CaloCluster> >"/>

diff --git a/DataFormats/RecoCandidate/interface/CaloRecHitCandidate.h b/DataFormats/RecoCandidate/interface/CaloRecHitCandidate.h
@@ -10,13 +10,13 @@
  */
 #include "DataFormats/RecoCandidate/interface/RecoCandidate.h"
 #include "DataFormats/CaloRecHit/interface/CaloRecHit.h"
-#include "DataFormats/Common/interface/RefToBase.h"
+#include "DataFormats/Common/interface/Ptr.h"
 
 namespace reco {
 
   class CaloRecHitCandidate : public LeafCandidate {
   public:
-    typedef edm::RefToBase<CaloRecHit> CaloRecHitRef;
+    typedef edm::Ptr<CaloRecHit> CaloRecHitRef;
     /// default constructor
     CaloRecHitCandidate() : LeafCandidate() {}
     /// constructor from values
@@ -41,7 +41,7 @@ namespace reco {
     CaloRecHitRef caloRecHit_;
   };
   /// get default Track component
-  GET_DEFAULT_CANDIDATE_COMPONENT(CaloRecHitCandidate, edm::RefToBase<CaloRecHit>, caloRecHit);
+  GET_DEFAULT_CANDIDATE_COMPONENT(CaloRecHitCandidate, edm::Ptr<CaloRecHit>, caloRecHit);
 
 }  // namespace reco
 

diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml
@@ -25,7 +25,8 @@
    <version ClassVersion="11" checksum="2294254376"/>
    <version ClassVersion="10" checksum="4182970126"/>
   </class>
-  <class name="reco::CaloRecHitCandidate" ClassVersion="12">
+  <class name="reco::CaloRecHitCandidate" ClassVersion="13">
+   <version ClassVersion="13" checksum="1653614292"/>
    <version ClassVersion="12" checksum="878375709"/>
    <version ClassVersion="11" checksum="85197237"/>
    <version ClassVersion="10" checksum="1441861764"/>
@@ -113,7 +114,6 @@
   <class name="edm::reftobase::VectorHolder<reco::Candidate, reco::RecoEcalCandidateRefVector>" />
   <class name="edm::reftobase::RefVectorHolder<reco::RecoEcalCandidateRefVector>" />
 
-
   <class name="reco::IsoDeposit" ClassVersion="10">
    <version ClassVersion="10" checksum="2477314412"/>
   </class>