Skip to content

-update Sciex Data API to 1.5.1.391 (May 2024) #3269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
david-cox-sciex wants to merge 42 commits into from
Closed

-update Sciex Data API to 1.5.1.391 (May 2024) #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
b2e99d2
-update Sciex Data API to 1.5.1.391 (May 2024)
david-cox-sciex Dec 9, 2024
c9c9d33
-update Sciex Data API to 3.1.1611.798 (test version Dec 13, 2024)
david-cox-sciex Dec 16, 2024
33e0755
Merge branch 'master' into master
david-cox-sciex Dec 16, 2024
042a9ea
- close wiff file after using spectra in test harness
david-cox-sciex Dec 17, 2024
8397716
- close wiff file non-MSVC after using spectra in test harness
david-cox-sciex Dec 17, 2024
c0c4e5e
Merge branch 'master' into master
david-cox-sciex Dec 18, 2024
08830df
- latest Data API build
david-cox-sciex Dec 18, 2024
227989e
- close handled by desctructor in SpectrumList and ChromatogramList
david-cox-sciex Dec 18, 2024
ade4df7
- close wiff file non-MSVC in destructor
david-cox-sciex Dec 18, 2024
4d9a3f2
- close wiff file non-MSVC in destructor
david-cox-sciex Dec 18, 2024
7d0f9e9
- close wiff file non-MSVC in destructor
david-cox-sciex Dec 18, 2024
1b61f74
- close wiff file non-MSVC in destructor
david-cox-sciex Dec 18, 2024
2699a64
Merge branch 'master' into master
david-cox-sciex Dec 19, 2024
3e09ed9
Merge branch 'master' into master
david-cox-sciex Dec 19, 2024
89a1ab7
Merge branch 'master' into master
david-cox-sciex Dec 20, 2024
d39da9a
Merge branch 'master' into master
david-cox-sciex Jan 2, 2025
1ed6337
Merge branch 'master' into master
david-cox-sciex Jan 2, 2025
959282d
- trigger garbage collect in WiffFile2 destructor to prevent file locks
david-cox-sciex Jan 2, 2025
7b7e7e1
Merge branch 'master' of https://github.com/david-cox-sciex/pwiz
david-cox-sciex Jan 2, 2025
70f1193
Merge branch 'master' into master
david-cox-sciex Jan 2, 2025
05e7850
- define logging config to prevent default logging which is creating …
david-cox-sciex Jan 3, 2025
c92a340
- define logging config in reader test to prevent default logging whi…
david-cox-sciex Jan 3, 2025
9d37b11
Revert "- define logging config in reader test to prevent default log…
david-cox-sciex Jan 3, 2025
7a546cf
Revert "- define logging config to prevent default logging which is c…
david-cox-sciex Jan 3, 2025
23fc820
Merge branch 'master' into master
david-cox-sciex Jan 3, 2025
0e6b147
- Sciex Data API with logging assemblies embedded for configurable lo…
david-cox-sciex Jan 7, 2025
1237a7f
Merge branch 'master' into master
david-cox-sciex Jan 7, 2025
964bcb3
Revert "- Sciex Data API with logging assemblies embedded for configu…
david-cox-sciex Jan 7, 2025
c26f9d3
Merge branch 'master' into master
david-cox-sciex Jan 8, 2025
69ba568
Merge branch 'master' into master
david-cox-sciex Jan 9, 2025
14d98db
Merge branch 'master' into master
david-cox-sciex Jan 9, 2025
02a2f40
Merge branch 'master' into master
david-cox-sciex Jan 10, 2025
6998e1e
Merge branch 'master' into master
david-cox-sciex Jan 20, 2025
4c15d37
Merge branch 'master' into master
david-cox-sciex Feb 4, 2025
7f6713d
Merge branch 'master' into master
david-cox-sciex Feb 12, 2025
fad1afe
Merge branch 'master' into master
david-cox-sciex Feb 28, 2025
f4096ed
Merge branch 'master' into master
nickshulman Feb 13, 2026
206e39e
- update with latest Data API release
david-cox-sciex Feb 18, 2026
b572533
Merge branch 'master' into master
david-cox-sciex Feb 18, 2026
087fb61
Merge branch 'master' into master
david-cox-sciex Feb 18, 2026
a8d787c
- change test file to match new DataAPI values for SWATH isolation wi…
david-cox-sciex Feb 18, 2026
40114eb
Merge branch 'master' into master
david-cox-sciex Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pwiz/data/msdata/MSData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ class PWIZ_API_DECL SpectrumList
// (as with msconvert's --ignoreCalibrationScans flag)
virtual bool calibrationSpectraAreOmitted() const;

virtual ~SpectrumList(){}
virtual ~SpectrumList(){}
};


Expand Down
2 changes: 1 addition & 1 deletion pwiz/data/vendor_readers/ABI/ChromatogramList_ABI.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class PWIZ_API_DECL ChromatogramList_ABI : public ChromatogramListBase
virtual size_t find(const std::string& id) const;
virtual ChromatogramPtr chromatogram(size_t index, bool getBinaryData) const;
virtual ChromatogramPtr chromatogram(size_t index, DetailLevel detailLevel) const;

#ifdef PWIZ_READER_ABI
ChromatogramList_ABI(const MSData& msd, WiffFilePtr wifffile, const ExperimentsMap& experimentsMap, int sample, const Reader::Config& config);

Expand Down
Loading