Spectrum index is zero-based.

eclipse-chemclipse · Dec 16, 2021 · 0c9c0b9 · 0c9c0b9
1 parent 7e26ffc
commit 0c9c0b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ipse/chemclipse/msd/converter/supplier/mzml/internal/io/ChromatogramWriterVersion110.java b/...ipse/chemclipse/msd/converter/supplier/mzml/internal/io/ChromatogramWriterVersion110.java
@@ -114,7 +114,7 @@ public void writeChromatogram(File file, IChromatogramMSD chromatogram, IProgres
 				//
 				SpectrumType spectrum = new SpectrumType();
 				spectrum.setId("scan=" + scan.getScanNumber());
-				spectrum.setIndex(BigInteger.valueOf(scan.getScanNumber()));
+				spectrum.setIndex(BigInteger.valueOf((scan.getScanNumber() - 1)));
 				spectrum.setScanList(scanList);
 				spectrum.setBinaryDataArrayList(binaryDataArrayList);
 				IVendorMassSpectrum massSpectrum = (IVendorMassSpectrum)scanMSD;

diff --git a/.../org/eclipse/chemclipse/msd/converter/supplier/mzml/internal/v110/model/SpectrumType.java b/.../org/eclipse/chemclipse/msd/converter/supplier/mzml/internal/v110/model/SpectrumType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2018 Lablicate GmbH.
+ * Copyright (c) 2015, 2021 Lablicate GmbH.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,6 +12,7 @@
 package org.eclipse.chemclipse.msd.converter.supplier.mzml.internal.v110.model;
 
 import java.math.BigInteger;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -32,7 +33,7 @@ public class SpectrumType extends ParamGroupType {
 	@XmlAttribute(name = "spotID")
 	private String spotID;
 	@XmlAttribute(name = "index", required = true)
-	@XmlSchemaType(name = "nonNegativeInteger")
+	@XmlSchemaType(name = "nonNegativeInteger") // zero based
 	private BigInteger index;
 	@XmlAttribute(name = "defaultArrayLength", required = true)
 	private int defaultArrayLength;