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

Timestamp:

Mar 30, 2010 5:02:35 PM (13 years ago)

Author:

ajj

Message:

Various fixes. Remove some debug output, display motor value on click.

File:

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

sans/utils/bt5/bt5plot2/BT5DataSet.py

@@ -13 +13 @@
         self.alignvals = {}
         self.alignvalstring = ''
+        self.scanmot = ''
 
         if (self.fileName != None):
@@ -21 +22 @@
         '''
         Takes a filename and returns a dictionary of the detector values
-        keyed by varying value (ususally A2 or A5)
-        '''
-    
-        if usans.isBT5Data(fileName):
+        keyed by varying value (usually A2 or A5)
+        '''
+    
+        if usans.isBT5Data(fileName) == 1:
     
             motlist = []
@@ -54 +55 @@
             self.metadata['motorvals'] = motlist
         
+            self.scanmot = inputdata[12].split()[0]
+        
             for index in range(13, len(inputdata), 2):
                 self.detdata[float(inputdata[index].split()[0])] = inputdata[index + 1].split(',')    
@@ -62 +65 @@
     
             inputfile.close()
-
-
+                    
     
     
@@ -103 +105 @@
         self.alignvals['Monitor'] = self.detdata[motorval][0]
         self.alignvals['Sum/Monitor'] = float(self.alignvals['Sum'])/float(self.alignvals['Monitor'])
-          
-        self.alignvalstring = "#4: "+repr(self.alignvals['Central'])
-        self.alignvalstring += "      Trans: "+repr(self.alignvals['Trans'])
-        self.alignvalstring += "      Sum: "+repr(self.alignvals['Sum'])
-        self.alignvalstring += "      MCR: "+repr(self.alignvals['Monitor'])
-        self.alignvalstring += "      Sum/MCR: %5.3f" % self.alignvals['Sum/Monitor']
+        
+        self.alignvalstring = self.scanmot+": %5.2f" % motorval  
+        self.alignvalstring += "   #4: "+repr(self.alignvals['Central'])
+        self.alignvalstring += "   Trans: "+repr(self.alignvals['Trans'])
+        self.alignvalstring += "\nSum: "+repr(self.alignvals['Sum'])
+        self.alignvalstring += "   MCR: "+repr(self.alignvals['Monitor'])
+        self.alignvalstring += "   Sum/MCR: %5.3f" % self.alignvals['Sum/Monitor']
     
     def maxDetCount(self, detector):
@@ -304 +307 @@
         #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__
+        #print self.plot
+        #print type(self.plot[0]).__name__
         #Is it a plot with errorbars?
         if type(self.plot[0]) is tuple:
-            print "Split plot with errorbars"
+            #print "Split plot with errorbars"
             for splot in self.plot:
                 splot[0].remove()
@@ -316 +319 @@
                     linec.remove()
         elif type(self.plot[0]).__name__ == 'Line2D' and type(self.plot[1]).__name__ == 'Line2D':
-            print "Split plot without errorbars"
+            #print "Split plot without errorbars"
             for splot in self.plot:
                 splot.remove()
         elif type(self.plot[0]).__name__ == 'Line2D':
-            print "Plot with errorbars"
+            #print "Plot with errorbars"
             for line in self.plot[0:1]:
                 axes = line.get_axes()