Renamed BranchDescription to ProductDescription

Also renamed branchDescription to productDescription

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

@@ -13,21 +13,21 @@ is the storage unit of such information.
 #include <memory>
 
 namespace edm {
-  class BranchDescription;
+  class ProductDescription;
   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
@@ -32,9 +32,9 @@
 
 namespace edm {
 
-  class BranchDescription;
+  class ProductDescription;
 
-  void setIsMergeable(BranchDescription&);
+  void setIsMergeable(ProductDescription&);
 }  // namespace edm
 
 #endif

DataFormats/Common/src/ProductData.cc

@@ -11,14 +11,14 @@
 namespace edm {
   ProductData::ProductData() : wrapper_(), prov_() {}
 
-  ProductData::ProductData(std::shared_ptr<BranchDescription const> bd) : wrapper_(), prov_(bd, ProductID()) {}
+  ProductData::ProductData(std::shared_ptr<ProductDescription const> bd) : wrapper_(), prov_(bd, ProductID()) {}
 
   // For use by FWLite
   ProductData::ProductData(WrapperBase* product, Provenance const& prov)
       : wrapper_(product, do_nothing_deleter()), prov_(prov) {}
 
-  void ProductData::resetBranchDescription(std::shared_ptr<BranchDescription const> bd) {
-    prov_.setBranchDescription(bd);
+  void ProductData::resetProductDescription(std::shared_ptr<ProductDescription const> bd) {
+    prov_.setProductDescription(bd);
   }
 
   void ProductData::setWrapper(std::unique_ptr<WrapperBase> iValue) { wrapper_ = std::move(iValue); }

DataFormats/Common/src/setIsMergeable.cc

@@ -2,7 +2,7 @@
 #include "DataFormats/Common/interface/setIsMergeable.h"
 
 #include "DataFormats/Common/interface/WrapperBase.h"
-#include "DataFormats/Provenance/interface/BranchDescription.h"
+#include "DataFormats/Provenance/interface/ProductDescription.h"
 #include "FWCore/Utilities/interface/BranchType.h"
 #include "FWCore/Utilities/interface/getAnyPtr.h"
 
@@ -12,7 +12,7 @@
 
 namespace edm {
 
-  void setIsMergeable(BranchDescription& desc) {
+  void setIsMergeable(ProductDescription& desc) {
     // Save some time here with the knowledge that the isMergeable
     // data member can only be true for run or lumi products.
     // It defaults to false. Also if it is true that means it

DataFormats/FWLite/interface/ChainEvent.h

@@ -33,7 +33,7 @@ namespace edm {
   class WrapperBase;
   class ProductRegistry;
   class ProcessHistory;
-  class BranchDescription;
+  class ProductDescription;
   class EDProductGetter;
   class EventAux;
   class TriggerResults;
@@ -82,7 +82,7 @@ namespace fwlite {
 
     edm::EventAuxiliary const& eventAuxiliary() const override;
 
-    std::vector<edm::BranchDescription> const& getBranchDescriptions() const;
+    std::vector<edm::ProductDescription> const& getProductDescriptions() const;
     std::vector<std::string> const& getProcessHistory() const;
     edm::ProcessHistory const& processHistory() const override;
     TFile* getTFile() const { return event_->getTFile(); }

DataFormats/FWLite/interface/DataGetterHelper.h

@@ -41,7 +41,7 @@ class TTreeCache;
 class TTree;
 
 namespace edm {
-  class BranchDescription;
+  class ProductDescription;
   class BranchID;
   class ObjectWithDict;
   class ProductID;
@@ -99,7 +99,7 @@ namespace fwlite {
 
     internal::Data& getBranchDataFor(std::type_info const&, char const*, char const*, char const*) const;
     void getBranchData(edm::EDProductGetter const*, Long64_t, internal::Data&) const;
-    bool getByBranchDescription(edm::BranchDescription const&, Long_t eventEntry, KeyToDataMap::iterator&) const;
+    bool getByProductDescription(edm::ProductDescription const&, Long_t eventEntry, KeyToDataMap::iterator&) const;
     edm::WrapperBase const* wrapperBasePtr(edm::ObjectWithDict const&) const;
     edm::ThinnedAssociation const* getThinnedAssociation(edm::BranchID const& branchID, Long_t eventEntry) const;
 

DataFormats/FWLite/interface/Event.h

@@ -69,7 +69,7 @@
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
-  class BranchDescription;
+  class ProductDescription;
   class EDProductGetter;
   class EventAux;
   class Timestamp;
@@ -173,8 +173,8 @@ namespace fwlite {
 
     edm::EventAuxiliary const& eventAuxiliary() const override;
 
-    std::vector<edm::BranchDescription> const& getBranchDescriptions() const {
-      return branchMap_.getBranchDescriptions();
+    std::vector<edm::ProductDescription> const& getProductDescriptions() const {
+      return branchMap_.getProductDescriptions();
     }
     std::vector<std::string> const& getProcessHistory() const;
     TFile* getTFile() const { return branchMap_.getFile(); }

DataFormats/FWLite/interface/LuminosityBlock.h

@@ -39,7 +39,7 @@
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
-  class BranchDescription;
+  class ProductDescription;
   class EDProductGetter;
   class LuminosityBlockAux;
   class Timestamp;
@@ -89,8 +89,8 @@ namespace fwlite {
 
     edm::LuminosityBlockAuxiliary const& luminosityBlockAuxiliary() const override;
 
-    std::vector<edm::BranchDescription> const& getBranchDescriptions() const {
-      return branchMap_->getBranchDescriptions();
+    std::vector<edm::ProductDescription> const& getProductDescriptions() const {
+      return branchMap_->getProductDescriptions();
     }
 
     //       void setGetter(//Copy from Event if needed

DataFormats/FWLite/interface/MultiChainEvent.h

@@ -33,7 +33,7 @@ namespace edm {
   class WrapperBase;
   class ProductRegistry;
   class ProcessHistory;
-  class BranchDescription;
+  class ProductDescription;
   class EDProductGetter;
   class EventAux;
   class TriggerResults;
@@ -97,7 +97,7 @@ namespace fwlite {
 
     edm::EventAuxiliary const& eventAuxiliary() const override;
 
-    std::vector<edm::BranchDescription> const& getBranchDescriptions() const;
+    std::vector<edm::ProductDescription> const& getProductDescriptions() const;
     std::vector<std::string> const& getProcessHistory() const;
     edm::ProcessHistory const& processHistory() const override;
     TFile* getTFile() const { return event1_->getTFile(); }

DataFormats/FWLite/interface/Run.h

@@ -41,7 +41,7 @@
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
-  class BranchDescription;
+  class ProductDescription;
   class EDProductGetter;
   class RunAux;
   class Timestamp;
@@ -86,8 +86,8 @@ namespace fwlite {
 
     edm::RunAuxiliary const& runAuxiliary() const override;
 
-    std::vector<edm::BranchDescription> const& getBranchDescriptions() const {
-      return branchMap_->getBranchDescriptions();
+    std::vector<edm::ProductDescription> const& getProductDescriptions() const {
+      return branchMap_->getProductDescriptions();
     }
 
     //       void setGetter(//Copy from Event if needed

DataFormats/FWLite/src/ChainEvent.cc

@@ -195,8 +195,8 @@ namespace fwlite {
     return event_->getBranchNameFor(iType, iModule, iInstance, iProcess);
   }
 
-  std::vector<edm::BranchDescription> const& ChainEvent::getBranchDescriptions() const {
-    return event_->getBranchDescriptions();
+  std::vector<edm::ProductDescription> const& ChainEvent::getProductDescriptions() const {
+    return event_->getProductDescriptions();
   }
 
   std::vector<std::string> const& ChainEvent::getProcessHistory() const { return event_->getProcessHistory(); }

DataFormats/FWLite/src/DataGetterHelper.cc

@@ -155,7 +155,7 @@ namespace fwlite {
                             char const* iModuleLabel,
                             char const* iProductInstanceLabel,
                             char const* iProcessLabel) -> std::optional<edm::BranchID> {
-      for (auto const& bd : branchMap_->getBranchDescriptions()) {
+      for (auto const& bd : branchMap_->getProductDescriptions()) {
         if (bd.unwrappedTypeID() == iInfo and bd.moduleLabel() == iModuleLabel and
             bd.productInstanceName() == iProductInstanceLabel and bd.processName() == iProcessLabel) {
           return bd.branchID();
@@ -337,7 +337,7 @@ namespace fwlite {
       return true;
   }
 
-  bool DataGetterHelper::getByBranchDescription(edm::BranchDescription const& bDesc,
+  bool DataGetterHelper::getByProductDescription(edm::ProductDescription const& bDesc,
                                                 Long_t eventEntry,
                                                 KeyToDataMap::iterator& itData) const {
     if (!bDesc.branchID().isValid()) {
@@ -378,10 +378,10 @@ namespace fwlite {
     std::map<IDPair, std::shared_ptr<internal::Data>>::const_iterator itFound = idToData_.find(theID);
 
     if (itFound == idToData_.end()) {
-      edm::BranchDescription const& bDesc = branchMap_->productToBranch(iID);
+      edm::ProductDescription const& bDesc = branchMap_->productToBranch(iID);
       KeyToDataMap::iterator itData;
 
-      if (!getByBranchDescription(bDesc, eventEntry, itData)) {
+      if (!getByProductDescription(bDesc, eventEntry, itData)) {
         return nullptr;
       }
       itFound = idToData_.insert(std::make_pair(theID, itData->second)).first;
@@ -403,10 +403,10 @@ namespace fwlite {
     auto itFound = bidToData_.find(bid);
 
     if (itFound == bidToData_.end()) {
-      edm::BranchDescription const& bDesc = branchMap_->branchIDToBranch(bid);
+      edm::ProductDescription const& bDesc = branchMap_->branchIDToBranch(bid);
       KeyToDataMap::iterator itData;
 
-      if (!getByBranchDescription(bDesc, eventEntry, itData)) {
+      if (!getByProductDescription(bDesc, eventEntry, itData)) {
         return nullptr;
       }
       itFound = bidToData_.insert(std::make_pair(bid, itData->second)).first;

DataFormats/FWLite/src/EventBase.cc

@@ -25,8 +25,8 @@
 #include "FWCore/Utilities/interface/TypeID.h"
 
 static const edm::ProductID s_id;
-static edm::BranchDescription const s_branch = edm::BranchDescription(edm::BranchDescription());
-static const edm::Provenance s_prov(std::shared_ptr<edm::BranchDescription const>(&s_branch, edm::do_nothing_deleter()),
+static edm::ProductDescription const s_branch = edm::ProductDescription(edm::ProductDescription());
+static const edm::Provenance s_prov(std::shared_ptr<edm::ProductDescription const>(&s_branch, edm::do_nothing_deleter()),
                                     s_id);
 
 namespace fwlite {