Skip to content

Commit f48de28

Browse files
committed
fix(optimizer): fix output and include original indexs
1 parent 65ded75 commit f48de28

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

src/post/joinBroadPeaks.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function joinBroadPeaks(peakList, options = {}) {
2323
broadLines.push({ x: Number.MAX_VALUE });
2424

2525
let candidates = [[broadLines[0].x, broadLines[0].y]];
26-
let indexes = [0];
26+
let indexes = [broadLines[0].index];
2727

2828
for (let i = 1; i < broadLines.length; i++) {
2929
// console.log(broadLines[i-1].x+" "+broadLines[i].x);
@@ -33,7 +33,7 @@ export function joinBroadPeaks(peakList, options = {}) {
3333
max = broadLines[i].y;
3434
maxI = i;
3535
}
36-
indexes.push(i);
36+
indexes.push(broadLines[i].index);
3737
count++;
3838
} else {
3939
if (count > 2) {
@@ -49,6 +49,9 @@ export function joinBroadPeaks(peakList, options = {}) {
4949
x: parameters[0],
5050
y: parameters[1],
5151
width: parameters[2],
52+
index: Math.floor(
53+
indexes.reduce((a, b) => a + b, 0) / indexes.length,
54+
),
5255
soft: false,
5356
});
5457
} else {

src/post/optimizePeaks.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,14 @@ export function optimizePeaks(peakList, x, y, options = {}) {
4848
);
4949
}
5050
}
51+
5152
for (let j = 0; j < optPeaks.length; j++) {
53+
let { parameters } = optPeaks[j];
5254
result.push({
53-
x: optPeaks[j][0][0],
54-
y: optPeaks[j][1][0],
55-
width: optPeaks[j][2][0] * factor,
55+
x: parameters[0],
56+
y: parameters[1],
57+
width: parameters[2] * factor,
58+
index: peaks[j].index,
5659
});
5760
}
5861
}
@@ -84,11 +87,13 @@ export function optimizePeaks(peakList, x, y, options = {}) {
8487
);
8588
}
8689
}
90+
8791
let { parameters } = fitResult;
8892
result.push({
8993
x: parameters[0],
9094
y: parameters[1],
9195
width: parameters[2] * factor,
96+
index: peaks.index,
9297
}); // From https://en.wikipedia.org/wiki/Gaussian_function#Properties}
9398
}
9499
}

0 commit comments

Comments
 (0)