Merge pull request #27101 from emacdonald16/BackPortForOTTP

Backport for OuterTrackingMonitorTrackingParticle

Validation/SiOuterTrackerV/interface/OuterTrackerMonitorTrackingParticles.h

@@ -29,7 +29,6 @@ class OuterTrackerMonitorTrackingParticles : public DQMEDAnalyzer {
   ~OuterTrackerMonitorTrackingParticles() override;
   void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  int Layer(const float R_, const float Z_) const;
 
   // Tracking particle distributions
   MonitorElement *trackParts_Eta = nullptr;
@@ -106,8 +105,6 @@ class OuterTrackerMonitorTrackingParticles : public DQMEDAnalyzer {
 private:
   edm::ParameterSet conf_;
   edm::EDGetTokenT<std::vector<TrackingParticle>> trackingParticleToken_;
-  edm::EDGetTokenT<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>> ttStubToken_;
-  edm::EDGetTokenT<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> ttTrackToken_;
   edm::EDGetTokenT<TTClusterAssociationMap<Ref_Phase2TrackerDigi_>>
       ttClusterMCTruthToken_;  // MC truth association map for clusters
   edm::EDGetTokenT<TTStubAssociationMap<Ref_Phase2TrackerDigi_>>
@@ -119,25 +116,12 @@ class OuterTrackerMonitorTrackingParticles : public DQMEDAnalyzer {
   double L1Tk_maxChi2;
   double L1Tk_maxChi2dof;
   int TP_minNStub;
+  int TP_minNLayersStub;
   double TP_minPt;
   double TP_maxPt;
   double TP_maxEta;
   double TP_maxVtxZ;
   int TP_select_eventid;
   std::string topFolderName_;
-
-  // The following adds a variable that is the number of layers hit for each
-  // tracking particle
-  struct TpStruct {
-    int TpId;
-    std::vector<bool> layer;
-    int Nlayers() {  // Counts how many layers are set to "true" for their hit status
-      int layers = 0;
-      for (unsigned l = 0; l < layer.size(); ++l)
-        if (layer[l])
-          ++layers;
-      return layers;
-    }
-  };
 };
 #endif