Changeset 1283 for tags/Release2.1.1b/python/asapfitter.py

Timestamp:

11/06/06 12:10:26 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #88 - removed use of numpy/numarray except for plotting where it is used via matplotlib.numerix

File:

• tags/Release2.1.1b/python/asapfitter.py (modified) (4 diffs)

tags/Release2.1.1b/python/asapfitter.py

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