Changeset 13095 for fact/tools/pyscripts/pyfact

Timestamp:

03/14/12 09:07:34 (13 years ago)

Author:

lusterma

Message:

modified class hist for more compatibility with ROOT

File:

• fact/tools/pyscripts/pyfact/hist.py (modified) (5 diffs)

fact/tools/pyscripts/pyfact/hist.py

@@ -10 +10 @@
 
 class histogramList( object ):
-    """ maintain a list of ROOT histograms
-    """
+    """ maintain a list of ROOT histograms """
+
     def __init__( self, name ):
         """ set the name and create empty lists """
@@ -21 +21 @@
         self.book()
 
+    def __call__(self, tag, value):
+        """ fill value in the correct histo """
+
+        self.dict[tag].Fill(value)
+
     def __del__(self):
         for h in self.list:
@@ -54 +59 @@
     Create ROOT histo 
     """
-    def __init__( self, nbins, first, last, name = 'name', title = 'title',
+    def __init__( self, name, title, nbins, first, last, 
                   xtitle = 'x', ytitle = 'y' ):
 
@@ -69 +74 @@
         
     def fill( self, x ):
-        h, b = np.histogram( x, self.nbins, self.first, self.last,
-                             new = True )
+        h, b = np.histogram( x, self.nbins, (self.first,self.last) )
+        self.b = b
         self.y += h
+
+    def __call__(self, x):
+        self.fill(x)
+
 
     def zero( self ):
@@ -81 +90 @@
             self.rh = TH1F( self.name, self.title, self.nbins,
                    self.first, self.last )
-            self.rh.GetXaxis().SetTitle( xtitle );
-            self.rh.GetYaxis().SetTitle( ytitle );
+            self.rh.GetXaxis().SetTitle( self.xtitle );
+            self.rh.GetYaxis().SetTitle( self.ytitle );
 
         for i in range( self.nbins ):