Changeset 1134 for trunk/python/asapfitter.py

Timestamp:

08/14/06 14:13:10 (18 years ago)

Author:

mar637

Message:

added numpy/numarray detection

File:

• trunk/python/asapfitter.py (modified) (4 diffs)

trunk/python/asapfitter.py

@@ -2 +2 @@
 from asap import rcParams
 from asap import print_log
+from asap import NUM
 
 class fitter:
@@ -41 +42 @@
         self.y = ydat
         if mask == None:
-            from numarray import ones
-            self.mask = ones(len(xdat))
+            self.mask = NUM.ones(len(xdat))
         else:
             self.mask = mask
@@ -65 +65 @@
         self.mask = None
         if mask is None:
-            from numarray import ones
-            self.mask = ones(self.data.nchan())
+            self.mask = NUM.ones(self.data.nchan())
         else:
             self.mask = mask
@@ -202 +201 @@
         if self.fitfunc == "gauss" and component is not None:
             if not self.fitted and sum(self.fitter.getparameters()) == 0:
-                from numarray import zeros
-                pars = list(zeros(len(self.components)*3))
-                fxd = list(zeros(len(pars)))
+                pars = list(NUM.zeros(len(self.components)*3))
+                fxd = list(NUM.zeros(len(pars)))
             else:
                 pars = list(self.fitter.getparameters())