Skip to content

Commit 6808ebb

Browse files
authored
LoadMSP (#544)
* fix: prioritized the use of subordinate metadata when choosing between feature level and subordinate level * fix: update to feature map after call to targetedMatching * feat, test: added rawDataHandler member for Library * fix, feat, tests: added LoadMSP and associated tests * fix: matchSpectra requirements for msp * fix: changed getRequirements to getFilenameRequirements * fix: renamed library to spectra library * tests: fixed broken tests * fix: failing UIUtilities_test * fix, tests: updated RawDataHandler pointer logic for spectra_library
1 parent befb9b2 commit 6808ebb

File tree

168 files changed

+866
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+866
-308
lines changed

src/examples/source/SmartPeakGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ int main(int argc, char** argv)
646646
}
647647
else
648648
{
649-
auto requirements = workflow_manager_.getRequirements(buildCommandsFromNames.commands_);
649+
auto requirements = workflow_manager_.getFilenameRequirements(buildCommandsFromNames.commands_);
650650
bool missing_requirement = workflow_manager_.isMissingRequirements(application_handler_.filenames_, requirements);
651651
if (missing_requirement)
652652
{

src/smartpeak/include/SmartPeak/core/ApplicationProcessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace SmartPeak
4848
/* IProcessorDescription */
4949
virtual std::string getDescription() const override { return ""; }
5050
virtual ParameterSet getParameterSchema() const override { return ParameterSet(); };
51-
virtual std::vector<std::string> getRequirements() const override { return {}; };
51+
virtual std::vector<std::string> getFilenameRequirements() const override { return {}; };
5252
virtual std::set<std::string> getInputs() const override { return {}; };
5353
virtual std::set<std::string> getOutputs() const override { return {}; };
5454

src/smartpeak/include/SmartPeak/core/RawDataHandler.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ namespace SmartPeak
132132
const OpenMS::MRMFeatureQC& getFeatureBackgroundEstimations() const;
133133
std::shared_ptr<OpenMS::MRMFeatureQC>& getFeatureBackgroundEstimationsShared();
134134

135+
void setSpectraLibrary(const OpenMS::MSExperiment& library);
136+
void setSpectraLibrary(std::shared_ptr<OpenMS::MSExperiment>& library);
137+
OpenMS::MSExperiment& getSpectraLibrary();
138+
const OpenMS::MSExperiment& getSpectraLibrary() const;
139+
std::shared_ptr<OpenMS::MSExperiment>& getSpectraLibraryShared();
140+
135141
void setFeatureMapHistory(const OpenMS::FeatureMap& feature_map_history);
136142
OpenMS::FeatureMap& getFeatureMapHistory();
137143
const OpenMS::FeatureMap& getFeatureMapHistory() const;
@@ -208,5 +214,6 @@ namespace SmartPeak
208214
std::shared_ptr<OpenMS::MRMFeatureQC> feature_background_qc_ = nullptr; ///< Feature QCs; shared between all raw data handlers in the sequence segment
209215
std::shared_ptr<OpenMS::MRMFeatureQC> feature_rsd_estimations_ = nullptr; ///< Percent RSD estimations; shared between all raw data handlers in the sequence segment
210216
std::shared_ptr<OpenMS::MRMFeatureQC> feature_background_estimations_ = nullptr; ///< Background interference estimations; shared between all raw data handlers in the sequence segment
217+
std::shared_ptr<OpenMS::MSExperiment> spectra_library_; ///< MS data derived from a (spectral) database used for annotation; shared between all raw data handlers in the sequence
211218
};
212219
}

src/smartpeak/include/SmartPeak/core/RawDataProcessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace SmartPeak
4444

4545
/* IProcessorDescription */
4646
virtual ParameterSet getParameterSchema() const override { return ParameterSet(); };
47-
virtual std::vector<std::string> getRequirements() const override { return {}; };
47+
virtual std::vector<std::string> getFilenameRequirements() const override { return {}; };
4848
virtual std::set<std::string> getInputs() const override { return {}; };
4949
virtual std::set<std::string> getOutputs() const override { return {}; };
5050

src/smartpeak/include/SmartPeak/core/RawDataProcessors/CalculateIsotopicPurities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace SmartPeak
3939
virtual std::string getName() const override { return "CALCULATE_MDV_ISOTOPIC_PURITIES"; }
4040
virtual std::string getDescription() const override { return "Calculate MDV Isotopic Purities."; }
4141
virtual ParameterSet getParameterSchema() const override;
42-
virtual std::vector<std::string> getRequirements() const override;
42+
virtual std::vector<std::string> getFilenameRequirements() const override;
4343
virtual std::set<std::string> getOutputs() const override;
4444
virtual std::set<std::string> getInputs() const override;
4545

src/smartpeak/include/SmartPeak/core/RawDataProcessors/CalculateMDVAccuracies.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace SmartPeak
3939
virtual std::string getName() const override { return "CALCULATE_MDV_ACCURACIES"; }
4040
virtual std::string getDescription() const override { return "Compare MDVs to Theoretical"; }
4141
virtual ParameterSet getParameterSchema() const override;
42-
virtual std::vector<std::string> getRequirements() const override;
42+
virtual std::vector<std::string> getFilenameRequirements() const override;
4343
virtual std::set<std::string> getOutputs() const override;
4444
virtual std::set<std::string> getInputs() const override;
4545

src/smartpeak/include/SmartPeak/core/RawDataProcessors/CalculateMDVs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace SmartPeak
3939
virtual std::string getName() const override { return "CALCULATE_MDVS"; }
4040
virtual std::string getDescription() const override { return "Calculate MDVs."; }
4141
virtual ParameterSet getParameterSchema() const override;
42-
virtual std::vector<std::string> getRequirements() const override;
42+
virtual std::vector<std::string> getFilenameRequirements() const override;
4343
virtual std::set<std::string> getOutputs() const override;
4444
virtual std::set<std::string> getInputs() const override;
4545

src/smartpeak/include/SmartPeak/core/RawDataProcessors/CheckFeatures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace SmartPeak
3939
virtual std::string getName() const override { return "CHECK_FEATURES"; }
4040
virtual std::string getDescription() const override { return "Flag and score transitions and transition groups based on a user defined criteria."; }
4141
virtual ParameterSet getParameterSchema() const override;
42-
virtual std::vector<std::string> getRequirements() const override;
42+
virtual std::vector<std::string> getFilenameRequirements() const override;
4343
virtual std::set<std::string> getOutputs() const override;
4444
virtual std::set<std::string> getInputs() const override;
4545

src/smartpeak/include/SmartPeak/core/RawDataProcessors/CheckFeaturesBackgroundInterferences.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace SmartPeak
3939
virtual std::string getName() const override { return "CHECK_FEATURES_BACKGROUND_INTERFERENCES"; }
4040
virtual std::string getDescription() const override { return "Flag and score transitions and transition groups based on a user defined criteria."; }
4141
virtual ParameterSet getParameterSchema() const override;
42-
virtual std::vector<std::string> getRequirements() const override;
42+
virtual std::vector<std::string> getFilenameRequirements() const override;
4343
virtual std::set<std::string> getOutputs() const override;
4444
virtual std::set<std::string> getInputs() const override;
4545

src/smartpeak/include/SmartPeak/core/RawDataProcessors/CheckFeaturesRSDs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace SmartPeak
3939
virtual std::string getName() const override { return "CHECK_FEATURES_RSDS"; }
4040
virtual std::string getDescription() const override { return "Flag and score transitions and transition groups based on a user defined criteria."; }
4141
virtual ParameterSet getParameterSchema() const override;
42-
virtual std::vector<std::string> getRequirements() const override;
42+
virtual std::vector<std::string> getFilenameRequirements() const override;
4343
virtual std::set<std::string> getOutputs() const override;
4444
virtual std::set<std::string> getInputs() const override;
4545

0 commit comments

Comments
 (0)