Merge pull request #8 from gpetruc/heppy_7_2_2_patch2

Further Heppy bugfixes
gpetruc · Dec 17, 2014 · ac3da0c · ac3da0c
2 parents e7d9209 + 57a85d5
commit ac3da0c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/PhysicsTools/Heppy/python/analyzers/core/TriggerBitAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/core/TriggerBitAnalyzer.py
@@ -1,5 +1,4 @@
 import ROOT
-from ROOT.heppy import TriggerBitChecker
 
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer
 from PhysicsTools.Heppy.analyzers.core.AutoHandle import AutoHandle
@@ -26,7 +25,7 @@ def beginLoop(self, setup):
                 if not hasattr(setup ,"globalVariables") :
                         setup.globalVariables = []
                 setup.globalVariables.append( NTupleVariable(outname, eval("lambda ev: ev.%s" % outname), help="OR of %s"%TL) )
-                self.triggerBitCheckers.append( (T, TriggerBitChecker(trigVec)) )
+                self.triggerBitCheckers.append( (T, ROOT.heppy.TriggerBitChecker(trigVec)) )
 
     def process(self, event):
         self.readCollections( event.input )

diff --git a/PhysicsTools/Heppy/python/analyzers/core/TriggerBitFilter.py b/PhysicsTools/Heppy/python/analyzers/core/TriggerBitFilter.py
@@ -1,5 +1,4 @@
 import ROOT
-from ROOT.heppy import TriggerBitChecker
 
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer
 from PhysicsTools.Heppy.analyzers.core.AutoHandle import AutoHandle
@@ -13,11 +12,11 @@ def __init__(self, cfg_ana, cfg_comp, looperName ):
         vetoTriggers = cfg_comp.vetoTriggers if hasattr(cfg_comp, 'vetoTriggers') else []
         trigVec = ROOT.vector(ROOT.string)()
         for t in triggers: trigVec.push_back(t)
-        self.mainFilter = TriggerBitChecker(trigVec)
+        self.mainFilter = ROOT.heppy.TriggerBitChecker(trigVec)
         if len(vetoTriggers):
             vetoVec = ROOT.vector(ROOT.string)()
             for t in vetoTriggers: vetoVec.push_back(t)
-            self.vetoFilter = TriggerBitChecker(vetoVec)
+            self.vetoFilter = ROOT.heppy.TriggerBitChecker(vetoVec)
         else:
             self.vetoFilter = None 
 

diff --git a/PhysicsTools/Heppy/python/analyzers/objects/all.py b/PhysicsTools/Heppy/python/analyzers/objects/all.py
@@ -1,4 +1,3 @@
-from PhysicsTools.Heppy.analyzers.objects.GeneratorAnalyzer import GeneratorAnalyzer
 from PhysicsTools.Heppy.analyzers.objects.JetAnalyzer import JetAnalyzer
 from PhysicsTools.Heppy.analyzers.objects.LeptonAnalyzer import LeptonAnalyzer
 from PhysicsTools.Heppy.analyzers.objects.METAnalyzer import METAnalyzer

diff --git a/PhysicsTools/HeppyCore/python/framework/heppy.py b/PhysicsTools/HeppyCore/python/framework/heppy.py
@@ -29,9 +29,17 @@ def callBack( result ):
     pass
     print 'production done:', str(result)
 
-def runLoopAsync(comp, outDir, config, options):
-    loop = runLoop( comp, outDir, config, options)
-    return loop.name
+def runLoopAsync(comp, outDir, configName, options):
+    try:
+        loop = runLoop( comp, outDir, copy.copy(sys.modules[configName].config), options)
+        return loop.name
+    except Exception:
+        import traceback
+        print "ERROR processing component %s" % comp.name
+        print comp
+        print "STACK TRACE: "
+        print traceback.format_exc()
+        raise
 
 def runLoop( comp, outDir, config, options):
     fullName = '/'.join( [outDir, comp.name ] )
@@ -123,7 +131,7 @@ def main( options, args ):
         sys.exit(3)
 
     file = open( cfgFileName, 'r' )
-    cfg = imp.load_source( 'cfg', cfgFileName, file)
+    cfg = imp.load_source( 'PhysicsTools.HeppyCore.__cfg_to_run__', cfgFileName, file)
 
     selComps = [comp for comp in cfg.config.components if len(comp.files)>0]
     selComps = split(selComps)
@@ -141,7 +149,7 @@ def main( options, args ):
         import PhysicsTools.HeppyCore.framework.heppy as ML 
         for comp in selComps:
             print 'submitting', comp.name
-            pool.apply_async( ML.runLoopAsync, [comp, outDir, cfg.config, options],
+            pool.apply_async( ML.runLoopAsync, [comp, outDir, 'PhysicsTools.HeppyCore.__cfg_to_run__', options],
                               callback=ML.callBack)
         pool.close()
         pool.join()