Changes in src/sas/sasgui/plottools/plottables.py [463e7ffc:45dffa69] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/plottools/plottables.py
r463e7ffc r45dffa69 43 43 # Support for ancient python versions 44 44 import copy 45 import numpy 45 import numpy as np 46 46 import sys 47 47 import logging … … 229 229 if p.hidden == True: 230 230 continue 231 if not p.x ==None:231 if p.x is not None: 232 232 for x_i in p.x: 233 if min_value ==None or x_i < min_value:233 if min_value is None or x_i < min_value: 234 234 min_value = x_i 235 if max_value ==None or x_i > max_value:235 if max_value is None or x_i > max_value: 236 236 max_value = x_i 237 237 return min_value, max_value … … 562 562 Returns True if there is no data stored in the plottable 563 563 """ 564 if not self.x == None and len(self.x) == 0 \565 and not self.y == None and len(self.y) == 0:564 if (self.x is not None and len(self.x) == 0 565 and self.y is not None and len(self.y) == 0): 566 566 return True 567 567 return False … … 679 679 # Sanity check 680 680 # Do the transofrmation only when x and y are empty 681 has_err_x = not (dx ==None or len(dx) == 0)682 has_err_y = not (dy ==None or len(dy) == 0)683 684 if(x != None) and (y !=None):685 if not dx ==None and not len(dx) == 0 and not len(x) == len(dx):681 has_err_x = not (dx is None or len(dx) == 0) 682 has_err_y = not (dy is None or len(dy) == 0) 683 684 if(x is not None) and (y is not None): 685 if dx is not None and not len(dx) == 0 and not len(x) == len(dx): 686 686 msg = "Plottable.View: Given x and dx are not" 687 687 msg += " of the same length" … … 693 693 raise ValueError, msg 694 694 695 if not dy ==None and not len(dy) == 0 and not len(y) == len(dy):695 if dy is not None and not len(dy) == 0 and not len(y) == len(dy): 696 696 msg = "Plottable.View: Given y and dy are not of the same " 697 697 msg += "length: len(y)=%s, len(dy)=%s" % (len(y), len(dy)) … … 708 708 self.dy = None 709 709 if not has_err_x: 710 dx = n umpy.zeros(len(x))710 dx = np.zeros(len(x)) 711 711 if not has_err_y: 712 dy = n umpy.zeros(len(y))712 dy = np.zeros(len(y)) 713 713 for i in range(len(x)): 714 714 try: … … 797 797 tempy = [] 798 798 tempdy = [] 799 if self.dx ==None:800 self.dx = n umpy.zeros(len(self.x))801 if self.dy ==None:802 self.dy = n umpy.zeros(len(self.y))799 if self.dx is None: 800 self.dx = np.zeros(len(self.x)) 801 if self.dy is None: 802 self.dy = np.zeros(len(self.y)) 803 803 if self.xLabel == "log10(x)": 804 804 for i in range(len(self.x)): … … 827 827 tempy = [] 828 828 tempdy = [] 829 if self.dx ==None:830 self.dx = n umpy.zeros(len(self.x))831 if self.dy ==None:832 self.dy = n umpy.zeros(len(self.y))829 if self.dx is None: 830 self.dx = np.zeros(len(self.x)) 831 if self.dy is None: 832 self.dy = np.zeros(len(self.y)) 833 833 if self.yLabel == "log10(y)": 834 834 for i in range(len(self.x)): … … 860 860 tempy = [] 861 861 tempdy = [] 862 if self.dx ==None:863 self.dx = n umpy.zeros(len(self.x))864 if self.dy ==None:865 self.dy = n umpy.zeros(len(self.y))866 if xmin != None and xmax !=None:862 if self.dx is None: 863 self.dx = np.zeros(len(self.x)) 864 if self.dy is None: 865 self.dy = np.zeros(len(self.y)) 866 if xmin is not None and xmax is not None: 867 867 for i in range(len(self.x)): 868 868 if self.x[i] >= xmin and self.x[i] <= xmax: … … 1206 1206 """ 1207 1207 """ 1208 if self._chisq ==None:1208 if self._chisq is None: 1209 1209 chisqTxt = r'$\chi^2=$' 1210 1210 else: … … 1230 1230 1231 1231 def sample_graph(): 1232 import numpy as n x1232 import numpy as np 1233 1233 1234 1234 # Construct a simple graph 1235 1235 if False: 1236 x = n x.array([1, 2, 3, 4, 5, 6], 'd')1237 y = n x.array([4, 5, 6, 5, 4, 5], 'd')1238 dy = n x.array([0.2, 0.3, 0.1, 0.2, 0.9, 0.3])1236 x = np.array([1, 2, 3, 4, 5, 6], 'd') 1237 y = np.array([4, 5, 6, 5, 4, 5], 'd') 1238 dy = np.array([0.2, 0.3, 0.1, 0.2, 0.9, 0.3]) 1239 1239 else: 1240 x = n x.linspace(0, 1., 10000)1241 y = n x.sin(2 * nx.pi * x * 2.8)1242 dy = n x.sqrt(100 * nx.abs(y)) / 1001240 x = np.linspace(0, 1., 10000) 1241 y = np.sin(2 * np.pi * x * 2.8) 1242 dy = np.sqrt(100 * np.abs(y)) / 100 1243 1243 data = Data1D(x, y, dy=dy) 1244 1244 data.xaxis('distance', 'm')
Note: See TracChangeset
for help on using the changeset viewer.