Version with comments, ExtWheels exception and t0phi

Author: jfernan2

L1Trigger/DTTriggerPhase2/interface/MPThetaMatching.h

@@ -18,7 +18,7 @@ class MPThetaMatching : public MPFilter {
 public:
   // Constructors and destructor
   MPThetaMatching(const edm::ParameterSet &pset);
-  ~MPThetaMatching() override = default;
+  ~MPThetaMatching() override;  // = default;
 
   // Main methods
   void initialise(const edm::EventSetup &iEventSetup) override;
@@ -30,11 +30,11 @@ class MPThetaMatching : public MPFilter {
            const edm::EventSetup &iEventSetup,
            std::vector<cmsdt::metaPrimitive> &allMPaths,
            std::vector<cmsdt::metaPrimitive> &inMPaths,
-           std::vector<cmsdt::metaPrimitive> &outMPaths) override {};
+           std::vector<cmsdt::metaPrimitive> &outMPaths) override{};
   void run(edm::Event &iEvent,
            const edm::EventSetup &iEventSetup,
            MuonPathPtrs &inMPath,
-           MuonPathPtrs &outMPath) override {};
+           MuonPathPtrs &outMPath) override{};
 
   void finish() override;
 
@@ -48,12 +48,14 @@ class MPThetaMatching : public MPFilter {
   float zFE[5] = {-658.9, -393.3, 126.4, 393.3, 658.9};  //cm
   float xFE[3] = {218 / 2., 266.8 / 2., 315 / 2.};       //cm
   float ZRES_CONV = 65536. / 1500;
+  int totOUTtheta, totINtheta, totOUTphi, totINphi;
+  int nothetaOUTphi, st4OUTphi, hqOUTphi, nophiOUTtheta;
 
 private:
   // Private methods
   std::vector<cmsdt::metaPrimitive> filter(std::vector<cmsdt::metaPrimitive> inMPs,
-//                                           int th_option,
-//                                           int th_quality,
+                                           //                                           int th_option,
+                                           //                                           int th_quality,
                                            double shift_back);
 
   bool isThereThetaMPInChamber(int sector, int wheel, int station, std::vector<cmsdt::metaPrimitive> thetaMPs);
@@ -64,8 +66,11 @@ class MPThetaMatching : public MPFilter {
                            const std::tuple<cmsdt::metaPrimitive, cmsdt::metaPrimitive, float> &b) {
     return std::get<2>(a) < std::get<2>(b);
   };
-  void orderAndSave(std::vector<std::tuple<cmsdt::metaPrimitive, cmsdt::metaPrimitive, float>> deltaTimePosPhiCands, 
-            std::vector<cmsdt::metaPrimitive> *outMPaths, std::vector<cmsdt::metaPrimitive> *savedThetas);
+  void orderAndSave(std::vector<std::tuple<cmsdt::metaPrimitive, cmsdt::metaPrimitive, float>> deltaTimePosPhiCands,
+                    std::vector<cmsdt::metaPrimitive> *outMPaths,
+                    std::vector<cmsdt::metaPrimitive> *savedThetas);
+
+  //float computePosRefX(cmsdt::metaPrimitive);
 
   // Private attributes
   const bool debug_;

L1Trigger/DTTriggerPhase2/python/dtTriggerPhase2PrimitiveDigis_cfi.py

@@ -1,3 +1,4 @@
+
 import FWCore.ParameterSet.Config as cms
 
 from L1TriggerConfig.DTTPGConfigProducers.L1DTTPGConfigFromDB_cff import *
@@ -24,9 +25,9 @@
                                                scenario = cms.int32(0), #0 for mc, 1 for data, 2 for slice test
                                                df_extended = cms.int32(0), # DF: 0 for standard, 1 for extended, 2 for both 
                                                co_option = cms.int32(1), # coincidence w.r.t. : -1 = off, 0 = co all, 1 = co phi, 2 = co theta
-                                               co_quality = cms.int32(1), # quality cut (>X) for coincidence TP 
-                                               th_option = cms.int32(1), # save 1st, 2nd, 3rd,... closest phi TP to theta TP. 0 disables filtering, i.e. saves all 
-                                               th_quality = cms.int32(5), # quality cut (>X) for Theta matching: Phi TPs above this quality are not filtered
+                                               co_quality = cms.int32(1), # quality cut (>X) for coincidence TP: request TPs to be above this cut
+                                               th_option = cms.int32(1), # save 1st, 2nd,... closest Phi-Theta pair. 0 disables filtering (saves all)
+                                               th_quality = cms.int32(2), # quality cut (>X) for Theta matching: Phi TPs above are not filtered
                                                max_primitives = cms.int32(999),
 
                                                output_mixer = cms.bool(False),