Merge pull request #204 from BCDA-APS/203-N-number_columns

#N is the number of data columns

Author: prjemian

CHANGES.rst

@@ -4,8 +4,10 @@
 Change History
 ##############
 
-:1.1.9:  release *tba* : updates
+:1.1.9:  release expected *2019-07-28* : updates & bug fix
 
+    * `#203 <https://github.com/BCDA-APS/apstools/issues/203>`_
+       `SpecWriterCallback`: `#N` is number of data columns
     * `#199 <https://github.com/BCDA-APS/apstools/issues/199>`_
        `spec2ophyd` handle CNTPAR:read_misc_1
 

apstools/filewriters.py

@@ -431,7 +431,7 @@ def prepare_scan_contents(self):
             # "#MD" is our ad hoc SPEC data tag
             lines.append(f"#MD {k} = {v}")
 
-        lines.append("#N " + str(self.num_primary_data))
+        lines.append("#N " + str(len(self.data.keys())))
         if len(self.data.keys()) > 0:
             lines.append("#L " + "  ".join(self.data.keys()))
             for i in range(self.num_primary_data):

tests/test_filewriter.py

@@ -6,6 +6,7 @@
 import json
 import os
 import shutil
+import spec2nexus
 import sys
 import tempfile
 import unittest
@@ -107,6 +108,17 @@ def test_writer_default_name(self):
         self.assertTrue(
             os.path.exists(specwriter.spec_filename), 
             "data file created")
+
+        sdf = spec2nexus.spec.SpecDataFile(specwriter.spec_filename)
+        self.assertEqual(len(sdf.headers), 1)
+        self.assertEqual(len(sdf.scans), 1)
+
+        # check that the #N line is written properly (issue #203)
+        scans = sdf.getScanNumbers()
+        self.assertNotIn(108, scans)
+        self.assertIn("108", scans)
+        scan = sdf.getScan(108)
+        self.assertEqual(scan.N[0], len(scan.L))
 
     def test_writer_filename(self):
         self.assertTrue(len(self.db) > 0, "test data ready")

tests/test_utils.py

@@ -121,7 +121,8 @@ def test_print_RE_md(self):
             '========= ================================',
             ''
             ]
-        self.assertEqual(str(received), str(expected))
+        for r, e in zip(received, expected):
+            self.assertEqual(r, e)
 
     def test_pairwise(self):
         items = [1.0, 1.1, 1.01, 1.001, 1.0001, 1.00001, 2]