Skip to content

Commit c00b11e

Browse files
replaced os offset method with constant
1 parent 994a800 commit c00b11e

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

Writer/MzMlSpectrumWriter.cs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class MzMlSpectrumWriter : SpectrumWriter
4242
private readonly XmlSerializer cvParamSerializer;
4343
private readonly XmlSerializerNamespaces mzMlNamespace;
4444
private readonly bool doIndexing;
45+
private readonly int osOffset;
4546

4647
private XmlWriter _writer;
4748

@@ -51,6 +52,7 @@ public MzMlSpectrumWriter(ParseInput parseInput) : base(parseInput)
5152
mzMlNamespace = new XmlSerializerNamespaces();
5253
mzMlNamespace.Add(string.Empty, "http://psi.hupo.org/ms/mzml");
5354
doIndexing = ParseInput.OutputFormat == OutputFormat.IndexMzML;
55+
osOffset = System.Environment.NewLine == "\n" ? 0 : 1;
5456
}
5557

5658
/// <inheritdoc />
@@ -271,11 +273,11 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
271273
Writer.Flush();
272274
if (spectrumOffSets.Count != 0)
273275
{
274-
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 6 + GetOsOffset());
276+
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 6 + osOffset);
275277
}
276278
else
277279
{
278-
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 7 + GetOsOffset());
280+
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 7 + osOffset);
279281
}
280282
}
281283

@@ -308,11 +310,11 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
308310
Writer.Flush();
309311
if (chromatogramOffSets.Count != 0)
310312
{
311-
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 6 + GetOsOffset());
313+
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 6 + osOffset);
312314
}
313315
else
314316
{
315-
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 7 + GetOsOffset());
317+
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 7 + osOffset);
316318
}
317319
}
318320

@@ -332,7 +334,7 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
332334
_writer.Flush();
333335
Writer.Flush();
334336

335-
var indexListPosition = Writer.BaseStream.Position + GetOsOffset();
337+
var indexListPosition = Writer.BaseStream.Position + osOffset;
336338

337339
// indexList
338340
_writer.WriteStartElement("indexList");
@@ -441,11 +443,6 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
441443
}
442444
}
443445

444-
private int GetOsOffset()
445-
{
446-
return System.Environment.NewLine == "\n" ? 0 : 1;
447-
}
448-
449446
/// <summary>
450447
/// Populate the instrument configuration list
451448
/// </summary>

0 commit comments

Comments
 (0)