Changes from D. Morat to coincidence exception on external chambers

Author: jfernan2

L1Trigger/DTTriggerPhase2/interface/MPCoincidenceFilter.h

@@ -72,12 +72,14 @@ class MPCoincidenceFilter : public MPFilter {
                                            std::vector<cmsdt::metaPrimitive> allMPs,
                                            int co_option,
                                            int co_quality,
+					   int co_wh2option,
                                            double shift_back);
 
   // Private attributes
   const bool debug_;
   int co_option_;
   int co_quality_;
+  int co_wh2option_;
   int scenario_;
 };
 

L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc

@@ -139,6 +139,7 @@ class DTTrigPhase2Prod : public edm::stream::EDProducer<> {
   int df_extended_;
   int co_option_;  //coincidence
   int co_quality_;
+  int co_wh2option_;
   int th_option_;  //theta matching
   int th_quality_;
   int max_index_;
@@ -214,6 +215,7 @@ DTTrigPhase2Prod::DTTrigPhase2Prod(const ParameterSet& pset)
   df_extended_ = pset.getParameter<int>("df_extended");
   co_option_ = pset.getParameter<int>("co_option");
   co_quality_ = pset.getParameter<int>("co_quality");
+  co_wh2option_ = pset.getParameter<int>("co_wh2option");
   th_option_ = pset.getParameter<int>("th_option");
   th_quality_ = pset.getParameter<int>("th_quality");
   max_index_ = pset.getParameter<int>("max_primitives") - 1;
@@ -831,6 +833,9 @@ void DTTrigPhase2Prod::produce(Event& iEvent, const EventSetup& iEventSetup) {
     }
   }
 
+  //for (auto& ch_filtcorrelatedMetaPrimitives : filtCorrelatedMetaPrimitives)
+  //cout<<"filtCorrelatedMetaPrimitives: "<<filtCorrelatedMetaPrimitives[ch_filtcorrelatedMetaPrimitives.first].size()<<endl;
+
   correlatedMetaPrimitives.clear();
   filteredMetaPrimitives.clear();
 
@@ -860,6 +865,9 @@ void DTTrigPhase2Prod::produce(Event& iEvent, const EventSetup& iEventSetup) {
     }
   }
 
+  //for (auto& ch_filtcoMetaPrimitives : coMetaPrimitives) 
+  //cout<<"coMetaPrimitives: "<<coMetaPrimitives[ch_filtcoMetaPrimitives.first].size()<<endl;
+
   allMetaPrimitives.clear();
 
   // Theta (th) matching filter
@@ -879,6 +887,9 @@ void DTTrigPhase2Prod::produce(Event& iEvent, const EventSetup& iEventSetup) {
     }
   }
 
+  for (auto& mych : coMetaPrimitives)
+  cout<<"coMetaPrimitives: "<<coMetaPrimitives[mych.first].size() <<" thMatchedMetaPrimitives: " << thMatchedMetaPrimitives[mych.first].size() <<endl;
+
   /////////////
 
   double shift_back = 0;
@@ -1318,6 +1329,7 @@ void DTTrigPhase2Prod::fillDescriptions(edm::ConfigurationDescriptions& descript
   desc.add<int>("df_extended", 0);
   desc.add<int>("co_option", 0);
   desc.add<int>("co_quality", 0);
+  desc.add<int>("co_wh2option", 0);
   desc.add<int>("th_option", 0);
   desc.add<int>("th_quality", 0);
   desc.add<int>("max_primitives", 999);

L1Trigger/DTTriggerPhase2/python/dtTriggerPhase2PrimitiveDigis_cfi.py

@@ -26,6 +26,7 @@
                                                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: request TPs to be above this cut
+                                               co_wh2option = cms.int32(1),#0 (filter all stations in Wh2), 1(pass Wh2 St1), 2(pass Wh2 St1+2)
                                                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),