Revert "L1 tk dev 12 0 0 pre4 hph (cms-sw#94)" (cms-sw#95)

This reverts commit 3b2f139.

L1Trigger/TrackFindingTMTT/src/KFbase.cc

@@ -729,9 +729,9 @@ namespace tmtt {
     // Fixes to layermap when "maybe layer" used
     if (settings_->kfUseMaybeLayers()) {
       switch (kfEtaReg) {
-        case 5:  //case 5: B1 B2 (B3+B4)* D1 D2 D3 D4+D5  -- B3 is combined with B4 and is flagged as "maybe layer"
+        case 5:  //case 5: B1 B2 (B3+B4)* D1 D2 D3+D4 D5+D6  -- B3 is combined with B4 and is flagged as "maybe layer"
           if (layerIDreduced == 6) {
-            kalmanLay = 6;
+            kalmanLay = 5;
           }
           break;
         case 6:  //case 6: B1* B2* D1 D2 D3 D4 D5 -- B1 and B2 are flagged as "maybe layer"
@@ -758,7 +758,7 @@ namespace tmtt {
           }
           break;
           //case 5:  // B1 B2 B3+B4 D1 D2 D3 D4/D5
-        case 5:
+        case 5:  // B1 B2 B3 D1+B4 D2 D3 D4/D5
           if (layerIDreduced == 5) {
             kalmanLay = 5;
           } else if (layerIDreduced == 7) {

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

@@ -94,7 +94,6 @@
 
 #include "L1Trigger/TrackTrigger/interface/StubPtConsistency.h"
 #include "L1Trigger/TrackTrigger/interface/TrackQuality.h"
-#include "L1Trigger/TrackTrigger/interface/HitPatternHelper.h"
 
 //////////////
 // STD HEADERS
@@ -184,7 +183,6 @@ class L1FPGATrackProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
 
   // helper class to store DTC configuration
   trackerDTC::Setup setup_;
-  const hph::Setup* setupHPH_;
 
   // Setup token
   const edm::ESGetToken<trackerDTC::Setup, trackerDTC::SetupRcd> esGetToken_;
@@ -242,7 +240,6 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
 
   // book ES product
   esGetToken_ = esConsumes<trackerDTC::Setup, trackerDTC::SetupRcd, edm::Transition::BeginRun>();
-  esGetTokenHPH_ = esConsumes<hph::Setup, hph::SetupRcd, edm::Transition::BeginRun>();
 
   // --------------------------------------------------------------------------------
   // set options in Settings based on inputs from configuration files
@@ -311,10 +308,6 @@ void L1FPGATrackProducer::beginRun(const edm::Run& run, const edm::EventSetup& i
   settings.setBfield(mMagneticFieldStrength);
 
   setup_ = iSetup.getData(esGetToken_);
-  setupHPH_ = &iSetup.getData(esGetTokenHPH_);
-  if (trackQuality_) {
-    trackQualityModel_->setHPHSetup(setupHPH_);
-  }
 
   // initialize the tracklet event processing (this sets all the processing & memory modules, wiring, etc)
   eventProcessor.init(settings);

L1Trigger/TrackFindingTracklet/python/L1HybridEmulationTracks_cff.py

@@ -6,8 +6,6 @@
 
 from SimTracker.TrackTriggerAssociation.TrackTriggerAssociator_cff import *
 
-from L1Trigger.TrackTrigger.ProducerHPH_cff import *
-
 # prompt hybrid emulation
 TTTrackAssociatorFromPixelDigis.TTTracks = cms.VInputTag(cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks") )
 

L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py

@@ -31,7 +31,6 @@
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.MessageLogger.L1track = dict(limit = -1)
 process.MessageLogger.Tracklet = dict(limit = -1)
-process.MessageLogger.TrackTriggerHPH = dict(limit = -1)
 
 if GEOMETRY == "D49":
     print("using geometry " + GEOMETRY + " (tilted)")

L1Trigger/TrackTrigger/interface/L1TrackQuality.h

@@ -56,8 +56,6 @@ class TrackQuality {
                     std::string const& ONNXInputName,
                     std::vector<std::string> const& featureNames);
 
-  void setHPHSetup(const hph::Setup* setup);
-
 private:
   // Private Member Data
   QualityAlgorithm qualityAlgorithm_ = QualityAlgorithm::None;
@@ -71,7 +69,5 @@ class TrackQuality {
   float minPt_;
   int nStubsmin_;
   float ONNXInvRScaling_;
-  const hph::Setup* setup_;
-  bool useHPH;
 };
 #endif