Skip to content

PPS strings --> InputTag #32971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 4 commits into from
Feb 25, 2021
Merged

PPS strings --> InputTag #32971

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26b2359
Changed std::string to edm::InputTag for consistency
AndreaBellora Feb 5, 2021
1b3db7f
std::string --> edm::InputTag in PixelClusterProducer
AndreaBellora Feb 5, 2021
6e34250
Applying code quality checks
AndreaBellora Feb 23, 2021
b6b23f9
Changed label --> tag
AndreaBellora Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions RecoPPS/Local/plugins/CTPPSPixelClusterProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#include "RecoPPS/Local/interface/CTPPSPixelClusterProducer.h"

CTPPSPixelClusterProducer::CTPPSPixelClusterProducer(const edm::ParameterSet &conf)
: tokenCTPPSPixelDigi_(
consumes<edm::DetSetVector<CTPPSPixelDigi> >(edm::InputTag(conf.getParameter<std::string>("label")))),
: tokenCTPPSPixelDigi_(consumes<edm::DetSetVector<CTPPSPixelDigi> >(conf.getParameter<edm::InputTag>("label"))),
tokenCTPPSPixelAnalysisMask_(esConsumes()),
tokenGainCalib_(esConsumes()),
verbosity_(conf.getUntrackedParameter<int>("RPixVerbosity")),
Expand All @@ -17,7 +16,7 @@ CTPPSPixelClusterProducer::~CTPPSPixelClusterProducer() {}
void CTPPSPixelClusterProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
edm::ParameterSetDescription desc;
desc.addUntracked<int>("RPixVerbosity", 0);
desc.add<std::string>("label", "ctppsPixelDigis");
desc.add<edm::InputTag>("label", edm::InputTag("ctppsPixelDigis"));
desc.add<int>("SeedADCThreshold", 2);
desc.add<int>("ADCThreshold", 2);
desc.add<double>("ElectronADCGain", 135.0);
Expand Down
6 changes: 3 additions & 3 deletions RecoPPS/Local/plugins/CTPPSPixelLocalTrackProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class CTPPSPixelLocalTrackProducer : public edm::stream::EDProducer<> {
//------------------------------------------------------------------------------------------------//

CTPPSPixelLocalTrackProducer::CTPPSPixelLocalTrackProducer(const edm::ParameterSet &parameterSet) {
inputTag_ = parameterSet.getParameter<std::string>("label");
inputTag_ = parameterSet.getParameter<edm::InputTag>("label");
verbosity_ = parameterSet.getUntrackedParameter<int>("verbosity");
maxHitPerRomanPot_ = parameterSet.getParameter<int>("maxHitPerRomanPot");
maxHitPerPlane_ = parameterSet.getParameter<int>("maxHitPerPlane");
Expand Down Expand Up @@ -104,7 +104,7 @@ CTPPSPixelLocalTrackProducer::CTPPSPixelLocalTrackProducer(const edm::ParameterS
trackFinder_->setListOfPlanes(listOfAllPlanes_);
trackFinder_->initialize();

tokenCTPPSPixelRecHit_ = consumes<edm::DetSetVector<CTPPSPixelRecHit>>(edm::InputTag(inputTag_));
tokenCTPPSPixelRecHit_ = consumes<edm::DetSetVector<CTPPSPixelRecHit>>(inputTag_);
tokenCTPPSGeometry_ = esConsumes<CTPPSGeometry, VeryForwardRealGeometryRecord>();

produces<edm::DetSetVector<CTPPSPixelLocalTrack>>();
Expand All @@ -119,7 +119,7 @@ CTPPSPixelLocalTrackProducer::~CTPPSPixelLocalTrackProducer() {}
void CTPPSPixelLocalTrackProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
edm::ParameterSetDescription desc;

desc.add<std::string>("label", "ctppsPixelRecHits")
desc.add<edm::InputTag>("label", edm::InputTag("ctppsPixelRecHits"))
->setComment("label of the RecHits input for the tracking algorithm");
Copy link
Contributor

@perrotta perrotta Feb 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strictly speaking, this is not a "label" any more: perhaps "tag"?

Copy link
Contributor Author

@AndreaBellora AndreaBellora Feb 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, it would be definitely clearer to read. I'm updating it.

desc.add<std::string>("patternFinderAlgorithm", "RPixRoadFinder")->setComment("algorithm type for pattern finder");
desc.add<std::string>("trackFinderAlgorithm", "RPixPlaneCombinatoryTracking")
Expand Down