Merge remote-tracking branch 'jcharkow/feature/oswSpeedUp' into featu…

…re/oswSpeedUp_NEW
jcharkow · Aug 30, 2023 · 019595a · 019595a
2 parents 1801275 + 1610849
commit 019595a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/openms_ci_matrix_full.yml b/.github/workflows/openms_ci_matrix_full.yml
@@ -612,4 +612,4 @@ jobs:
           mkdir -p ~/.ssh/
           echo "$PASS" > ~/.ssh/private.key
           sudo chmod 600 ~/.ssh/private.key
-          rsync --progress -avz -e "ssh -i ~/.ssh/private.key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/* "$USER@$HOST:/knime-plugin/updateSite/$folder"
+          rsync --progress -avz -e "ssh -i ~/.ssh/private.key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/de.openms.update/target/repository/* "$USER@$HOST:/knime-plugin/updateSite/$folder/"
diff --git a/src/openms/include/OpenMS/ANALYSIS/OPENSWATH/DIAHelper.h b/src/openms/include/OpenMS/ANALYSIS/OPENSWATH/DIAHelper.h
@@ -39,8 +39,8 @@
 #include <vector>
 namespace OpenMS
 {
-  class RangeMZ;
-  class RangeMobility;
+  struct RangeMZ;
+  struct RangeMobility;
   class TheoreticalSpectrumGenerator;
   namespace DIAHelpers
   {

diff --git a/src/tests/class_tests/openms/source/OpenSwathScoring_test.cpp b/src/tests/class_tests/openms/source/OpenSwathScoring_test.cpp
@@ -508,7 +508,7 @@ START_SECTION((OpenSwath::SpectrumPtr OpenSwathScoring::fetchSpectrumSwath(std::
       TEST_EQUAL(sp.size(), 1);
       TEST_EQUAL(sp[0]->getMZArray()->data.size(), 3);
       TEST_EQUAL(sp[0]->getIntensityArray()->data.size(), 3);
-      TEST_EQUAL(sp[0]->getDriftTimeArray(), nullptr); // for resampling we do not use IM array
+      TEST_TRUE( (sp[0]->getDriftTimeArray() == nullptr ) ); // for resampling we do not use IM array
 
       TEST_REAL_SIMILAR(sp[0]->getMZArray()->data[0], 102.);
       TEST_REAL_SIMILAR(sp[0]->getMZArray()->data[1], 103.);

diff --git a/src/topp/ProteomicsLFQ.cpp b/src/topp/ProteomicsLFQ.cpp
@@ -1000,8 +1000,8 @@ class ProteomicsLFQ :
     bool missing_spec_ref(false);
     for (const PeptideIdentification & pid : peptide_ids)
     {
-      if (!pid.metaValueExists("spectrum_reference") 
-        || pid.getMetaValue("spectrum_reference").toString().empty()) 
+      if (!pid.metaValueExists(Constants::UserParam::SPECTRUM_REFERENCE)
+        || pid.getMetaValue(Constants::UserParam::SPECTRUM_REFERENCE).toString().empty())
       {          
         missing_spec_ref = true;
         break;