Merge pull request cms-sw#25 from mariadalfonso/metFilter_AAAA

Met filters 76X +  AAA

HToZZ4L/cfg/run_hzz4l_cfg.py

@@ -6,7 +6,7 @@
 #Load all analyzers
 from CMGTools.HToZZ4L.analyzers.hzz4lCore_modules_cff import * 
 from CMGTools.HToZZ4L.tools.configTools import * 
-
+from CMGTools.RootTools.samples.autoAAAconfig import *
 
 #-------- SAMPLES AND TRIGGERS -----------
 

HToZZ4L/cfg/run_onia2l_cfg.py

@@ -8,7 +8,7 @@
 from CMGTools.HToZZ4L.analyzers.hzz4lCore_modules_cff import * 
 from CMGTools.HToZZ4L.analyzers.hzz4lExtra_modules_cff import * 
 from CMGTools.HToZZ4L.tools.configTools import * 
-
+from CMGTools.RootTools.samples.autoAAAconfig import *
 
 #-------- SEQUENCE
 sequence = cfg.Sequence(hzz4lPreSequence +  [ fastSkim2Mu3 ] + hzz4lObjSequence + [

HToZZ4L/cfg/run_z2l_cfg.py

@@ -7,6 +7,7 @@
 from CMGTools.HToZZ4L.analyzers.hzz4lCore_modules_cff import * 
 from CMGTools.HToZZ4L.analyzers.hzz4lExtra_modules_cff import * 
 from CMGTools.HToZZ4L.tools.configTools import * 
+from CMGTools.RootTools.samples.autoAAAconfig import *
 
 #-------- SEQUENCE
 sequence = cfg.Sequence(hzz4lPreSequence +  [ fastSkim2L ] + hzz4lObjSequence + [

HToZZ4L/cfg/run_z2ltnp_cfg.py

@@ -7,7 +7,7 @@
 from CMGTools.HToZZ4L.analyzers.hzz4lCore_modules_cff import * 
 from CMGTools.HToZZ4L.analyzers.hzz4lExtra_modules_cff import * 
 from CMGTools.HToZZ4L.tools.configTools import * 
-
+from CMGTools.RootTools.samples.autoAAAconfig import *
 
 
 #-------- SEQUENCE

HToZZ4L/cfg/run_z3l_cfg.py

@@ -7,7 +7,7 @@
 from CMGTools.HToZZ4L.analyzers.hzz4lCore_modules_cff import * 
 from CMGTools.HToZZ4L.analyzers.hzz4lExtra_modules_cff import * 
 from CMGTools.HToZZ4L.tools.configTools import * 
-
+from CMGTools.RootTools.samples.autoAAAconfig import *
 
 
 #-------- SEQUENCE

HToZZ4L/python/tools/configTools.py

@@ -1,22 +1,5 @@
 from PhysicsTools.HeppyCore.framework.heppy_loop import getHeppyOption
 
-def autoAAA(selectedComponents):
-    import re, os
-    from CMGTools.Production import changeComponentAccessMode
-    from CMGTools.Production.localityChecker import LocalityChecker
-    tier2Checker = LocalityChecker("T2_CH_CERN", datasets="/*/*/MINIAOD*")
-    for comp in selectedComponents:
-        if len(comp.files) == 0: print "ERROR, comp %s (dataset %s) has no files!" % (comp.name, getattr(comp,'dataset',None))
-        if not hasattr(comp,'dataset'): continue
-        if not re.match("/[^/]+/[^/]+/MINIAOD(SIM)?", comp.dataset): continue
-        if "/store/" not in comp.files[0]: continue
-        if re.search("/store/(group|user|cmst3)/", comp.files[0]): continue
-        if not tier2Checker.available(comp.dataset):
-            print "Dataset %s is not available, will use AAA" % comp.dataset
-            changeComponentAccessMode.convertComponent(comp, "root://cms-xrd-global.cern.ch/%s")
-            if 'X509_USER_PROXY' not in os.environ or "/afs/" not in os.environ['X509_USER_PROXY']:
-                raise RuntimeError, "X509_USER_PROXY not defined or not pointing to /afs"
-
 def redefineRunRange(selectedComponents,run_range):
     from CMGTools.HToZZ4L.samples.samples_13TeV_Fall15 import kreator
     from math import ceil

ObjectStudies/cfg/run_MET_cfg.py

@@ -1,5 +1,7 @@
 import PhysicsTools.HeppyCore.framework.config as cfg
 
+from CMGTools.RootTools.samples.autoAAAconfig import *
+
 #-------- SAMPLES AND TRIGGERS -----------
 from CMGTools.RootTools.samples.samples_13TeV_RunIIFall15MiniAODv2 import * #<--miniAOD v2 samples_13TeV_RunIIFall15MiniAODv2
 from CMGTools.RootTools.samples.samples_13TeV_DATA2015 import *
@@ -185,7 +187,7 @@
     is1PH=True
     for comp in selectedComponents:
         comp.splitFactor = 100
-        comp.files = comp.files[:]   
+        comp.files = comp.files[:]
 
 # GJets
 elif test==18:
@@ -377,6 +379,8 @@
 #from PhysicsTools.Heppy.utils.cmsswPreprocessor import CmsswPreprocessor
 #preprocessor = CmsswPreprocessor(preprocessorFile)
 
+autoAAA(selectedComponents)
+
 #printComps(config.components, True)               
 config = cfg.Config( components = selectedComponents,
                      sequence = metSequence,

ObjectStudies/python/analyzers/metCoreModules_cff.py

@@ -55,29 +55,22 @@
     processName = 'PAT',
     outprefix   = 'Flag',
     triggerBits = {
-###        "HBHENoiseFilter" : [ "Flag_HBHENoiseFilter" ], ## temporary replacement
+        "goodVertices" : [ "Flag_goodVertices" ],
+        "HBHENoiseFilter" : [ "Flag_HBHENoiseFilter" ],
         "HBHENoiseIsoFilter" : [ "Flag_HBHENoiseIsoFilter" ],
         "CSCTightHaloFilter" : [ "Flag_CSCTightHaloFilter" ],
-        "hcalLaserEventFilter" : [ "Flag_hcalLaserEventFilter" ],
-        "EcalDeadCellTriggerPrimitiveFilter" : [ "Flag_EcalDeadCellTriggerPrimitiveFilter" ],
-        "goodVertices" : [ "Flag_goodVertices" ],
-        "trackingFailureFilter" : [ "Flag_trackingFailureFilter" ],
+        "CSCTightHalo2015Filter" : [ "Flag_CSCTightHalo2015Filter" ],
         "eeBadScFilter" : [ "Flag_eeBadScFilter" ],
-        "ecalLaserCorrFilter" : [ "Flag_ecalLaserCorrFilter" ],
-        "trkPOGFilters" : [ "Flag_trkPOGFilters" ],
-        "trkPOG_manystripclus53X" : [ "Flag_trkPOG_manystripclus53X" ],
-        "trkPOG_toomanystripclus53X" : [ "Flag_trkPOG_toomanystripclus53X" ],
-        "trkPOG_logErrorTooManyClusters" : [ "Flag_trkPOG_logErrorTooManyClusters" ],
-        "METFilters" : [ "Flag_METFilters" ],
+        "EcalDeadCellTriggerPrimitiveFilter" : [ "Flag_EcalDeadCellTriggerPrimitiveFilter" ],
     }
     )
 
 
-from CMGTools.TTHAnalysis.analyzers.hbheAnalyzer import hbheAnalyzer
-hbheFilterAna = cfg.Analyzer(
-    hbheAnalyzer, name = 'hbheAnalyzer',
-    IgnoreTS4TS5ifJetInLowBVRegion = False
-)
+#from CMGTools.TTHAnalysis.analyzers.hbheAnalyzer import hbheAnalyzer
+#hbheFilterAna = cfg.Analyzer(
+#    hbheAnalyzer, name = 'hbheAnalyzer',
+#    IgnoreTS4TS5ifJetInLowBVRegion = False
+#)
 
 # Select a list of good primary vertices (generic)
 vertexAna = cfg.Analyzer(
@@ -414,7 +407,7 @@
     metAna,
     metPuppiAna,
     eventFlagsAna,
-    hbheFilterAna,
+##    hbheFilterAna,
 ##### tree
 ##    treeProducer,
 ]

ObjectStudies/python/analyzers/treeProducerMET.py

@@ -19,8 +19,9 @@
 
    # ----------------------- MET filter information (temporary)  -------------------------------------------------------------------- #
 
-    NTupleVariable("Flag_HBHENoiseFilter", lambda ev: ev.hbheFilterNew, help="HBEHE temporary filter decision"),
-    NTupleVariable("Flag_HBHEIsoNoiseFilter", lambda ev: ev.hbheFilterIso, help="HBEHE isolation temporary filter decision"),
+    # comment to use the official as stored in miniAOD 76
+#    NTupleVariable("Flag_HBHENoiseFilter", lambda ev: ev.hbheFilterNew, help="HBEHE temporary filter decision"),
+#    NTupleVariable("Flag_HBHEIsoNoiseFilter", lambda ev: ev.hbheFilterIso, help="HBEHE isolation temporary filter decision"),
 
    # ----------------------- dedicated met info -------------------------------------------------------------------- #
 

RootTools/python/samples/autoAAAconfig.py

@@ -0,0 +1,16 @@
+def autoAAA(selectedComponents):
+    import re, os
+    from CMGTools.Production import changeComponentAccessMode
+    from CMGTools.Production.localityChecker import LocalityChecker
+    tier2Checker = LocalityChecker("T2_CH_CERN", datasets="/*/*/MINIAOD*")
+    for comp in selectedComponents:
+        if len(comp.files) == 0: print "ERROR, comp %s (dataset %s) has no files!" % (comp.name, getattr(comp,'dataset',None))
+        if not hasattr(comp,'dataset'): continue
+        if not re.match("/[^/]+/[^/]+/MINIAOD(SIM)?", comp.dataset): continue
+        if "/store/" not in comp.files[0]: continue
+        if re.search("/store/(group|user|cmst3)/", comp.files[0]): continue
+        if not tier2Checker.available(comp.dataset):
+            print "Dataset %s is not available, will use AAA" % comp.dataset
+            changeComponentAccessMode.convertComponent(comp, "root://cms-xrd-global.cern.ch/%s")
+            if 'X509_USER_PROXY' not in os.environ or "/afs/" not in os.environ['X509_USER_PROXY']:
+                raise RuntimeError, "X509_USER_PROXY not defined or not pointing to /afs"

TTHAnalysis/python/analyzers/susyCore_modules_cff.py

@@ -67,6 +67,7 @@
     triggerBits = {
         "HBHENoiseFilter" : [ "Flag_HBHENoiseFilter" ],
         "HBHENoiseIsoFilter" : [ "Flag_HBHENoiseIsoFilter" ],
+        "CSCTightHalo2015Filter" : [ "Flag_CSCTightHalo2015Filter" ],
         "CSCTightHaloFilter" : [ "Flag_CSCTightHaloFilter" ],
         "hcalLaserEventFilter" : [ "Flag_hcalLaserEventFilter" ],
         "EcalDeadCellTriggerPrimitiveFilter" : [ "Flag_EcalDeadCellTriggerPrimitiveFilter" ],