Skip to content

Commit

Permalink
changes from review comments and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Dr15Jones committed Jan 16, 2025
1 parent d5db61e commit 7b12dde
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
5 changes: 2 additions & 3 deletions FWCore/Framework/src/DroppedDataProductResolver.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@

/*----------------------------------------------------------------------
ProductResolver: Class to handle access to a WrapperBase and its related information.
DroppedDataProductResolver: Handles case of a DataProduct which was dropped on output
[The class was formerly called Group and later ProductHolder]
----------------------------------------------------------------------*/

#include "FWCore/Framework/interface/ProductResolverBase.h"
Expand All @@ -14,7 +13,7 @@ namespace edm {
class DroppedDataProductResolver : public ProductResolverBase {
public:
DroppedDataProductResolver(std::shared_ptr<BranchDescription const> bd)
: ProductResolverBase(), m_provenance(bd, {}) {}
: ProductResolverBase(), m_provenance(std::move(bd), {}) {}

void connectTo(ProductResolverBase const&, Principal const*) final {}

Expand Down
15 changes: 10 additions & 5 deletions FWCore/Integration/plugins/TestFindProduct.cc
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,20 @@ namespace edmtest {

const std::vector<edm::InputTag> emptyTagVector;

ps.addUntracked<std::vector<edm::InputTag>>("inputTags", emptyTagVector)->setComment("Get these IntProduct data products");
ps.addUntracked<int>("expectedSum", 0)->setComment("The sum of all values from data products obtained from entire job.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTags", emptyTagVector)
->setComment("Get these IntProduct data products");
ps.addUntracked<int>("expectedSum", 0)
->setComment("The sum of all values from data products obtained from entire job.");
ps.addUntracked<int>("expectedCache", 0)->setComment("Check value of ProcessBlock caches.");
ps.addUntracked<bool>("getByTokenFirst", false)->setComment("Call getByToken before calling getByLabel");
ps.addUntracked<bool>("runProducerParameterCheck", false);
ps.addUntracked<bool>("testGetterOfProducts", false);
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsNotFound", emptyTagVector)->setComment("Data products which should be missing from the job.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsView", emptyTagVector)->setComment("Data products to get via View<int>.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsUInt64", emptyTagVector)->setComment("Get these UInt64Product data products.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsNotFound", emptyTagVector)
->setComment("Data products which should be missing from the job.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsView", emptyTagVector)
->setComment("Data products to get via View<int>.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsUInt64", emptyTagVector)
->setComment("Get these UInt64Product data products.");
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsEndLumi", emptyTagVector);
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsEndRun", emptyTagVector);
ps.addUntracked<std::vector<edm::InputTag>>("inputTagsBeginProcessBlock", emptyTagVector);
Expand Down

0 comments on commit 7b12dde

Please sign in to comment.