From aa281ea688012466ee1326e7606bc04dec2ac493 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Thu, 14 Jan 2021 11:58:36 -0800 Subject: [PATCH] Remove support for fullVector following its removal from mkFit itself --- RecoTracker/MkFit/plugins/MkFitProducer.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/RecoTracker/MkFit/plugins/MkFitProducer.cc b/RecoTracker/MkFit/plugins/MkFitProducer.cc index 5d00f45ba74f1..e2ea04a43bee1 100644 --- a/RecoTracker/MkFit/plugins/MkFitProducer.cc +++ b/RecoTracker/MkFit/plugins/MkFitProducer.cc @@ -56,19 +56,15 @@ MkFitProducer::MkFitProducer(edm::ParameterSet const& iConfig) backwardFitInCMSSW_{iConfig.getParameter("backwardFitInCMSSW")}, mkFitSilent_{iConfig.getUntrackedParameter("mkFitSilent")} { const auto build = iConfig.getParameter("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("seedCleaning"); @@ -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("removeDuplicates")); } @@ -97,7 +93,7 @@ void MkFitProducer::fillDescriptions(edm::ConfigurationDescriptions& description desc.add("hits", edm::InputTag("mkFitHitConverter")); desc.add("seeds", edm::InputTag("mkFitSeedConverter")); desc.add("buildingRoutine", "cloneEngine") - ->setComment("Valid values are: 'bestHit', 'standard', 'cloneEngine', 'fullVector'"); + ->setComment("Valid values are: 'bestHit', 'standard', 'cloneEngine'"); desc.add("seedCleaning", "N2")->setComment("Valid values are: 'none', 'N2'"); desc.add("removeDuplicates", true)->setComment("Run duplicate removal within mkFit"); desc.add("backwardFitInCMSSW", false)