Skip to content

Commit 73afa2d

Browse files
Dr15JonesDr15Jones
committed
Renamed BranchDescription to ProductDescription
Also renamed branchDescription to productDescription
1 parent 0e3e123 commit 73afa2d

File tree

234 files changed

+881
-881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+881
-881
lines changed

‎CalibTracker/SiStripCommon/plugins/ShallowTree.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ShallowTree::ShallowTree(const edm::ParameterSet& iConfig) {
4444

4545
std::set<std::string> branchnames;
4646
callWhenNewProductsRegistered(
47-
[productSelectorRules, branchnames, leafmap, this](edm::BranchDescription const& selection) mutable {
47+
[productSelectorRules, branchnames, leafmap, this](edm::ProductDescription const& selection) mutable {
4848
if (productSelectorRules.select(selection)) {
4949
//Check for duplicate branch names
5050
if (branchnames.find(selection.productInstanceName()) != branchnames.end()) {
@@ -183,7 +183,7 @@ void ShallowTree::TypedBranchConnector<T>::connect(const edm::Event& iEvent) {
183183
}
184184

185185
template <class T>
186-
ShallowTree::TypedBranchConnector<T>::TypedBranchConnector(edm::BranchDescription const* desc,
186+
ShallowTree::TypedBranchConnector<T>::TypedBranchConnector(edm::ProductDescription const* desc,
187187
std::string t,
188188
TTree* tree)
189189
: ml_(desc->moduleLabel()), pin_(desc->productInstanceName()) {

‎CalibTracker/SiStripCommon/plugins/ShallowTree.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ShallowTree : public edm::one::EDAnalyzer<edm::one::SharedResources> {
3636
void analyze(const edm::Event&, const edm::EventSetup&) override;
3737

3838
template <class T>
39-
void eat(edm::BranchDescription const& desc) {
39+
void eat(edm::ProductDescription const& desc) {
4040
consumes<T>(edm::InputTag(desc.moduleLabel(), desc.productInstanceName()));
4141
}
4242

@@ -55,7 +55,7 @@ class ShallowTree : public edm::one::EDAnalyzer<edm::one::SharedResources> {
5555
T* object_ptr_;
5656

5757
public:
58-
TypedBranchConnector(edm::BranchDescription const*, std::string, TTree*);
58+
TypedBranchConnector(edm::ProductDescription const*, std::string, TTree*);
5959
void connect(const edm::Event&) override;
6060
};
6161

‎DQMServices/Components/plugins/DQMFileSaver.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ DQMFileSaver::DQMFileSaver(const edm::ParameterSet &ps)
156156
// Abuse ProcessMatch as a "match all".
157157
jobmegetter_(edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InProcess)),
158158
runmegetter_(edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun)) {
159-
callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
159+
callWhenNewProductsRegistered([this](edm::ProductDescription const &bd) {
160160
this->jobmegetter_(bd);
161161
this->runmegetter_(bd);
162162
});

‎DQMServices/Components/plugins/MEtoEDMConverter.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ MEtoEDMConverter::MEtoEDMConverter(const edm::ParameterSet& iPSet) : fName(""),
164164

165165
lumigetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InLumi);
166166
rungetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun);
167-
callWhenNewProductsRegistered([this](edm::BranchDescription const& bd) {
167+
callWhenNewProductsRegistered([this](edm::ProductDescription const& bd) {
168168
this->lumigetter_(bd);
169169
this->rungetter_(bd);
170170
});

‎DQMServices/Core/interface/DQMEDHarvester.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ namespace edm {
2626
}
2727
}
2828

29-
bool operator()(edm::BranchDescription const &branchDescription) {
29+
bool operator()(edm::ProductDescription const &productDescription) {
3030
for (auto &m : matchers_) {
31-
if (m(branchDescription)) {
31+
if (m(productDescription)) {
3232
return true;
3333
}
3434
}
@@ -88,7 +88,7 @@ class DQMEDHarvester
8888
jobmegetter_ = edm::GetterOfProducts<DQMToken>(edm::VInputTagMatch(inputtags), this, edm::InProcess);
8989
runmegetter_ = edm::GetterOfProducts<DQMToken>(edm::VInputTagMatch(inputtags), this, edm::InRun);
9090
lumimegetter_ = edm::GetterOfProducts<DQMToken>(edm::VInputTagMatch(inputtags), this, edm::InLumi);
91-
callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
91+
callWhenNewProductsRegistered([this](edm::ProductDescription const &bd) {
9292
jobmegetter_(bd);
9393
runmegetter_(bd);
9494
lumimegetter_(bd);

‎DQMServices/FileIO/plugins/DQMFileSaverBase.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DQMFileSaverBase::DQMFileSaverBase(const edm::ParameterSet &ps) {
4747
// This makes sure a file saver runs in a very end
4848
lumigetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InLumi);
4949
rungetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun);
50-
callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
50+
callWhenNewProductsRegistered([this](edm::ProductDescription const &bd) {
5151
this->lumigetter_(bd);
5252
this->rungetter_(bd);
5353
});

‎DQMServices/FwkIO/plugins/DQMRootOutputModule.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ DQMRootOutputModule::DQMRootOutputModule(edm::ParameterSet const& pset)
309309
// DQM module labels.
310310
// This is needed to support unscheduled DQM modules now that
311311
// non-consumed EDProducers are deleted from the job at beginJob.
312-
callWhenNewProductsRegistered([this](edm::BranchDescription const& bd) {
312+
callWhenNewProductsRegistered([this](edm::ProductDescription const& bd) {
313313
m_getterOfProductsLumi(bd);
314314
m_getterOfProductsRun(bd);
315315
});

‎DataFormats/Common/doc/Common_edm.doc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Commonly used EDM classes.
1212

1313
\subsection interface Public interface
14-
- edm::BranchDescription:
14+
- edm::ProductDescription:
1515
- edm::BranchEntryDescription
1616
- edm::BranchKey:
1717
- edm::ConditionsID:

‎DataFormats/Common/interface/ProductData.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ is the storage unit of such information.
1313
#include <memory>
1414

1515
namespace edm {
16-
class BranchDescription;
16+
class ProductDescription;
1717
class MergeableRunProductMetadataBase;
1818
class WrapperBase;
1919

2020
class ProductData {
2121
public:
2222
ProductData();
2323

24-
explicit ProductData(std::shared_ptr<BranchDescription const> bd);
24+
explicit ProductData(std::shared_ptr<ProductDescription const> bd);
2525

2626
// For use by FWLite
2727
ProductData(WrapperBase* product, Provenance const& prov);
2828

29-
std::shared_ptr<BranchDescription const> const& branchDescription() const {
30-
return prov_.constBranchDescriptionPtr();
29+
std::shared_ptr<ProductDescription const> const& productDescription() const {
30+
return prov_.constProductDescriptionPtr();
3131
}
3232

3333
Provenance const& provenance() const { return prov_; }
@@ -47,7 +47,7 @@ namespace edm {
4747
void unsafe_setWrapper(std::unique_ptr<WrapperBase> iValue) const;
4848
void unsafe_setWrapper(std::shared_ptr<WrapperBase const> iValue) const; // for SwitchProducer
4949

50-
void resetBranchDescription(std::shared_ptr<BranchDescription const> bd);
50+
void resetProductDescription(std::shared_ptr<ProductDescription const> bd);
5151

5252
void resetProductData() { wrapper_.reset(); }
5353

‎DataFormats/Common/interface/setIsMergeable.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
// Class : setIsMergeable
77
//
88
/*
9-
Description: Should be called only after the BranchDescription::init
9+
Description: Should be called only after the ProductDescription::init
1010
function has been called either directly or through
11-
the BranchDescription constructor.
11+
the ProductDescription constructor.
1212
1313
Helper function used to set the isMergeable data member
14-
in BranchDescription. It would be much more convenient
15-
to have been able to put this inside the BranchDescription
14+
in ProductDescription. It would be much more convenient
15+
to have been able to put this inside the ProductDescription
1616
class itself in the init function, but the WrapperBase
1717
class in package DataFormats/Common is needed to implement
1818
this and that cannot be used in package DataFormats/Provenance
1919
because it would create a circular dependency.
2020
21-
Anything creating a BranchDescription or reading one from
21+
Anything creating a ProductDescription or reading one from
2222
a ROOT file will need to call this directly if they need
2323
the isMergeable data member to be set properly. Note that
2424
the isMergeable data member will default to false so if
@@ -32,9 +32,9 @@
3232

3333
namespace edm {
3434

35-
class BranchDescription;
35+
class ProductDescription;
3636

37-
void setIsMergeable(BranchDescription&);
37+
void setIsMergeable(ProductDescription&);
3838
} // namespace edm
3939

4040
#endif

0 commit comments

Comments
 (0)