Merge pull request #2 from dildick/test_11082013

Test 11082013
tahuang1991 · Aug 14, 2013 · cc7ec13 · cc7ec13
2 parents 4c05ec6 + 95e05c6
commit cc7ec13
Show file tree

Hide file tree

Showing 9 changed files with 1,797 additions and 1,263 deletions.
diff --git a/SimMuL1/interface/Helpers.h b/SimMuL1/interface/Helpers.h
@@ -36,11 +36,3 @@ isME42RPCEtaRegion(float eta)
 }
 
 #endif
-
-
-
-
-
-
-
-
diff --git a/SimMuL1/plugins/GEMCSCTriggerRate.cc b/SimMuL1/plugins/GEMCSCTriggerRate.cc
@@ -36,29 +36,8 @@ using namespace edm;
 
 namespace 
 {
-
   const Double_t ETA_BIN = 0.0125 *2;
   const Double_t PHI_BIN = 62.*M_PI/180./4096.; // 0.26 mrad
-
-  bool isME1bEtaRegion(float eta, float eta_min = 1.64, float eta_max = 2.14)
-  {
-    if (fabs(eta) >= eta_min && fabs(eta) <= eta_max) return true;
-    else return false;
-  }
-
-  bool isME1abEtaRegion(float eta, float eta_min = 1.64)
-  {
-    if (fabs(eta) >= eta_min) return true;
-    else return false;
-  }
-
-  bool isME1aEtaRegion(float eta, float eta_min = 2.14)
-  {
-    if (fabs(eta) >= eta_min) return true;
-    else return false;
-  }
-
-
 }
 
 // ================================================================================================
@@ -2473,20 +2452,6 @@ GEMCSCTriggerRate::cscTriggerSubsector(CSCDetId &id)
 }
 
 
-// ================================================================================================
-bool GEMCSCTriggerRate::isME42EtaRegion(float eta)
-{
-  if (fabs(eta)>=1.2499 && fabs(eta)<=1.8) return true;
-  else return false;
-}
-
-bool GEMCSCTriggerRate::isME42RPCEtaRegion(float eta)
-{
-  if (fabs(eta)>=1.2499 && fabs(eta)<=1.6) return true;
-  else return false;
-}
-
-
 // ================================================================================================
 
 void GEMCSCTriggerRate::setupTFModeHisto(TH1D* h)

diff --git a/SimMuL1/scripts/drawplot_eff.py b/SimMuL1/scripts/drawplot_eff.py
@@ -326,17 +326,18 @@ def gemTurnOn(filesDir, plotDir, eff, oddEven, ext):
     ## add legend
     ##    leg_header =  "    #Delta#phi(GEM,CSC) is %s%% efficient for"%(eff)
     ##    leg.AddEntry(0, "%s chambers at pt"%(oddEven), "")
-    leg = TLegend(0.37,0.15,.82,0.5, "", "brNDC")
+    leg = TLegend(0.37,0.15,.93,0.6, "", "brNDC")
     leg_header =  "    "
     leg.AddEntry(0, 'High efficiency patterns:', "")
     for n in range(len(pt)):
-        leg.AddEntry(histoList[n], "#Delta#Phi(GEM-CSC)#geq%.4f (p_{T}>%s)"%(dphis[n],pt_labels[n]), "p")
+        leg.AddEntry(histoList[n], "|#Delta#Phi_{(GEM,CSC)}|<%.4f (p_{T}^{th}>%s)"%(dphis[n],pt_labels[n]), "p")
     leg.SetBorderSize(0)
+    leg.SetMargin(0.1)
     leg.SetFillStyle(0)
-    ##    leg.SetFillStyle(1001)
-    ##    leg.SetFillColor(kWhite)
+    leg.SetFillStyle(1001)
+    leg.SetFillColor(kWhite)
     leg.SetHeader(leg_header)
-    leg.SetTextSize(0.04)
+    leg.SetTextSize(0.05)
     leg.Draw("same")
 
     ## Adding additional information - top right
@@ -354,7 +355,7 @@ def gemTurnOn(filesDir, plotDir, eff, oddEven, ext):
     if closeFar == "Close":
         xpos = 0.57
     else:
-        xpos = 0.62
+        xpos = 0.611
 
     tex = TLatex(xpos,.68,'"%s" chamber pairs'%(closeFar))
     tex.Draw("same")