nmr-processing 8.4.0 → 8.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/xy/xyAutoPeaksPicking.d.ts +3 -8
- package/lib/xy/xyAutoPeaksPicking.js +24 -12
- package/lib/xy/xyAutoPeaksPicking.js.map +1 -1
- package/lib-esm/xy/xyAutoPeaksPicking.js +24 -12
- package/lib-esm/xy/xyAutoPeaksPicking.js.map +1 -1
- package/package.json +8 -8
- package/src/xy/xyAutoPeaksPicking.ts +32 -21
|
@@ -23,15 +23,10 @@ export interface OptionsXYAutoPeaksPicking extends Partial<GetPeakListOptions> {
|
|
|
23
23
|
*/
|
|
24
24
|
thresholdFactor?: number;
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
27
|
-
* @default
|
|
26
|
+
* look for peaks in negative, positive or both sense
|
|
27
|
+
* @default 'positive'
|
|
28
28
|
*/
|
|
29
|
-
|
|
30
|
-
/**
|
|
31
|
-
* If it is true, it check for negative peaks.
|
|
32
|
-
* @default false
|
|
33
|
-
*/
|
|
34
|
-
lookNegative?: boolean;
|
|
29
|
+
direction?: 'negative' | 'positive' | 'both';
|
|
35
30
|
/**
|
|
36
31
|
* If it is true, it calculate the noise level by sanPlot method.
|
|
37
32
|
* @default false
|
|
@@ -4,12 +4,10 @@ exports.xyAutoPeaksPicking = void 0;
|
|
|
4
4
|
const ml_gsd_1 = require("ml-gsd");
|
|
5
5
|
const ml_spectra_processing_1 = require("ml-spectra-processing");
|
|
6
6
|
function xyAutoPeaksPicking(data, options = {}) {
|
|
7
|
-
const { from, to, noiseLevel, thresholdFactor = 3, minMaxRatio = 0.05, broadRatio = 0.00025, useSanPlot = false, smoothY = true, optimize = false, factorLimits = 4, realTopDetection = true, shape = { kind: 'gaussian' }, optimization = { kind: 'lm' }, broadWidth = 0.25, sgOptions = {},
|
|
7
|
+
const { from, to, noiseLevel, thresholdFactor = 3, minMaxRatio = 0.05, broadRatio = 0.00025, useSanPlot = false, smoothY = true, optimize = false, factorLimits = 4, realTopDetection = true, shape = { kind: 'gaussian' }, optimization = { kind: 'lm' }, broadWidth = 0.25, sgOptions = {}, direction = 'positive', } = options;
|
|
8
8
|
const { windowSize = 9, polynomial = 3 } = sgOptions;
|
|
9
9
|
if (data.x.length < windowSize)
|
|
10
10
|
return [];
|
|
11
|
-
if (!lookPositive && !lookNegative)
|
|
12
|
-
return [];
|
|
13
11
|
if (from !== undefined && to !== undefined) {
|
|
14
12
|
data = (0, ml_spectra_processing_1.xyExtract)(data, { zones: [{ from, to }] });
|
|
15
13
|
}
|
|
@@ -28,18 +26,32 @@ function xyAutoPeaksPicking(data, options = {}) {
|
|
|
28
26
|
optimization,
|
|
29
27
|
realTopDetection,
|
|
30
28
|
};
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
29
|
+
switch (direction) {
|
|
30
|
+
case 'positive': {
|
|
31
|
+
return getPeakList(data, getPeakOptions);
|
|
32
|
+
}
|
|
33
|
+
case 'negative': {
|
|
34
|
+
return getNegativePeaks(data, cutOff, getPeakOptions);
|
|
35
|
+
}
|
|
36
|
+
case 'both': {
|
|
37
|
+
return [
|
|
38
|
+
...getPeakList(data, getPeakOptions),
|
|
39
|
+
...getNegativePeaks(data, cutOff, getPeakOptions),
|
|
40
|
+
];
|
|
41
|
+
}
|
|
42
|
+
default: {
|
|
43
|
+
const unHandled = direction;
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
45
|
+
throw Error(`Unknown distribution ${unHandled}`);
|
|
46
|
+
}
|
|
39
47
|
}
|
|
40
|
-
return peaks;
|
|
41
48
|
}
|
|
42
49
|
exports.xyAutoPeaksPicking = xyAutoPeaksPicking;
|
|
50
|
+
function getNegativePeaks(data, cutOff, getPeakOptions) {
|
|
51
|
+
getPeakOptions.noiseLevel = cutOff.negative;
|
|
52
|
+
getPeakOptions.maxCriteria = false;
|
|
53
|
+
return getPeakList(data, getPeakOptions);
|
|
54
|
+
}
|
|
43
55
|
function getPeakList(data, options) {
|
|
44
56
|
const { shape, broadWidth, optimize, maxCriteria, factorLimits, sgOptions, minMaxRatio, broadRatio, noiseLevel, smoothY, optimization, realTopDetection, } = options;
|
|
45
57
|
let peakList = (0, ml_gsd_1.gsd)(data, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyAutoPeaksPicking.js","sourceRoot":"","sources":["../../src/xy/xyAutoPeaksPicking.ts"],"names":[],"mappings":";;;AACA,mCAAgF;AAMhF,iEAI+B;
|
|
1
|
+
{"version":3,"file":"xyAutoPeaksPicking.js","sourceRoot":"","sources":["../../src/xy/xyAutoPeaksPicking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { gsd, optimizePeaks, joinBroadPeaks, appendShapeAndFWHM } from 'ml-gsd';
|
|
2
2
|
import { xyExtract, xNoiseSanPlot, xAbsoluteMedian, } from 'ml-spectra-processing';
|
|
3
3
|
export function xyAutoPeaksPicking(data, options = {}) {
|
|
4
|
-
const { from, to, noiseLevel, thresholdFactor = 3, minMaxRatio = 0.05, broadRatio = 0.00025, useSanPlot = false, smoothY = true, optimize = false, factorLimits = 4, realTopDetection = true, shape = { kind: 'gaussian' }, optimization = { kind: 'lm' }, broadWidth = 0.25, sgOptions = {},
|
|
4
|
+
const { from, to, noiseLevel, thresholdFactor = 3, minMaxRatio = 0.05, broadRatio = 0.00025, useSanPlot = false, smoothY = true, optimize = false, factorLimits = 4, realTopDetection = true, shape = { kind: 'gaussian' }, optimization = { kind: 'lm' }, broadWidth = 0.25, sgOptions = {}, direction = 'positive', } = options;
|
|
5
5
|
const { windowSize = 9, polynomial = 3 } = sgOptions;
|
|
6
6
|
if (data.x.length < windowSize)
|
|
7
7
|
return [];
|
|
8
|
-
if (!lookPositive && !lookNegative)
|
|
9
|
-
return [];
|
|
10
8
|
if (from !== undefined && to !== undefined) {
|
|
11
9
|
data = xyExtract(data, { zones: [{ from, to }] });
|
|
12
10
|
}
|
|
@@ -25,16 +23,30 @@ export function xyAutoPeaksPicking(data, options = {}) {
|
|
|
25
23
|
optimization,
|
|
26
24
|
realTopDetection,
|
|
27
25
|
};
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
switch (direction) {
|
|
27
|
+
case 'positive': {
|
|
28
|
+
return getPeakList(data, getPeakOptions);
|
|
29
|
+
}
|
|
30
|
+
case 'negative': {
|
|
31
|
+
return getNegativePeaks(data, cutOff, getPeakOptions);
|
|
32
|
+
}
|
|
33
|
+
case 'both': {
|
|
34
|
+
return [
|
|
35
|
+
...getPeakList(data, getPeakOptions),
|
|
36
|
+
...getNegativePeaks(data, cutOff, getPeakOptions),
|
|
37
|
+
];
|
|
38
|
+
}
|
|
39
|
+
default: {
|
|
40
|
+
const unHandled = direction;
|
|
41
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
42
|
+
throw Error(`Unknown distribution ${unHandled}`);
|
|
43
|
+
}
|
|
36
44
|
}
|
|
37
|
-
|
|
45
|
+
}
|
|
46
|
+
function getNegativePeaks(data, cutOff, getPeakOptions) {
|
|
47
|
+
getPeakOptions.noiseLevel = cutOff.negative;
|
|
48
|
+
getPeakOptions.maxCriteria = false;
|
|
49
|
+
return getPeakList(data, getPeakOptions);
|
|
38
50
|
}
|
|
39
51
|
function getPeakList(data, options) {
|
|
40
52
|
const { shape, broadWidth, optimize, maxCriteria, factorLimits, sgOptions, minMaxRatio, broadRatio, noiseLevel, smoothY, optimization, realTopDetection, } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xyAutoPeaksPicking.js","sourceRoot":"","sources":["../../src/xy/xyAutoPeaksPicking.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAMhF,OAAO,EACL,SAAS,EACT,aAAa,EACb,eAAe,GAChB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"xyAutoPeaksPicking.js","sourceRoot":"","sources":["../../src/xy/xyAutoPeaksPicking.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAMhF,OAAO,EACL,SAAS,EACT,aAAa,EACb,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAsD/B,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,UAAqC,EAAE;IAEvC,MAAM,EACJ,IAAI,EACJ,EAAE,EACF,UAAU,EACV,eAAe,GAAG,CAAC,EACnB,WAAW,GAAG,IAAI,EAClB,UAAU,GAAG,OAAO,EACpB,UAAU,GAAG,KAAK,EAClB,OAAO,GAAG,IAAI,EACd,QAAQ,GAAG,KAAK,EAChB,YAAY,GAAG,CAAC,EAChB,gBAAgB,GAAG,IAAI,EACvB,KAAK,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,EAC5B,YAAY,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAC7B,UAAU,GAAG,IAAI,EACjB,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,UAAU,GACvB,GAAG,OAAO,CAAC;IAEZ,MAAM,EAAE,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;IAErD,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,UAAU;QAAE,OAAO,EAAE,CAAC;IAE1C,IAAI,IAAI,KAAK,SAAS,IAAI,EAAE,KAAK,SAAS,EAAE;QAC1C,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;KACnD;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC;IAE9E,IAAI,cAAc,GAAuB;QACvC,KAAK;QACL,UAAU;QACV,QAAQ;QACR,YAAY;QACZ,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE;QACrC,WAAW;QACX,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,QAAQ;QAC3B,OAAO;QACP,YAAY;QACZ,gBAAgB;KACjB,CAAC;IAEF,QAAQ,SAAS,EAAE;QACjB,KAAK,UAAU,CAAC,CAAC;YACf,OAAO,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SAC1C;QACD,KAAK,UAAU,CAAC,CAAC;YACf,OAAO,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;SACvD;QACD,KAAK,MAAM,CAAC,CAAC;YACX,OAAO;gBACL,GAAG,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC;gBACpC,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC;aAClD,CAAC;SACH;QACD,OAAO,CAAC,CAAC;YACP,MAAM,SAAS,GAAU,SAAS,CAAC;YACnC,4EAA4E;YAC5E,MAAM,KAAK,CAAC,wBAAwB,SAAS,EAAE,CAAC,CAAC;SAClD;KACF;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAY,EACZ,MAA4B,EAC5B,cAAkC;IAElC,cAAc,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC5C,cAAc,CAAC,WAAW,GAAG,KAAK,CAAC;IACnC,OAAO,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,OAA2B;IAC5D,MAAM,EACJ,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,SAAS,EACT,WAAW,EACX,UAAU,EACV,UAAU,EACV,OAAO,EACP,YAAY,EACZ,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,EAAE;QACvB,SAAS;QACT,WAAW;QACX,WAAW;QACX,UAAU;QACV,OAAO;QACP,gBAAgB;KACjB,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE;QACd,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAAE;YAClC,UAAU;YACV,UAAU;YACV,KAAK;YACL,YAAY;SACb,CAAC,CAAC;KACJ;IAED,IAAI,QAAQ,EAAE;QACZ,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;YACnC,KAAK;YACL,YAAY;YACZ,YAAY;SACb,CAAC,CAAC;KACJ;IAED,OAAO,kBAAkB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,SAAS,CAAC,IAA6B,EAAE,OAAyB;IACzE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAE5D,MAAM,YAAY,GAAG,CAAC,UAAkB,EAAE,EAAE,CAC1C,OAAO,UAAU,KAAK,QAAQ;QAC5B,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE;QACjD,CAAC,CAAC,UAAU,CAAC;IAEjB,IAAI,UAAU,EAAE;QACd,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;KACjC;SAAM;QACL,OAAO,UAAU;YACf,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;YACrD,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;KAC3D;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nmr-processing",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.5.0",
|
|
4
4
|
"description": "Pure functions allowing to process NMR spectra.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -38,12 +38,12 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/cheminfo/nmr-processing#readme",
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@types/jest": "^28.1.
|
|
41
|
+
"@types/jest": "^28.1.6",
|
|
42
42
|
"cheminfo-build": "^1.1.11",
|
|
43
|
-
"cheminfo-types": "^1.
|
|
44
|
-
"eslint": "^8.
|
|
43
|
+
"cheminfo-types": "^1.4.0",
|
|
44
|
+
"eslint": "^8.21.0",
|
|
45
45
|
"eslint-config-cheminfo-typescript": "^11.0.1",
|
|
46
|
-
"jest": "^28.1.
|
|
46
|
+
"jest": "^28.1.3",
|
|
47
47
|
"jest-matcher-deep-close-to": "^3.0.2",
|
|
48
48
|
"md5": "^2.3.0",
|
|
49
49
|
"ml-array-median": "^1.1.6",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"openchemlib": "^7.4.3",
|
|
52
52
|
"prettier": "^2.7.1",
|
|
53
53
|
"rimraf": "^3.0.2",
|
|
54
|
-
"ts-jest": "^28.0.
|
|
54
|
+
"ts-jest": "^28.0.7",
|
|
55
55
|
"typescript": "^4.7.4"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
@@ -74,9 +74,9 @@
|
|
|
74
74
|
"ml-peak-shape-generator": "^4.1.1",
|
|
75
75
|
"ml-simple-clustering": "^0.1.0",
|
|
76
76
|
"ml-sparse-matrix": "^2.1.0",
|
|
77
|
-
"ml-spectra-processing": "^11.
|
|
77
|
+
"ml-spectra-processing": "^11.12.0",
|
|
78
78
|
"ml-tree-set": "^0.1.1",
|
|
79
|
-
"nmr-correlation": "^2.3.
|
|
79
|
+
"nmr-correlation": "^2.3.3",
|
|
80
80
|
"openchemlib-utils": "^1.11.0",
|
|
81
81
|
"spectrum-generator": "^8.0.2"
|
|
82
82
|
}
|
|
@@ -36,6 +36,7 @@ export interface GetPeakListOptions
|
|
|
36
36
|
*/
|
|
37
37
|
optimize: boolean;
|
|
38
38
|
}
|
|
39
|
+
|
|
39
40
|
export interface OptionsXYAutoPeaksPicking extends Partial<GetPeakListOptions> {
|
|
40
41
|
/**
|
|
41
42
|
* Low limit value in the x axis to extract a sub set of points from the input data.
|
|
@@ -51,15 +52,10 @@ export interface OptionsXYAutoPeaksPicking extends Partial<GetPeakListOptions> {
|
|
|
51
52
|
*/
|
|
52
53
|
thresholdFactor?: number;
|
|
53
54
|
/**
|
|
54
|
-
*
|
|
55
|
-
* @default
|
|
56
|
-
*/
|
|
57
|
-
lookPositive?: boolean;
|
|
58
|
-
/**
|
|
59
|
-
* If it is true, it check for negative peaks.
|
|
60
|
-
* @default false
|
|
55
|
+
* look for peaks in negative, positive or both sense
|
|
56
|
+
* @default 'positive'
|
|
61
57
|
*/
|
|
62
|
-
|
|
58
|
+
direction?: 'negative' | 'positive' | 'both';
|
|
63
59
|
/**
|
|
64
60
|
* If it is true, it calculate the noise level by sanPlot method.
|
|
65
61
|
* @default false
|
|
@@ -87,16 +83,13 @@ export function xyAutoPeaksPicking(
|
|
|
87
83
|
optimization = { kind: 'lm' },
|
|
88
84
|
broadWidth = 0.25,
|
|
89
85
|
sgOptions = {},
|
|
90
|
-
|
|
91
|
-
lookNegative = false,
|
|
86
|
+
direction = 'positive',
|
|
92
87
|
} = options;
|
|
93
88
|
|
|
94
89
|
const { windowSize = 9, polynomial = 3 } = sgOptions;
|
|
95
90
|
|
|
96
91
|
if (data.x.length < windowSize) return [];
|
|
97
92
|
|
|
98
|
-
if (!lookPositive && !lookNegative) return [];
|
|
99
|
-
|
|
100
93
|
if (from !== undefined && to !== undefined) {
|
|
101
94
|
data = xyExtract(data, { zones: [{ from, to }] });
|
|
102
95
|
}
|
|
@@ -118,17 +111,35 @@ export function xyAutoPeaksPicking(
|
|
|
118
111
|
realTopDetection,
|
|
119
112
|
};
|
|
120
113
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
114
|
+
switch (direction) {
|
|
115
|
+
case 'positive': {
|
|
116
|
+
return getPeakList(data, getPeakOptions);
|
|
117
|
+
}
|
|
118
|
+
case 'negative': {
|
|
119
|
+
return getNegativePeaks(data, cutOff, getPeakOptions);
|
|
120
|
+
}
|
|
121
|
+
case 'both': {
|
|
122
|
+
return [
|
|
123
|
+
...getPeakList(data, getPeakOptions),
|
|
124
|
+
...getNegativePeaks(data, cutOff, getPeakOptions),
|
|
125
|
+
];
|
|
126
|
+
}
|
|
127
|
+
default: {
|
|
128
|
+
const unHandled: never = direction;
|
|
129
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
130
|
+
throw Error(`Unknown distribution ${unHandled}`);
|
|
131
|
+
}
|
|
124
132
|
}
|
|
133
|
+
}
|
|
125
134
|
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
135
|
+
function getNegativePeaks(
|
|
136
|
+
data: DataXY,
|
|
137
|
+
cutOff: { negative: number },
|
|
138
|
+
getPeakOptions: GetPeakListOptions,
|
|
139
|
+
) {
|
|
140
|
+
getPeakOptions.noiseLevel = cutOff.negative;
|
|
141
|
+
getPeakOptions.maxCriteria = false;
|
|
142
|
+
return getPeakList(data, getPeakOptions);
|
|
132
143
|
}
|
|
133
144
|
|
|
134
145
|
function getPeakList(data: DataXY, options: GetPeakListOptions) {
|