Changeset 12896

Timestamp:

02/16/12 21:07:48 (13 years ago)

Author:

lusterma

Message:

corrections to pyfact coding style

File:

• fact/tools/pyscripts/pyfact/pyfact_rename.py (modified) (12 diffs)

fact/tools/pyscripts/pyfact/pyfact_rename.py

@@ -113 +113 @@
         self.maxAmp = None
 
-
     def next_event(self):
         """ load the next event from disk and calibrate it
@@ -122 +121 @@
         self.calibrate_drs_amplitude()
 
-        
     def calibrate_drs_amplitude(self):
         """ perform the drs amplitude calibration of the event data
@@ -137 +135 @@
         tom = np.reshape(self.tom, (self.npix, 1024) )
         gm  = np.reshape(self.gm,  (self.npix, 1024) )
-        
-        # print 'acal Data ', acal_data.shape
-        # print 'blm shape ', blm.shape
-        # print 'gm shape  ', gm.shape
         
         for pixel in range( self.npix ):
@@ -174 +168 @@
         
     def filter_CFD(self, length=10, ratio=0.75):
-        """ constant fraction filter
+        """ constant fraction discriminator (implemented as FIR)
         
         using:
@@ -184 +178 @@
         
         if self.data_saverage_out == None:
-            print ('error pyfact.filter_CFD was called without
-            prior call to filter_sliding_average')
-            print ' variable self.data_saverage_out is needed '
-            pass
-
+            print """error pyfact.filter_CFD was called without
+            prior call to filter_sliding_average
+            variable self.data_saverage_out is needed
+            """
+            
         data_CFD_out = self.data_saverage_out.copy()
         b = np.zeros(length)
@@ -256 +250 @@
 
         try:
-            f = TFile( file )
+            f = TFile(file)
         except:
             print 'Baseline data file could not be read: ', file
             return
         
-        h = f.Get( bsl_hist )
-
-        for i in range( self.npix ):
-            self.v_bsl[i] = h.GetBinContent( i+1 )
+        h = f.Get(bsl_hist)
+
+        for i in range(self.npix):
+            self.v_bsl[i] = h.GetBinContent(i+1)
 
         f.Close()
-
         
     def baseline_correct(self):
@@ -274 +267 @@
         """
         
-        for pixel in range( self.npix ):
+        for pixel in range(self.npix):
             self.acal_data[pixel,:] -= self.v_bsl[pixel]
-            
-        
+                    
     def info(self):
         """ print run information
@@ -296 +288 @@
     """
     
-    def __init__( self, specifier = ['012', '023', '2011', '11', '24'],
+    def __init__(self, specifier = ['012', '023', '2011', '11', '24'],
                  rpath = '/scratch_nfs/res/bsl/',
                  zipped = True):
@@ -305 +297 @@
         rpath     : directory path for the results; YYYYMMDD will be appended to rpath
         zipped    : use zipped (True) or unzipped (Data) 
-        """
+
+        """
+        
         self.specifier = specifier
         self.rpath     = rpath
@@ -311 +305 @@
         
         self.make( self.specifier, self.rpath, self.zipped )
-    # end of def __init__
+
 
     def make( self, specifier, rpath, zipped ):
@@ -352 +346 @@
         self.results = self.names['results']
 
-    # end of make
-
     def info( self ):
         """ print complete filenames
@@ -363 +355 @@
         print 'drs-cal: ', self.names['drscal']
         print 'results: ', self.names['results']
-    # end of def info
 
 # end of class definition: fnames( object )
 
-
-
-class histogramList( object ):
-
-    def __init__( self, name ):
-        """ set the name and create empty lists """
-        self.name  = name         # name of the list
-        self.list  = []           # list of the histograms
-        self.dict  = {}           # dictionary of histograms
-        self.hList = TObjArray()  # list a la ROOT of the histograms
-
-    def add( self, tag, h ):
-        self.list.append( h )
-        self.dict[tag] = h
-        self.hList.Add( h )
-
-
-class pixelHisto1d ( object ):
-
-    def __init__( self, name, title, Nbin, first, last, xtitle, ytitle, npix ):
-        """
-        book one dimensional histograms for each pixel
-        """
-        self.name = name
-
-        self.list = [ x for x in range( npix ) ]
-        self.hList = TObjArray()
-
-        for pixel in range( npix ):
-
-            hname  = name + ' ' + str( pixel )
-            htitle = title + ' ' + str( pixel )
-            self.list[pixel] = TH1F( hname, htitle, Nbin, first, last )
-
-            self.list[pixel].GetXaxis().SetTitle( xtitle )
-            self.list[pixel].GetYaxis().SetTitle( ytitle )
-            self.hList.Add( self.list[pixel] )
-
-# simple test method
 if __name__ == '__main__':
     """