Merge pull request #7 from nurfikri89/eff_analysis_nano_run2_updateFo…

…rPR_v2 Bugfix for v3 production.
cms-jet · Jun 8, 2020 · b7f0795 · b7f0795
2 parents 97bc713 + 70b63a3
commit b7f0795
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/Skimmer/crab/crab_2016_data.py b/Skimmer/crab/crab_2016_data.py
@@ -20,7 +20,6 @@ def GetDataStream(name):
     print dataset
   print "\n\n"
 
-  from CRABClient.UserUtilities import getUsernameFromSiteDB
   from CRABAPI.RawCommand import crabCommand
   for i, dataset in enumerate(samplelist):
     print "%d/%d:Sending CRAB job: %s" % (i+1,len(samplelist), dataset)

diff --git a/Skimmer/crab/crab_2016_mc.py b/Skimmer/crab/crab_2016_mc.py
@@ -21,7 +21,6 @@
     print dataset
   print "\n\n"
 
-  from CRABClient.UserUtilities import getUsernameFromSiteDB
   from CRABAPI.RawCommand import crabCommand
   for i, dataset in enumerate(samplelist):
     print "%d/%d:Sending CRAB job: %s" % (i+1,len(samplelist), dataset)

diff --git a/Skimmer/crab/crab_2017_data.py b/Skimmer/crab/crab_2017_data.py
@@ -20,7 +20,6 @@ def GetDataStream(name):
     print dataset
   print "\n\n"
 
-  from CRABClient.UserUtilities import getUsernameFromSiteDB
   from CRABAPI.RawCommand import crabCommand
   for i, dataset in enumerate(samplelist):
     print "%d/%d:Sending CRAB job: %s" % (i+1,len(samplelist), dataset)

diff --git a/Skimmer/crab/crab_2017_mc.py b/Skimmer/crab/crab_2017_mc.py
@@ -21,7 +21,6 @@
     print dataset
   print "\n\n"
 
-  from CRABClient.UserUtilities import getUsernameFromSiteDB
   from CRABAPI.RawCommand import crabCommand
   for i, dataset in enumerate(samplelist):
     print "%d/%d:Sending CRAB job: %s" % (i+1,len(samplelist), dataset)

diff --git a/Skimmer/crab/crab_2018_data.py b/Skimmer/crab/crab_2018_data.py
@@ -20,7 +20,6 @@ def GetDataStream(name):
     print dataset
   print "\n\n"
 
-  from CRABClient.UserUtilities import getUsernameFromSiteDB
   from CRABAPI.RawCommand import crabCommand
   for i, dataset in enumerate(samplelist):
     print "%d/%d:Sending CRAB job: %s" % (i+1,len(samplelist), dataset)

diff --git a/Skimmer/crab/crab_2018_mc.py b/Skimmer/crab/crab_2018_mc.py
@@ -21,7 +21,6 @@
     print dataset
   print "\n\n"
 
-  from CRABClient.UserUtilities import getUsernameFromSiteDB
   from CRABAPI.RawCommand import crabCommand
   for i, dataset in enumerate(samplelist):
     print "%d/%d:Sending CRAB job: %s" % (i+1,len(samplelist), dataset)

diff --git a/Skimmer/crab/crab_common.py b/Skimmer/crab/crab_common.py
@@ -3,7 +3,7 @@
 #
 # Set version number (CHECK)
 #
-version="DiMuonSkim_v3"
+version="DiMuonSkim_v3p1"
 #
 # Set request name prefx
 #

diff --git a/Skimmer/python/SkimmerDiLepton.py b/Skimmer/python/SkimmerDiLepton.py
@@ -309,6 +309,10 @@ def passZBosonSelection(self, event):
       for obj in event.trigObjsAll:
         if not(obj.id == 13):
           continue
+        if not(obj.filterBits&1): 
+          continue   
+        if not(obj.filterBits&16): 
+          continue    
         if(event.muonsTight[0].DeltaR(obj) < 0.1): 
           event.passLep0TrigMatch = True
         if(event.muonsTight[1].DeltaR(obj) < 0.1): 
@@ -342,6 +346,10 @@ def passZBosonSelection(self, event):
       for obj in event.trigObjsAll:
         if not(obj.id == 11):
           continue
+        if not(obj.filterBits&1): 
+          continue   
+        if not(obj.filterBits&16): 
+          continue  
         if(event.electronsTight[0].DeltaR(obj) < 0.1): 
           event.passLep0TrigMatch = True
         if(event.electronsTight[1].DeltaR(obj) < 0.1): 

diff --git a/Skimmer/script/branches_in.txt b/Skimmer/script/branches_in.txt
@@ -28,4 +28,6 @@ keep HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ
 keep HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL
 keep HLT_TkMu17_TrkIsoVVL_TkMu8_TrkIsoVVL
 keep HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass8
-keep HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8
+keep HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8
+keep HLT_Ele23_Ele12_CaloIdL_TrackIdL_IsoVL_DZ
+keep HLT_Ele23_Ele12_CaloIdL_TrackIdL_IsoVL