Changeset 654 for sans/utils/bt5/bt5plot2/BT5DataSet.py

Timestamp:

Mar 30, 2010 7:12:31 PM (13 years ago)

Author:

ajj

Message:

Fixes to handle errorbars

File:

• sans/utils/bt5/bt5plot2/BT5DataSet.py (modified) (14 diffs)

sans/utils/bt5/bt5plot2/BT5DataSet.py

@@ -158 +158 @@
                 xdata.append(mval)
                 ydata.append(data[mval][1] + data[mval][2] + data[mval][4] + data[mval][5] + data[mval][6])
-                yerror.append(math.sqrt(ydata[len(ydata)-1]))
+                if (ydata[len(ydata)-1] == 0):
+                    yerror.append(0)
+                else:
+                    yerror.append(math.sqrt(ydata[len(ydata)-1]))
             
             axes.set_ylabel("Counts")
@@ -164 +167 @@
                 self.plot = axes.errorbar(xdata,ydata,yerror,None,'bo', picker=5)
             else:
-                self.plot = axes.plot(xdata,ydata,'bo',picker=5)
+                self.plot = axes.errorbar(xdata,ydata,None,None,'bo', picker=5)
                 
         elif plottype == 'rate':
@@ -182 +185 @@
                 for mval in mvals:
                     ydata.append((data[mval][1] + data[mval][2] + data[mval][4] + data[mval][5] + data[mval][6]) / cnttime)
-                    yerror.append(math.sqrt(ydata[len(ydata)-1])/math.sqrt(cnttime))
+                    if (ydata[len(ydata)-1] == 0):
+                        yerror.append(0)
+                    else:
+                        yerror.append(math.sqrt(ydata[len(ydata)-1])/math.sqrt(cnttime))
                     axes.set_ylabel("Counts/second")
             else:
@@ -189 +195 @@
                 for mval in mvals:
                     ydata.append((data[mval][1] + data[mval][2] + data[mval][4] + data[mval][5] + data[mval][6]) / cnttime)
-                    yerror.append(math.sqrt(ydata[len(ydata)-1])/math.sqrt(cnttime))
+                    if (ydata[len(ydata)-1] == 0):
+                        yerror.append(0)
+                    else:
+                        yerror.append(math.sqrt(ydata[len(ydata)-1])/math.sqrt(cnttime))
                     axes.set_ylabel("Counts/Monitor Count")
             
@@ -195 +204 @@
                 self.plot = axes.errorbar(xdata,ydata,yerror,None,'bo', picker=5)
             else:
-                self.plot = axes.plot(xdata,ydata,'bo',picker=5) 
+                self.plot = axes.errorbar(xdata,ydata,None,None,'bo', picker=5)
+
+            print xdata
+            print ydata
+            print yerror
                 
         elif plottype == 'trans':
@@ -207 +220 @@
                 xdata.append(mval)
                 ydata.append(data[mval][3])
-                yerror.append(math.sqrt(ydata[len(ydata)-1]))
+                if (ydata[len(ydata)-1] == 0):
+                    yerror.append(0)
+                else:
+                    yerror.append(math.sqrt(ydata[len(ydata)-1]))
 
             axes.set_ylabel("Transmission Detector Counts")
@@ -213 +229 @@
                 self.plot = axes.errorbar(xdata,ydata,yerror,None,'bo', picker=5)
             else:
-                self.plot = axes.plot(xdata,ydata,'bo',picker=5) 
+                self.plot = axes.errorbar(xdata,ydata,None,None,'bo', picker=5)
             
          
@@ -232 +248 @@
                 self.plot = axes.errorbar(xdata,ydata,yerror,None,'bo', picker=5)
             else:
-                self.plot = axes.plot(xdata,ydata,'bo',picker=5)             
+                self.plot = axes.errorbar(xdata,ydata,None,None,'bo', picker=5)
              
         elif plottype == 'split':
@@ -270 +286 @@
                              axes.errorbar(xdata,ydata5,yerror5,None, 'o')) 
             else:
-                 self.plot = axes.plot(xdata,ydata1, 'o',
-                                      xdata,ydata2, 'o',
-                                      xdata,ydata3, 'o',
-                                      xdata,ydata4, 'o',
-                                      xdata,ydata5, 'o')   
+                self.plot = (axes.errorbar(xdata,ydata1,None,None, 'o'),
+                             axes.errorbar(xdata,ydata2,None,None, 'o'),
+                             axes.errorbar(xdata,ydata3,None,None, 'o'),
+                             axes.errorbar(xdata,ydata4,None,None, 'o'),
+                             axes.errorbar(xdata,ydata5,None,None, 'o')) 
             
         elif plottype == 'nrate':
@@ -291 +307 @@
             for mval in mvals:
                  ydata.append((data[mval][1] + data[mval][2] + data[mval][4] + data[mval][5] + data[mval][6]) / (data[mval][0]/1e6))
-                 yerror.append(math.sqrt(ydata[len(ydata)-1])/math.sqrt(data[mval][0]/1e6))
+                 if (ydata[len(ydata)-1] == 0):
+                     yerror.append(0)
+                 else:
+                     yerror.append(math.sqrt(ydata[len(ydata)-1])/math.sqrt(data[mval][0]/1e6))
 
             axes.set_ylabel("Counts / (10^6 Monitor Counts)")
@@ -297 +316 @@
                 self.plot = axes.errorbar(xdata,ydata,yerror,None,'bo', picker=5)
             else:
-                self.plot = axes.plot(xdata,ydata,'bo',picker=5)               
+                self.plot = axes.errorbar(xdata,ydata,None,None,'bo', picker=5)
  
  
@@ -304 +323 @@
     def remove_plot(self):
 
-        #AJJ 10/26/09
-        #This is frankly hideous. Surely there is a better way for me 
-        #to iterate through the contents of self.plot
-        #print self.plot
-        #print type(self.plot[0]).__name__
-        #Is it a plot with errorbars?
+        #Is it a plot with errorbars?
         if type(self.plot[0]) is tuple:
-            #print "Split plot with errorbars"
+            #split plot
             for splot in self.plot:
                 splot[0].remove()
@@ -318 +332 @@
                 for linec in splot[2]:
                     linec.remove()
-        elif type(self.plot[0]).__name__ == 'Line2D' and type(self.plot[1]).__name__ == 'Line2D':
-            #print "Split plot without errorbars"
-            for splot in self.plot:
-                splot.remove()
-        elif type(self.plot[0]).__name__ == 'Line2D':
-            #print "Plot with errorbars"
+        else:
+            #normal plot
             for line in self.plot[0:1]:
                 axes = line.get_axes()
@@ -331 +341 @@
             for linec in self.plot[2]:
                 linec.remove()
-        else:
-            for line in self.plot:
-                axes = line.get_axes()
-                axes.lines.remove(line)