Changeset 12897 for fact/tools/pyscripts

Timestamp:

02/16/12 21:32:52 (13 years ago)

Author:

lusterma

Message:

updated fbsl2.py to work with pyfact_rename instead of pyfact

File:

• fact/tools/pyscripts/tools/fbsl2.py (modified) (6 diffs)

fact/tools/pyscripts/tools/fbsl2.py

@@ -6 +6 @@
 import numpy as np
 
-import pyfact
-from   myhisto import *
-from   hist    import *
+from pyfact_rename import RawData
+from myhisto import *
+from hist    import *
 
 class  baseline_ana( object):
     """
     """
-    def __init__( self, rfiles = {}, step = 500, bsl_corr = True,
-                  max_events = -1 ):
+    def __init__(self, rfiles={}, step=500, bsl_corr=True, max_events=-1):
         """
         rfiles   : dictionary of strings : run file names
@@ -31 +30 @@
         else:
             print "baseline analysing data: "
-            rfiles.info()
+            #rfiles.info()
+            for key in rfiles.names.keys():
+                print key, rfiles.names[key]
 
         self.rfiles   = rfiles
@@ -42 +43 @@
             print 'no baseline correction'
 
-
         # create the object providing the rawdata
-        self.rd = pyfact.rawdata( rfiles.names['data'], rfiles.names['drscal'] )
-        self.npix    = self.rd.NPIX
+        self.rd = RawData(rfiles.names['data'], rfiles.names['drscal'])
+        self.npix = self.rd.npix
         
         if max_events == -1:
@@ -93 +93 @@
         for ev in range( first, last ):
             if ev%100 == 0: print 'Event', ev
-            self.rd.next()
+            self.rd.next_event()
             # rd.CorrectBaseline()
-            hist.fillall( self.rd.acalData )
+            hist.fillall( self.rd.acal_data )
                 
                 
@@ -152 +152 @@
         self.pixhist.SetBinContent()
 
-        self.loopPixel( self.rd.NPIX, self.pixhist )
+        self.loopPixel( self.rd.npix, self.pixhist )
 
 
@@ -170 +170 @@
 
     """
-    runfiles = pyfact.fnames()
+    runfiles = pyfact.fnames(zipped = False)
 
     runfiles.info()