- close wiff file after using spectra in test harness

pwiz/data/msdata/MSData.hpp

@@ -745,7 +745,9 @@ class PWIZ_API_DECL SpectrumList
     // (as with msconvert's --ignoreCalibrationScans flag)
     virtual bool calibrationSpectraAreOmitted() const;
 
-    virtual ~SpectrumList(){} 
+    virtual ~SpectrumList(){}
+
+    virtual void close(){}
 };
 
 

pwiz/data/vendor_readers/ABI/Reader_ABI.cpp

@@ -290,6 +290,8 @@ void Reader_ABI::readIds(const string& filename,
         vector<string> sampleNames = wifffile->getSampleNames();
         for (vector<string>::iterator it = sampleNames.begin(); it != sampleNames.end(); it++)
             results.push_back(*it);
+
+        wifffile->close();
     }
     catch (std::exception& e)
     {

pwiz/data/vendor_readers/ABI/SpectrumList_ABI.cpp

@@ -82,6 +82,10 @@ PWIZ_API_DECL size_t SpectrumList_ABI::find(const string& id) const
     return scanItr->second;
 }
 
+PWIZ_API_DECL void SpectrumList_ABI::close()
+{
+    wifffile_->close();
+}
 
 PWIZ_API_DECL SpectrumPtr SpectrumList_ABI::spectrum(size_t index, bool getBinaryData) const
 {

pwiz/data/vendor_readers/ABI/SpectrumList_ABI.hpp

@@ -47,6 +47,7 @@ class PWIZ_API_DECL SpectrumList_ABI : public SpectrumListBase
     virtual size_t size() const;
     virtual const SpectrumIdentity& spectrumIdentity(size_t index) const;
     virtual size_t find(const std::string& id) const;
+    virtual void close();
     virtual SpectrumPtr spectrum(size_t index, bool getBinaryData) const;
     virtual SpectrumPtr spectrum(size_t index, DetailLevel detailLevel) const;
     virtual SpectrumPtr spectrum(size_t index, bool getBinaryData, const pwiz::util::IntegerSet& msLevelsToCentroid) const;

pwiz/utility/misc/VendorReaderTestHarness.cpp

@@ -549,6 +549,8 @@ void testRead(const Reader& reader, const string& rawpath, const bfs::path& pare
             if (msd_reverse.run.chromatogramListPtr.get())
                 for (size_t j = 0, end = msd_reverse.run.chromatogramListPtr->size(); j < end; ++j)
                     msd_reverse.run.chromatogramListPtr->chromatogram(end - j - 1);
+
+            msd_reverse.run.spectrumListPtr->close();
         }
 
     // no unicode test for HTTP paths

pwiz_aux/msrc/utility/vendor_api/ABI/WiffFileTest.cpp

@@ -154,6 +154,7 @@ void test(const string& rawpath)
             cout << "Full data enumeration: " << bpt::to_simple_string(stop - start) << endl;
         }
     }
+    wiffFile->close();
 }