Some small cleanups

Author: wcjohns

bindings/python/README.md

@@ -56,8 +56,8 @@ You can install the package using pip like this:
 mkdir my_venv
 python -m venv my_venv
 
-pip install SandiaSpecUtils
 source my_venv/bin/activate
+pip install SandiaSpecUtils
 
 python
 >>> import SpecUtils

bindings/python/SpecFile_py.cpp

@@ -170,10 +170,8 @@ namespace
 
     // Get more data from Python stream
     py::object pyread = python_stream_.attr("read");
-    if (pyread.is_none()){
-      cerr << "PythonInputStreambuf::underflow: pyread is none" << endl;
+    if (pyread.is_none())
       return traits_type::eof();
-    }
 
     // Try to fill our buffer
     py::object py_data = pyread(buffer_size);

bindings/python/tests/test_specutils.py

@@ -16,6 +16,38 @@ def test_load_file(self):
         self.spec.loadFile(file_path, SpecUtils.ParserType.Auto)
         self.assertTrue(self.spec.numMeasurements() > 0)
 
+    def test_load_save_file(self):
+        script_dir = Path(__file__).parent.resolve()
+        file_path = os.path.join(script_dir, "..", "examples", "passthrough.n42")
+
+        orig = SpecUtils.SpecFile()
+        orig.loadFile(file_path, SpecUtils.ParserType.Auto)
+        self.assertTrue(orig.numMeasurements() > 0)
+
+        pcffile = open("passthrough_saved.pcf", "wb")
+        orig.writeToStream(pcffile, orig.sampleNumbers(), orig.detectorNames(), SpecUtils.SaveSpectrumAsType.Pcf )
+        pcffile.close()
+
+        pcfreread = SpecUtils.SpecFile()
+        pcfreread.loadFile("passthrough_saved.pcf", SpecUtils.ParserType.Pcf)
+        self.assertEqual(pcfreread.numMeasurements(), orig.numMeasurements())
+
+        pcfinfile = open("passthrough_saved.pcf", "rb")
+        pcfreread2 = SpecUtils.SpecFile()
+        pcfreread2.loadFromPcf(pcfinfile)
+        self.assertEqual(pcfreread2.numMeasurements(), orig.numMeasurements())
+        pcfinfile.close()
+
+        n42outfile = open("passthrough_saved.n42", "wb")
+        orig.writeToStream(n42outfile, orig.sampleNumbers(), orig.detectorNames(), SpecUtils.SaveSpectrumAsType.N42_2012 )
+        n42outfile.close()
+
+        n42infile = open("passthrough_saved.n42", "rb")
+        n42reread = SpecUtils.SpecFile()
+        n42reread.loadFromN42( n42infile )
+        self.assertEqual(n42reread.numMeasurements(), orig.numMeasurements())
+        n42infile.close()
+
     def test_create_measurement(self):
         # Create and configure a new measurement
         meas = SpecUtils.Measurement()