Index: /fact/tools/pyscripts/pyfact/extractor.py
===================================================================
--- /fact/tools/pyscripts/pyfact/extractor.py	(revision 12951)
+++ /fact/tools/pyscripts/pyfact/extractor.py	(revision 12952)
@@ -6,18 +6,18 @@
 import numpy as np
 import matplotlib.pyplot as plt
-import * from fir_filter
+#import * from fir_filter
 
 class GlobalMaxFinder(object):
-        """ Pulse Extractor
-            Finds the global maximum in the given window.
-            (Best used with filtered data)
-        """
+    """ Pulse Extractor
+        Finds the global maximum in the given window.
+        (Best used with filtered data)
+    """
     
-    def __init__(self, range=(30,250) , name = 'GlobalMaxFinder'):
+    def __init__(self, min=30, max=250 , name = 'GlobalMaxFinder'):
         """ initialize search Window
         
         """
-        self.min = range[0]
-        self.max = range[1]
+        self.min = min
+        self.max = max
         self.name = name
         
@@ -30,17 +30,17 @@
         s = self.name + '\n'
         s += 'window:\n'
-        s += '(min,max) = (' + self.min + ',' + self.max + ')\n'
+        s += '(min,max) = (' + str(self.min) + ',' + str(self.max) + ')\n'
         return s
 
 
 class FixedWindowIntegrator(object):
-        """ Integrates in a given intergration window
-        """
+    """ Integrates in a given intergration window
+    """
     
-    def __init__(self, range=(55,105) , name = 'FixedWindowIntegrator'):
+    def __init__(self, min=55, max=105 , name = 'FixedWindowIntegrator'):
         """ initialize integration Window
         """
-        self.min = range[0]
-        self.max = range[1]
+        self.min = min
+        self.max = max
         self.name = name
         
@@ -54,6 +54,6 @@
         s = self.name + '\n'
         s += 'window:\n'
-        s += '(min,max) = (' + self.min + ',' + self.max + ')\n'
-        return s
+        s += '(min,max) = (' + str(self.min) + ',' + str(self.max) + ')\n'
+        return s    
 
 class ZeroXing(object):
@@ -65,5 +65,5 @@
         if (slope >= 0):
             self.slope = 1  # search for rising edge crossing
-        else if (slope < 0):
+        elif (slope < 0):
             self.slope = -1 # search for falling edge crossing
         self.name = name
@@ -72,5 +72,5 @@
     def __call__(self, data):
         all_hits = []
-        for pix_data in data
+        for pix_data in data:
             hits = []
             for i in range( data.shape[1] ):
@@ -98,2 +98,13 @@
         return s
 
+
+
+if __name__ == '__main__':
+    """ test the extractors """
+    
+    gmf = GlobalMaxFinder((12,40))
+    print gmf
+    fwi = FixedWindowIntegrator(1,3)
+    print fwi
+    zx = ZeroXing()
+    print zx