Merge pull request #47190 from Dr15Jones/renameBranchDescription

Rename BranchDescription to ProductDescription

Author: cmsbuild

CalibTracker/SiStripCommon/plugins/ShallowTree.cc

@@ -44,7 +44,7 @@ ShallowTree::ShallowTree(const edm::ParameterSet& iConfig) {
 
   std::set<std::string> branchnames;
   callWhenNewProductsRegistered(
-      [productSelectorRules, branchnames, leafmap, this](edm::BranchDescription const& selection) mutable {
+      [productSelectorRules, branchnames, leafmap, this](edm::ProductDescription const& selection) mutable {
         if (productSelectorRules.select(selection)) {
           //Check for duplicate branch names
           if (branchnames.find(selection.productInstanceName()) != branchnames.end()) {
@@ -183,7 +183,7 @@ void ShallowTree::TypedBranchConnector<T>::connect(const edm::Event& iEvent) {
 }
 
 template <class T>
-ShallowTree::TypedBranchConnector<T>::TypedBranchConnector(edm::BranchDescription const* desc,
+ShallowTree::TypedBranchConnector<T>::TypedBranchConnector(edm::ProductDescription const* desc,
                                                            std::string t,
                                                            TTree* tree)
     : ml_(desc->moduleLabel()), pin_(desc->productInstanceName()) {

CalibTracker/SiStripCommon/plugins/ShallowTree.h

@@ -36,7 +36,7 @@ class ShallowTree : public edm::one::EDAnalyzer<edm::one::SharedResources> {
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
   template <class T>
-  void eat(edm::BranchDescription const& desc) {
+  void eat(edm::ProductDescription const& desc) {
     consumes<T>(edm::InputTag(desc.moduleLabel(), desc.productInstanceName()));
   }
 
@@ -55,7 +55,7 @@ class ShallowTree : public edm::one::EDAnalyzer<edm::one::SharedResources> {
     T* object_ptr_;
 
   public:
-    TypedBranchConnector(edm::BranchDescription const*, std::string, TTree*);
+    TypedBranchConnector(edm::ProductDescription const*, std::string, TTree*);
     void connect(const edm::Event&) override;
   };
 

DQMServices/Components/plugins/DQMFileSaver.cc

@@ -156,7 +156,7 @@ DQMFileSaver::DQMFileSaver(const edm::ParameterSet &ps)
       // Abuse ProcessMatch as a "match all".
       jobmegetter_(edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InProcess)),
       runmegetter_(edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun)) {
-  callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
+  callWhenNewProductsRegistered([this](edm::ProductDescription const &bd) {
     this->jobmegetter_(bd);
     this->runmegetter_(bd);
   });

DQMServices/Components/plugins/MEtoEDMConverter.cc

@@ -164,7 +164,7 @@ MEtoEDMConverter::MEtoEDMConverter(const edm::ParameterSet& iPSet) : fName(""),
 
   lumigetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InLumi);
   rungetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun);
-  callWhenNewProductsRegistered([this](edm::BranchDescription const& bd) {
+  callWhenNewProductsRegistered([this](edm::ProductDescription const& bd) {
     this->lumigetter_(bd);
     this->rungetter_(bd);
   });

DQMServices/Core/interface/DQMEDHarvester.h

@@ -26,9 +26,9 @@ namespace edm {
       }
     }
 
-    bool operator()(edm::BranchDescription const &branchDescription) {
+    bool operator()(edm::ProductDescription const &productDescription) {
       for (auto &m : matchers_) {
-        if (m(branchDescription)) {
+        if (m(productDescription)) {
           return true;
         }
       }
@@ -88,7 +88,7 @@ class DQMEDHarvester
     jobmegetter_ = edm::GetterOfProducts<DQMToken>(edm::VInputTagMatch(inputtags), this, edm::InProcess);
     runmegetter_ = edm::GetterOfProducts<DQMToken>(edm::VInputTagMatch(inputtags), this, edm::InRun);
     lumimegetter_ = edm::GetterOfProducts<DQMToken>(edm::VInputTagMatch(inputtags), this, edm::InLumi);
-    callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
+    callWhenNewProductsRegistered([this](edm::ProductDescription const &bd) {
       jobmegetter_(bd);
       runmegetter_(bd);
       lumimegetter_(bd);

DQMServices/FileIO/plugins/DQMFileSaverBase.cc

@@ -47,7 +47,7 @@ DQMFileSaverBase::DQMFileSaverBase(const edm::ParameterSet &ps) {
   // This makes sure a file saver runs in a very end
   lumigetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InLumi);
   rungetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun);
-  callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
+  callWhenNewProductsRegistered([this](edm::ProductDescription const &bd) {
     this->lumigetter_(bd);
     this->rungetter_(bd);
   });

DQMServices/FwkIO/plugins/DQMRootOutputModule.cc

@@ -309,7 +309,7 @@ DQMRootOutputModule::DQMRootOutputModule(edm::ParameterSet const& pset)
   // DQM module labels.
   // This is needed to support unscheduled DQM modules now that
   // non-consumed EDProducers are deleted from the job at beginJob.
-  callWhenNewProductsRegistered([this](edm::BranchDescription const& bd) {
+  callWhenNewProductsRegistered([this](edm::ProductDescription const& bd) {
     m_getterOfProductsLumi(bd);
     m_getterOfProductsRun(bd);
   });

DataFormats/Common/doc/Common_edm.doc

@@ -11,7 +11,7 @@
 Commonly used EDM classes.
 
 \subsection interface Public interface
-- edm::BranchDescription:
+- edm::ProductDescription:
 - edm::BranchEntryDescription
 - edm::BranchKey:
 - edm::ConditionsID:

DataFormats/Common/interface/ProductData.h

@@ -9,25 +9,25 @@ is the storage unit of such information.
 ----------------------------------------------------------------------*/
 
 #include "DataFormats/Provenance/interface/Provenance.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 #include <memory>
 
 namespace edm {
-  class BranchDescription;
   class MergeableRunProductMetadataBase;
   class WrapperBase;
 
   class ProductData {
   public:
     ProductData();
 
-    explicit ProductData(std::shared_ptr<BranchDescription const> bd);
+    explicit ProductData(std::shared_ptr<ProductDescription const> bd);
 
     // For use by FWLite
     ProductData(WrapperBase* product, Provenance const& prov);
 
-    std::shared_ptr<BranchDescription const> const& branchDescription() const {
-      return prov_.constBranchDescriptionPtr();
+    std::shared_ptr<ProductDescription const> const& productDescription() const {
+      return prov_.constProductDescriptionPtr();
     }
 
     Provenance const& provenance() const { return prov_; }
@@ -47,7 +47,7 @@ namespace edm {
     void unsafe_setWrapper(std::unique_ptr<WrapperBase> iValue) const;
     void unsafe_setWrapper(std::shared_ptr<WrapperBase const> iValue) const;  // for SwitchProducer
 
-    void resetBranchDescription(std::shared_ptr<BranchDescription const> bd);
+    void resetProductDescription(std::shared_ptr<ProductDescription const> bd);
 
     void resetProductData() { wrapper_.reset(); }
 

DataFormats/Common/interface/setIsMergeable.h

@@ -6,19 +6,19 @@
 // Class  :     setIsMergeable
 //
 /*
- Description: Should be called only after the BranchDescription::init
+ Description: Should be called only after the ProductDescription::init
               function has been called either directly or through
-              the BranchDescription constructor.
+              the ProductDescription constructor.
 
               Helper function used to set the isMergeable data member
-              in BranchDescription. It would be much more convenient
-              to have been able to put this inside the BranchDescription
+              in ProductDescription. It would be much more convenient
+              to have been able to put this inside the ProductDescription
               class itself in the init function, but the WrapperBase
               class in package DataFormats/Common is needed to implement
               this and that cannot be used in package DataFormats/Provenance
               because it would create a circular dependency.
 
-              Anything creating a BranchDescription or reading one from
+              Anything creating a ProductDescription or reading one from
               a ROOT file will need to call this directly if they need
               the isMergeable data member to be set properly. Note that
               the isMergeable data member will default to false so if
@@ -29,12 +29,10 @@
 // Original Author:  W. David Dagenhart
 //         Created:  21 June 2018
 //
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 
 namespace edm {
-
-  class BranchDescription;
-
-  void setIsMergeable(BranchDescription&);
+  void setIsMergeable(ProductDescription&);
 }  // namespace edm
 
 #endif