Browse code

Add MS_filter_string to spectrum/scanList/scan instead of spectrum/

Sebastian Gibb authored on 24/11/2017 11:32:37
Showing 1 changed files

... ...
@@ -674,6 +674,10 @@ void RcppPwiz::addSpectrumList(MSData& msd,
674 674
       if (ionInjectionTime[i] > 0)
675 675
 	spct_scan.set(MS_ion_injection_time, ionInjectionTime[i], UO_minute);
676 676
     }
677
+
678
+    if (!Rcpp::StringVector::is_na(filterString[i]))
679
+      spct_scan.set(MS_filter_string, filterString[i]);
680
+
677 681
     // MSn - precursor:
678 682
     if (precursorScanNum[i] > 0 | precursorMZ[i] > 0) {
679 683
       // Fill precursor data. This preserves the precursor data even if the
... ...
@@ -731,9 +735,6 @@ void RcppPwiz::addSpectrumList(MSData& msd,
731 735
       spct_ints->data[j] = ints_vals[j];
732 736
     spct.binaryDataArrayPtrs.push_back(spct_ints);
733 737
     spct.defaultArrayLength = spct_mz->data.size();
734
-
735
-    if (!Rcpp::StringVector::is_na(filterString[i]))
736
-      spct.set(MS_filter_string, filterString[i]);
737 738
   }
738 739
 }
739 740