Changeset 1023 for trunk/python

Timestamp:

04/19/06 11:43:15 (19 years ago)

Author:

mar637

Message:

The previous histogram plot was mutually exclusive with linestyle, so I am using asapplotbase.hist intead.

Location:

trunk/python

Files:

• asaplotbase.py (modified) (2 diffs)
• asapplotter.py (modified) (3 diffs)

trunk/python/asaplotbase.py

@@ -139 +139 @@
 
 
-    def hist(self, x=None, y=None, fmt=None):
+    def hist(self, x=None, y=None, msk=None, fmt=None, add=None):
         """
         Plot a histogram.  N.B. the x values refer to the start of the
@@ -149 +149 @@
         if x is None:
             if y is None: return
-            x = range(0,len(y))
+            x = range(len(y))
 
         if len(x) != len(y):
             return
-
         l2 = 2*len(x)
-        x2 = range(0,l2)
-        y2 = range(0,l2)
-
-        for i in range(0,l2):
+        x2 = range(l2)
+        y2 = range(l2)
+        m2 = range(l2)
+
+        for i in range(l2):
             x2[i] = x[i/2]
-
-        y2[0] = 0
+            m2[i] = msk[i/2]
+
+        y2[0] = 0.0
         for i in range(1,l2):
             y2[i] = y[(i-1)/2]
 
-        self.plot(x2, y2, fmt)
+        self.plot(x2, y2, m2, fmt, add)
 
 

trunk/python/asapplotter.py

@@ -37 +37 @@
         self._maskselection = None
         self._selection = selector()
-        self._hist = None
-        if rcParams['plotter.histogram']: self._hist = "steps"
-        else: self._hist = "-"
-        
+        self._hist = rcParams['plotter.histogram']
+
     def _translate(self, instr):
         keys = "s b i p t".split()
@@ -272 +270 @@
                          plotter.histogram
         """
-        if hist: self._hist = "steps"
-        else: self._hist = "-"
-        if self._data: self.plot(self._data)
-            
+        self._hist = hist
+        if self._data: self.plot(self._data)
+
     def set_linestyles(self, linestyles):
         """
@@ -478 +475 @@
                         llbl = self._get_label(scan, r, self._stacking, None)
                 self._plotter.set_line(label=llbl)
-                self._plotter.set_line(linestyle=self._hist)
-                self._plotter.plot(x,y,m)
+                plotit = self._plotter.plot
+                if self._hist: plotit = self._plotter.hist
+                plotit(x,y,m)
                 xlim= self._minmaxx or [min(x),max(x)]
                 allxlim += xlim