setup provided to Analyzer.write

gpetruc · Dec 4, 2014 · 7b1dd89 · 7b1dd89
1 parent 850aa69
commit 7b1dd89
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/PhysicsTools/Heppy/python/analyzers/core/JSONAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/core/JSONAnalyzer.py
@@ -71,7 +71,7 @@ def process(self, event):
             return False
 
 
-    def write(self):
-        super(JSONAnalyzer, self).write()
+    def write(self, setup):
+        super(JSONAnalyzer, self).write(setup)
         self.rltInfo.write( self.dirName )
 
diff --git a/PhysicsTools/Heppy/python/analyzers/core/PileUpAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/core/PileUpAnalyzer.py
@@ -141,7 +141,7 @@ def process(self, iEvent, event):
         self.averages['vertexWeight'].add( event.vertexWeight )
         return True
 
-    def write(self):
-        super(PileUpAnalyzer, self).write()
+    def write(self, setup):
+        super(PileUpAnalyzer, self).write(setup)
         if self.cfg_comp.isMC and self.doHists:
             self.rawmcpileup.write()
diff --git a/PhysicsTools/Heppy/python/analyzers/core/TreeAnalyzerNumpy.py b/PhysicsTools/Heppy/python/analyzers/core/TreeAnalyzerNumpy.py
@@ -28,7 +28,7 @@ def declareVariables(self):
         print 'TreeAnalyzerNumpy.declareVariables : overload this function.'
         pass
 
-    def write(self):
-        super(TreeAnalyzerNumpy, self).write()
+    def write(self, setup):
+        super(TreeAnalyzerNumpy, self).write(setup)
         self.file.Write() 
 
diff --git a/PhysicsTools/Heppy/python/analyzers/examples/MetAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/examples/MetAnalyzer.py
@@ -78,5 +78,5 @@ def process(self, iEvent, event):
 
 
 
-##     def write(self):
-##         super(MetAnalyzer, self).write()
+##     def write(self, setup):
+##         super(MetAnalyzer, self).write(setup)
diff --git a/PhysicsTools/Heppy/python/analyzers/examples/TriggerAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/examples/TriggerAnalyzer.py
@@ -94,9 +94,9 @@ def process(self, iEvent, event):
         event.TriggerFired = 1
         return True
 
-    def write(self):
+    def write(self, setup):
         print 'writing TriggerAnalyzer'
-        super(TriggerAnalyzer, self).write()
+        super(TriggerAnalyzer, self).write(setup)
         self.triggerList.write( self.dirName )
 
     def __str__(self):

diff --git a/PhysicsTools/Heppy/python/analyzers/objects/VertexAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/objects/VertexAnalyzer.py
@@ -152,8 +152,8 @@ def mindist(self, vertices):
                 mindist = dist
         return mindist
 
-    def write(self):
-        super(VertexAnalyzer, self).write()
+    def write(self, setup):
+        super(VertexAnalyzer, self).write(setup)
         if self.doHists:
             self.pileup.write()
 

diff --git a/PhysicsTools/HeppyCore/python/analyzers/SimpleTreeProducer.py b/PhysicsTools/HeppyCore/python/analyzers/SimpleTreeProducer.py
@@ -17,7 +17,7 @@ def process(self, event):
         self.tree.fill('test_variable', event.input.var1)
         self.tree.tree.Fill()
 
-    def write(self):
+    def write(self, setup):
         self.rootfile.Write()
         self.rootfile.Close()
 
diff --git a/PhysicsTools/HeppyCore/python/framework/analyzer.py b/PhysicsTools/HeppyCore/python/framework/analyzer.py
@@ -64,7 +64,7 @@ def process(self, event ):
         print self.cfg_ana.name
 
 
-    def write(self):
+    def write(self, setup):
         """Called by Looper.write, for all analyzers.
         Just overload it if you have histograms to write."""
         self.counters.write( self.dirName )

diff --git a/PhysicsTools/HeppyCore/python/framework/looper.py b/PhysicsTools/HeppyCore/python/framework/looper.py
@@ -179,7 +179,7 @@ def write(self):
         See Analyzer.Write for more information.
         """
         for analyzer in self.analyzers:
-            analyzer.write()
+            analyzer.write(self.setup)
         self.setup.close() 
         pass