fix: fix new width in broad singlet peak (#117)

* fix: fix new width in broad singlet peak

* chore: reduce code in gsd

Author: jobo322

package.json

@@ -81,6 +81,6 @@
     "ml-peak-shape-generator": "^4.1.2",
     "ml-savitzky-golay-generalized": "^4.0.1",
     "ml-spectra-fitting": "^4.2.1",
-    "ml-spectra-processing": "^12.0.0"
+    "ml-spectra-processing": "^14.0.0"
   }
 }

src/gsd.ts

@@ -4,9 +4,8 @@ import { sgg, SGGOptions } from 'ml-savitzky-golay-generalized';
 import {
   xIsEquallySpaced,
   xIsMonotonic,
-  xMinValue,
-  xMaxValue,
   xNoiseStandardDeviation,
+  xMinMaxValues,
 } from 'ml-spectra-processing';
 
 import { GSDPeak } from './GSDPeak';
@@ -79,7 +78,7 @@ export function gsd(data: DataXY, options: GSDOptions = {}): GSDPeakID[] {
 
   // If the max difference between delta x is less than 5%, then,
   // we can assume it to be equally spaced variable
-  let equallySpaced = xIsEquallySpaced(x);
+  const equallySpaced = xIsEquallySpaced(x);
 
   if (noiseLevel === undefined) {
     if (equallySpaced) {
@@ -109,50 +108,25 @@ export function gsd(data: DataXY, options: GSDOptions = {}): GSDPeakID[] {
     }
   }
 
-  let yData = y;
-  let dY, ddY;
-  const { windowSize, polynomial } = sgOptions;
+  const xValue = equallySpaced ? x[1] - x[0] : x;
 
-  if (equallySpaced) {
-    if (smoothY) {
-      yData = sgg(y, x[1] - x[0], {
-        windowSize,
-        polynomial,
+  const yData = smoothY
+    ? sgg(y, xValue, {
+        ...sgOptions,
         derivative: 0,
-      });
-    }
-    dY = sgg(y, x[1] - x[0], {
-      windowSize,
-      polynomial,
-      derivative: 1,
-    });
-    ddY = sgg(y, x[1] - x[0], {
-      windowSize,
-      polynomial,
-      derivative: 2,
-    });
-  } else {
-    if (smoothY) {
-      yData = sgg(y, x, {
-        windowSize,
-        polynomial,
-        derivative: 0,
-      });
-    }
-    dY = sgg(y, x, {
-      windowSize,
-      polynomial,
-      derivative: 1,
-    });
-    ddY = sgg(y, x, {
-      windowSize,
-      polynomial,
-      derivative: 2,
-    });
-  }
+      })
+    : y;
+
+  const dY = sgg(y, xValue, {
+    ...sgOptions,
+    derivative: 1,
+  });
+  const ddY = sgg(y, xValue, {
+    ...sgOptions,
+    derivative: 2,
+  });
 
-  const minY = xMinValue(yData);
-  const maxY = xMaxValue(yData);
+  const { min: minY, max: maxY } = xMinMaxValues(yData);
 
   if (minY > maxY || minY === maxY) return [];
 

src/post/joinBroadPeaks.ts

@@ -100,7 +100,9 @@ export function joinBroadPeaks<T extends GSDPeakOptionalShape>(
               id: generateID(),
               x: broadLines[maxI].x,
               y: max,
-              width: candidates.x[0] - candidates.x[candidates.x.length - 1],
+              width: Math.abs(
+                candidates.x[candidates.x.length - 1] - candidates.x[0],
+              ),
             },
           ],
           { shape, optimization },