diff --git a/PhysicsTools/Heppy/python/analyzers/core/JSONAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/core/JSONAnalyzer.py index 5935aa6ca8c29..db3d9a9980c6e 100644 --- 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 index 41b8761354d9e..b92d5fe59b9fa 100644 --- 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 index f52128284e443..7b4b289b969b7 100644 --- 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 index 5b547027cf94f..a66f1eeb7825e 100644 --- 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 index 706b1c5457cd8..885f868e8ce8e 100644 --- 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 index 1025ac22e90d4..4b38c904e00b1 100644 --- 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 index 984e7a2371b6e..41b477fcf6011 100644 --- 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 index 3776adf99cdb4..7c10b4689e5fe 100644 --- 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 index e8da1143d3734..06dc9cf7516cb 100644 --- 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