@@ -23,10 +23,13 @@ def simulation(fasta, contaminants, out, out_cntm,
2323
2424 subprocess .call ([simulator , '-in' , fasta , '-out' , out , '-out_cntm' ,out_cntm ,
2525 '-algorithm:MSSim:RawSignal:contaminants:file' , contaminants ,
26+ '-algorithm:MSSim:RawSignal:noise:detector:stddev' , '1' ,
27+ '-algorithm:MSSim:RawSignal:resolution:value' , '5000' ,
28+ '-algorithm:MSSim:RawSignal:resolution:type' , 'constant' ,
2629 '-algorithm:MSSim:Ionization:mz:lower_measurement_limit' , '10' ,
2730 '-algorithm:MSSim:Ionization:mz:upper_measurement_limit' , '1000' ,
2831 '-algorithm:MSSim:RT:total_gradient_time' , '1000' ,
29- '-algorithm:MSSim:RT:sampling_rate' , '0.1 ' ,
32+ '-algorithm:MSSim:RT:sampling_rate' , '0.25 ' ,
3033 '-algorithm:MSSim:RT:scan_window:min' , '0' ,
3134 '-algorithm:MSSim:RT:scan_window:max' , '1000' ])
3235
@@ -148,22 +151,13 @@ def match_features(ground_truths, df):
148151 subprocess .call ([peak_picker ,'-in' , 'MM48_MSS_Profile.mzML' ,
149152 '-out' , 'MM48_MSS.mzML' ])
150153
151- data2mzxml ('./ ' )
154+ data2mzxml ('MM48_MSS.mzML ' )
152155
153156 ground_truths = parse_featureXML_GT ('MM48_MSS.featureXML' )
154157
155158 mzfile = "MM48_MSS.mzxml"
156159 mzMLfile = "MM48_MSS.mzML"
157160
158- tic ()
159- parser = mzXMLParser ()
160- lcms = parser .parseFile (mzfile .encode (sys .getfilesystemencoding ()))
161- pics_c = pm .FPICs (lcms , 10.0 , 200.0 , 0.5 )
162- toc ()
163-
164- match_fpic = ground_truths .copy ()
165- match_features (match_fpic , pics2df (pics_c ))
166- match_fpic .detected .value_counts ()
167161
168162 tic ()
169163 feature_map = FeatureFindingMetabo (mzMLfile )
@@ -183,5 +177,15 @@ def match_features(ground_truths, df):
183177 match_xcms = ground_truths .copy ()
184178 match_features (match_xcms , df_xcms )
185179 match_xcms .detected .value_counts ()
180+
181+ tic ()
182+ parser = mzXMLParser ()
183+ lcms = parser .parseFile (mzfile .encode (sys .getfilesystemencoding ()))
184+ pics_c = pm .FPICs (lcms , 10.0 , 200.0 , 0.5 )
185+ toc ()
186+ match_fpic = ground_truths .copy ()
187+ df_fpic = pics2df (pics_c )
188+ match_features (match_fpic , df_fpic )
189+ match_fpic .detected .value_counts ()
186190
187191
0 commit comments