Merge pull request #20185 from gkaratha/dqm_bmtf_930

BMTF dqm sligtly improved
cms-sw · Aug 24, 2017 · bae21ac · bae21ac
2 parents 1926845 + a65de47
commit bae21ac
Showing 1 changed file with 30 additions and 27 deletions.
diff --git a/DQM/L1TMonitor/src/L1TStage2BMTF.cc b/DQM/L1TMonitor/src/L1TStage2BMTF.cc
@@ -2,6 +2,7 @@
  * \L1TStage2BMTF.cc
  * \author Esmaeel Eskandari Tadavani
  * \December 2015
+/G.karathanasis     
 */
 
 #include "DQM/L1TMonitor/interface/L1TStage2BMTF.h"
@@ -52,7 +53,7 @@ void L1TStage2BMTF::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& i
   bmtf_hwEta_hwLocalPhi = ibooker.book2D("bmtf_hwEta_hwLocalPhi", "HW #eta vs HW Local #phi" , 461, -230.5, 230.5, 201, -100.5, 100.5);
   bmtf_hwEta_hwLocalPhi->setTitle(";HW #eta; HW Local #phi");
 
-  bmtf_hwEta_hwGlobalPhi = ibooker.book2D("bmtf_hwEta_hwGlobalPhi", "HW #eta vs HW Global #phi" , 461, -230.5, 230.5, 576, -0.5, 575.5);
+  bmtf_hwEta_hwGlobalPhi = ibooker.book2D("bmtf_hwEta_hwGlobalPhi", "HW #eta vs HW Global #phi" , 100, -230.5, 230.5, 120, -0.5, 575.5);
   bmtf_hwEta_hwGlobalPhi->setTitle(";HW #eta; HW Global #phi");
 
   bmtf_hwPt_hwEta  = ibooker.book2D("bmtf_hwPt_hwEta" , "HW p_{T} vs HW #eta", 511, -0.5, 510.5, 461, -230.5, 230.5);
@@ -125,34 +126,36 @@ void L1TStage2BMTF::analyze(const edm::Event & eve, const edm::EventSetup & eveS
   for(int itBX=bmtfMuon->getFirstBX(); itBX<=bmtfMuon->getLastBX(); ++itBX)
     {
       for(l1t::RegionalMuonCandBxCollection::const_iterator itMuon = bmtfMuon->begin(itBX); itMuon != bmtfMuon->end(itBX); ++itMuon)
-	{  
-
-	  bmtf_hwEta->Fill(itMuon->hwEta());
-	  bmtf_hwLocalPhi->Fill(itMuon->hwPhi());
-	  bmtf_hwPt->Fill(itMuon->hwPt());
-	  bmtf_hwQual->Fill(itMuon->hwQual());
-	  bmtf_proc->Fill(itMuon->processor());
-
-          bmtf_wedge_bx->Fill(itMuon->processor(), itBX);  
-	  bmtf_hwEta_bx->Fill(itMuon->hwEta(), itBX);  
-	  bmtf_hwLocalPhi_bx->Fill(itMuon->hwPhi(), itBX);  
-	  bmtf_hwPt_bx->Fill(itMuon->hwPt(), itBX);   
-	  bmtf_hwQual_bx->Fill(itMuon->hwQual(), itBX);
+        {  
+
+          bmtf_hwEta->Fill(itMuon->hwEta());
+          bmtf_hwLocalPhi->Fill(itMuon->hwPhi());
+          bmtf_hwPt->Fill(itMuon->hwPt());
+          bmtf_hwQual->Fill(itMuon->hwQual());
+          bmtf_proc->Fill(itMuon->processor());
+          if (fabs(bmtfMuon->getLastBX()-bmtfMuon->getFirstBX())>3){
+            bmtf_wedge_bx->Fill(itMuon->processor(), itBX);  
+            bmtf_hwEta_bx->Fill(itMuon->hwEta(), itBX);  
+            bmtf_hwLocalPhi_bx->Fill(itMuon->hwPhi(), itBX);  
+            bmtf_hwPt_bx->Fill(itMuon->hwPt(), itBX);   
+            bmtf_hwQual_bx->Fill(itMuon->hwQual(), itBX);}
 
-	  bmtf_hwEta_hwLocalPhi->Fill(itMuon->hwEta(),itMuon->hwPhi());
-	  bmtf_hwPt_hwEta->Fill(itMuon->hwPt(), itMuon->hwEta());
-	  bmtf_hwPt_hwLocalPhi->Fill(itMuon->hwPt(), itMuon->hwPhi());
+          bmtf_hwEta_hwLocalPhi->Fill(itMuon->hwEta(),itMuon->hwPhi());
+          bmtf_hwPt_hwEta->Fill(itMuon->hwPt(), itMuon->hwEta());
+          bmtf_hwPt_hwLocalPhi->Fill(itMuon->hwPt(), itMuon->hwPhi());
 
-	  if(itMuon->hwPhi()*0.010902>=0 && itMuon->hwPhi()*0.010902<=30)
-	    global_phi = itMuon->hwPhi() + itMuon->processor()*30.;
-	  if(itMuon->hwPhi()*0.010902<0)
-	    global_phi = 30-itMuon->hwPhi() + (itMuon->processor()-1)*30.;
-	  if(itMuon->hwPhi()*0.010902>30)
-	    global_phi = itMuon->hwPhi()-30 + (itMuon->processor()+1)*30.;
-
-    	  bmtf_hwGlobalPhi->Fill(global_phi);
-	  bmtf_hwEta_hwGlobalPhi->Fill(itMuon->hwEta(), global_phi);
-	}
+        /*if(itMuon->hwPhi()*0.010902>=0 && itMuon->hwPhi()*0.010902<=30)
+            global_phi = itMuon->hwPhi() + itMuon->processor()*30.;
+          if(itMuon->hwPhi()*0.010902<0)
+            global_phi = 30-itMuon->hwPhi() + (itMuon->processor()-1)*30.;
+          if(itMuon->hwPhi()*0.010902>30)
+            global_phi = itMuon->hwPhi()-30 + (itMuon->processor()+1)*30.;*/
+          global_phi= itMuon->hwPhi() + itMuon->processor()*48.-15;
+          if (global_phi<0) global_phi=576+global_phi;
+
+          bmtf_hwGlobalPhi->Fill(global_phi);
+          bmtf_hwEta_hwGlobalPhi->Fill(itMuon->hwEta(), global_phi);
+        }
     }
 
       // for(L1MuDTChambThContainer::The_Container::const_iterator itMuon = bmtfMuonTwinMux1->getContainer()->begin(); itMuon != bmtfMuonTwinMux1->getContainer()->end(); ++itMuon)