Skip to content

Commit

Permalink
Remove support for fullVector following its removal from mkFit itself
Browse files Browse the repository at this point in the history
  • Loading branch information
makortel committed Jan 15, 2021
1 parent cb1c5b0 commit aa281ea
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions RecoTracker/MkFit/plugins/MkFitProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,15 @@ MkFitProducer::MkFitProducer(edm::ParameterSet const& iConfig)
backwardFitInCMSSW_{iConfig.getParameter<bool>("backwardFitInCMSSW")},
mkFitSilent_{iConfig.getUntrackedParameter<bool>("mkFitSilent")} {
const auto build = iConfig.getParameter<std::string>("buildingRoutine");
bool isFV = false;
if (build == "bestHit") {
buildFunction_ = mkfit::runBuildingTestPlexBestHit;
} else if (build == "standard") {
buildFunction_ = mkfit::runBuildingTestPlexStandard;
} else if (build == "cloneEngine") {
buildFunction_ = mkfit::runBuildingTestPlexCloneEngine;
} else if (build == "fullVector") {
isFV = true;
buildFunction_ = mkfit::runBuildingTestPlexFV;
} else {
throw cms::Exception("Configuration") << "Invalid value for parameter 'buildingRoutine' " << build
<< ", allowed are bestHit, standard, cloneEngine, fullVector";
<< ", allowed are bestHit, standard, cloneEngine";
}

const auto seedClean = iConfig.getParameter<std::string>("seedCleaning");
Expand All @@ -86,7 +82,7 @@ MkFitProducer::MkFitProducer(edm::ParameterSet const& iConfig)
backwardFitInCMSSW_ ? mkfit::ConfigWrapper::BackwardFit::noFit : mkfit::ConfigWrapper::BackwardFit::toFirstLayer;

// TODO: what to do when we have multiple instances of MkFitProducer in a job?
mkfit::MkBuilderWrapper::populate(isFV);
mkfit::MkBuilderWrapper::populate();
mkfit::ConfigWrapper::initializeForCMSSW(seedCleanOpt, backwardFitOpt, mkFitSilent_);
mkfit::ConfigWrapper::setRemoveDuplicates(iConfig.getParameter<bool>("removeDuplicates"));
}
Expand All @@ -97,7 +93,7 @@ void MkFitProducer::fillDescriptions(edm::ConfigurationDescriptions& description
desc.add("hits", edm::InputTag("mkFitHitConverter"));
desc.add("seeds", edm::InputTag("mkFitSeedConverter"));
desc.add<std::string>("buildingRoutine", "cloneEngine")
->setComment("Valid values are: 'bestHit', 'standard', 'cloneEngine', 'fullVector'");
->setComment("Valid values are: 'bestHit', 'standard', 'cloneEngine'");
desc.add<std::string>("seedCleaning", "N2")->setComment("Valid values are: 'none', 'N2'");
desc.add("removeDuplicates", true)->setComment("Run duplicate removal within mkFit");
desc.add("backwardFitInCMSSW", false)
Expand Down

0 comments on commit aa281ea

Please sign in to comment.