Merge pull request #894 from BCDA-APS/892-landscape-or-portrait

Write tables of plot statistics in most compact form

CHANGES.rst

@@ -43,6 +43,7 @@ Maintenance
 -----------
 
 * Move ``.OVAL`` field from ``EpicsRecordOutputFields to new ``EpicsRecordAnalogOutputFields``
+* Write tables of plot statistics in most compact form.
 
 1.6.17
 ******

apstools/callbacks/scan_signal_statistics.py

@@ -155,16 +155,30 @@ def report(self):
             return
         keys = "n centroid sigma x_at_max_y max_y min_y mean_y stddev_y".split()
         table = pyRestTable.Table()
-        table.labels = ["detector"] + keys
-        for yname, stats in self._registers.items():
-            row = [yname]
+        if len(keys) <= len(self._registers):
+            # statistics in the column labels
+            table.labels = ["detector"] + keys
+            for yname, stats in self._registers.items():
+                row = [yname]
+                for k in keys:
+                    try:
+                        v = getattr(stats, k)
+                    except ZeroDivisionError:
+                        v = 0
+                    row.append(v)
+                table.addRow(row)
+        else:
+            # signals in the column labels
+            table.labels = ["statistic"] + list(self._registers)
             for k in keys:
-                try:
-                    v = getattr(stats, k)
-                except ZeroDivisionError:
-                    v = 0
-                row.append(v)
-            table.addRow(row)
+                row = [k]
+                for stats in self._registers.values():
+                    try:
+                        v = getattr(stats, k)
+                    except ZeroDivisionError:
+                        v = 0
+                    row.append(v)
+                table.addRow(row)
         print(f"Motor: {self._x_name}")
         print(table)