nmr-processing 8.2.0 → 8.3.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/apodization/apodization.d.ts +22 -0
- package/lib/apodization/apodization.js +18 -0
- package/lib/apodization/apodization.js.map +1 -0
- package/lib/apodization/applyWindow.d.ts +28 -0
- package/lib/apodization/applyWindow.js +20 -0
- package/lib/apodization/applyWindow.js.map +1 -0
- package/lib/apodization/compose.d.ts +23 -0
- package/lib/apodization/compose.js +25 -0
- package/lib/apodization/compose.js.map +1 -0
- package/lib/apodization/getFunction.d.ts +2 -0
- package/lib/apodization/getFunction.js +18 -0
- package/lib/apodization/getFunction.js.map +1 -0
- package/lib/apodization/shapes/WindowFunctions.d.ts +12 -0
- package/lib/apodization/shapes/WindowFunctions.js +3 -0
- package/lib/apodization/shapes/WindowFunctions.js.map +1 -0
- package/lib/apodization/shapes/exponential.d.ts +11 -0
- package/lib/apodization/shapes/exponential.js +10 -0
- package/lib/apodization/shapes/exponential.js.map +1 -0
- package/lib/apodization/shapes/lorentzToGauss.d.ts +26 -0
- package/lib/apodization/shapes/lorentzToGauss.js +15 -0
- package/lib/apodization/shapes/lorentzToGauss.js.map +1 -0
- package/lib/apodization/utils/getData.d.ts +4 -0
- package/lib/apodization/utils/getData.js +21 -0
- package/lib/apodization/utils/getData.js.map +1 -0
- package/lib/assignment/utils/buildAssignments.d.ts +2 -2
- package/lib/assignment/utils/exploreTreeRec.js +1 -1
- package/lib/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib/databases/DatabaseNMREntry.d.ts +2 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib/peaks/peaksToRanges.js +1 -1
- package/lib/peaks/peaksToRanges.js.map +1 -1
- package/lib/peaks/solventSuppression.d.ts +4 -1
- package/lib/peaks/solventSuppression.js +10 -7
- package/lib/peaks/solventSuppression.js.map +1 -1
- package/lib/peaks/util/jAnalyzer.js +23 -29
- package/lib/peaks/util/jAnalyzer.js.map +1 -1
- package/lib/peaks/util/peakOptimizer.js +12 -16
- package/lib/peaks/util/peakOptimizer.js.map +1 -1
- package/lib/prediction/predictAllSpectra.js +7 -9
- package/lib/prediction/predictAllSpectra.js.map +1 -1
- package/lib/prediction/predictCarbon.js +1 -1
- package/lib/prediction/predictCarbon.js.map +1 -1
- package/lib/prediction/utils/queryByHOSE.js +1 -1
- package/lib/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib/ranges/rangesToACS.js +8 -4
- package/lib/ranges/rangesToACS.js.map +1 -1
- package/lib/signals/simulation/getPauliMatrix.js.map +1 -1
- package/lib/signals/simulation/splitSpinSystem.js +11 -13
- package/lib/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib/utilities/rangeFromSignal.d.ts +9 -5
- package/lib/utilities/rangeFromSignal.js +7 -7
- package/lib/utilities/rangeFromSignal.js.map +1 -1
- package/lib/utilities/resurrectRange.js +4 -7
- package/lib/utilities/resurrectRange.js.map +1 -1
- package/lib-esm/apodization/apodization.js +14 -0
- package/lib-esm/apodization/apodization.js.map +1 -0
- package/lib-esm/apodization/applyWindow.js +16 -0
- package/lib-esm/apodization/applyWindow.js.map +1 -0
- package/lib-esm/apodization/compose.js +21 -0
- package/lib-esm/apodization/compose.js.map +1 -0
- package/lib-esm/apodization/getFunction.js +14 -0
- package/lib-esm/apodization/getFunction.js.map +1 -0
- package/lib-esm/apodization/shapes/WindowFunctions.js +2 -0
- package/lib-esm/apodization/shapes/WindowFunctions.js.map +1 -0
- package/lib-esm/apodization/shapes/exponential.js +6 -0
- package/lib-esm/apodization/shapes/exponential.js.map +1 -0
- package/lib-esm/apodization/shapes/lorentzToGauss.js +11 -0
- package/lib-esm/apodization/shapes/lorentzToGauss.js.map +1 -0
- package/lib-esm/apodization/utils/getData.js +17 -0
- package/lib-esm/apodization/utils/getData.js.map +1 -0
- package/lib-esm/assignment/utils/buildAssignments.js +3 -3
- package/lib-esm/assignment/utils/exploreTreeRec.js +1 -1
- package/lib-esm/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js +3 -3
- package/lib-esm/index.js +2 -0
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/peaks/peaksToRanges.js +1 -1
- package/lib-esm/peaks/peaksToRanges.js.map +1 -1
- package/lib-esm/peaks/solventSuppression.js +10 -7
- package/lib-esm/peaks/solventSuppression.js.map +1 -1
- package/lib-esm/peaks/util/jAnalyzer.js +23 -29
- package/lib-esm/peaks/util/jAnalyzer.js.map +1 -1
- package/lib-esm/peaks/util/peakOptimizer.js +12 -16
- package/lib-esm/peaks/util/peakOptimizer.js.map +1 -1
- package/lib-esm/prediction/predictAllSpectra.js +7 -9
- package/lib-esm/prediction/predictAllSpectra.js.map +1 -1
- package/lib-esm/prediction/predictCarbon.js +1 -1
- package/lib-esm/prediction/predictCarbon.js.map +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js +1 -1
- package/lib-esm/prediction/utils/queryByHOSE.js.map +1 -1
- package/lib-esm/ranges/rangesToACS.js +8 -4
- package/lib-esm/ranges/rangesToACS.js.map +1 -1
- package/lib-esm/signals/simulation/getPauliMatrix.js.map +1 -1
- package/lib-esm/signals/simulation/splitSpinSystem.js +11 -13
- package/lib-esm/signals/simulation/splitSpinSystem.js.map +1 -1
- package/lib-esm/utilities/rangeFromSignal.js +7 -7
- package/lib-esm/utilities/rangeFromSignal.js.map +1 -1
- package/lib-esm/utilities/resurrectRange.js +4 -7
- package/lib-esm/utilities/resurrectRange.js.map +1 -1
- package/package.json +13 -13
- package/src/apodization/apodization.ts +34 -0
- package/src/apodization/applyWindow.ts +51 -0
- package/src/apodization/compose.ts +47 -0
- package/src/apodization/getFunction.ts +15 -0
- package/src/apodization/shapes/WindowFunctions.ts +14 -0
- package/src/apodization/shapes/exponential.ts +16 -0
- package/src/apodization/shapes/lorentzToGauss.ts +41 -0
- package/src/apodization/utils/getData.ts +15 -0
- package/src/assignment/utils/buildAssignments.ts +4 -4
- package/src/assignment/utils/exploreTreeRec.ts +1 -1
- package/src/assignment/utils/getAssignment/buildAssignments.ts +3 -3
- package/src/databases/DatabaseNMREntry.ts +3 -0
- package/src/index.ts +3 -0
- package/src/peaks/peaksToRanges.ts +1 -1
- package/src/peaks/solventSuppression.ts +13 -8
- package/src/peaks/util/jAnalyzer.ts +22 -28
- package/src/peaks/util/peakOptimizer.ts +11 -15
- package/src/prediction/predictAllSpectra.ts +6 -8
- package/src/prediction/predictCarbon.ts +1 -1
- package/src/prediction/utils/queryByHOSE.ts +1 -1
- package/src/ranges/rangesToACS.ts +9 -10
- package/src/signals/simulation/getPauliMatrix.ts +1 -1
- package/src/signals/simulation/splitSpinSystem.ts +10 -12
- package/src/utilities/rangeFromSignal.ts +19 -11
- package/src/utilities/resurrectRange.ts +4 -7
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { DoubleArray } from 'cheminfo-types';
|
|
2
|
+
import { ShapeOptions } from './compose';
|
|
3
|
+
export interface DataReIm {
|
|
4
|
+
/** Array of re values */
|
|
5
|
+
re: DoubleArray;
|
|
6
|
+
/** Array of im values */
|
|
7
|
+
im: DoubleArray;
|
|
8
|
+
}
|
|
9
|
+
interface ApodizationOptions {
|
|
10
|
+
/**
|
|
11
|
+
* number of points at the end of the shape to apply the window function inverted
|
|
12
|
+
* @default 0
|
|
13
|
+
*/
|
|
14
|
+
pointsToShift?: number;
|
|
15
|
+
compose: ShapeOptions;
|
|
16
|
+
}
|
|
17
|
+
export declare function apodization(data: DataReIm, options: ApodizationOptions): {
|
|
18
|
+
re: DoubleArray;
|
|
19
|
+
im: DoubleArray;
|
|
20
|
+
windowData: Float64Array;
|
|
21
|
+
};
|
|
22
|
+
export {};
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.apodization = void 0;
|
|
4
|
+
const applyWindow_1 = require("./applyWindow");
|
|
5
|
+
const compose_1 = require("./compose");
|
|
6
|
+
function apodization(data, options) {
|
|
7
|
+
const { compose: composeOptions, pointsToShift } = options;
|
|
8
|
+
const windowData = (0, compose_1.compose)(composeOptions);
|
|
9
|
+
const applyWindowOptions = {
|
|
10
|
+
windowData,
|
|
11
|
+
pointsToShift,
|
|
12
|
+
};
|
|
13
|
+
const re = (0, applyWindow_1.applyWindow)(data.re, applyWindowOptions);
|
|
14
|
+
const im = (0, applyWindow_1.applyWindow)(data.im, applyWindowOptions);
|
|
15
|
+
return { re, im, windowData };
|
|
16
|
+
}
|
|
17
|
+
exports.apodization = apodization;
|
|
18
|
+
//# sourceMappingURL=apodization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apodization.js","sourceRoot":"","sources":["../../src/apodization/apodization.ts"],"names":[],"mappings":";;;AAEA,+CAA4C;AAC5C,uCAAkD;AAiBlD,SAAgB,WAAW,CAAC,IAAc,EAAE,OAA2B;IACrE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC3D,MAAM,UAAU,GAAG,IAAA,iBAAO,EAAC,cAAc,CAAC,CAAC;IAE3C,MAAM,kBAAkB,GAAG;QACzB,UAAU;QACV,aAAa;KACd,CAAC;IAEF,MAAM,EAAE,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;IAEpD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC;AAChC,CAAC;AAbD,kCAaC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { DoubleArray } from 'cheminfo-types';
|
|
2
|
+
export interface ApplyWindowOptions {
|
|
3
|
+
/**
|
|
4
|
+
* data of a window function it should be scaled to max = 1 to ensure compatibility with new apodizations.
|
|
5
|
+
*/
|
|
6
|
+
windowData: DoubleArray;
|
|
7
|
+
/**
|
|
8
|
+
* Start Location for Applying Apodize Window
|
|
9
|
+
*/
|
|
10
|
+
start?: number;
|
|
11
|
+
/**
|
|
12
|
+
* length of the window function
|
|
13
|
+
*/
|
|
14
|
+
length?: number;
|
|
15
|
+
/**
|
|
16
|
+
* number of points at the end of the shape to apply the window function inverted
|
|
17
|
+
* @default 0
|
|
18
|
+
*/
|
|
19
|
+
pointsToShift?: number;
|
|
20
|
+
/**
|
|
21
|
+
* output array
|
|
22
|
+
*/
|
|
23
|
+
output?: DoubleArray;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* pure function that applies a window function to the input data.
|
|
27
|
+
*/
|
|
28
|
+
export declare function applyWindow(data: DoubleArray, options: ApplyWindowOptions): DoubleArray;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyWindow = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* pure function that applies a window function to the input data.
|
|
6
|
+
*/
|
|
7
|
+
function applyWindow(data, options) {
|
|
8
|
+
const dataLength = data.length;
|
|
9
|
+
const { windowData, start = 0, length = dataLength, pointsToShift = 0, output = new Float64Array(data), } = options;
|
|
10
|
+
const firstEndPoint = Math.min(start + length, dataLength - pointsToShift);
|
|
11
|
+
for (let i = start, j = 0; i < firstEndPoint; i++) {
|
|
12
|
+
output[i] *= windowData[j++];
|
|
13
|
+
}
|
|
14
|
+
for (let i = dataLength - 1, j = 0; i > dataLength - pointsToShift - 1; i--) {
|
|
15
|
+
output[i] *= windowData[j++];
|
|
16
|
+
}
|
|
17
|
+
return output;
|
|
18
|
+
}
|
|
19
|
+
exports.applyWindow = applyWindow;
|
|
20
|
+
//# sourceMappingURL=applyWindow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"applyWindow.js","sourceRoot":"","sources":["../../src/apodization/applyWindow.ts"],"names":[],"mappings":";;;AA0BA;;GAEG;AACH,SAAgB,WAAW,CAAC,IAAiB,EAAE,OAA2B;IACxE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAE/B,MAAM,EACJ,UAAU,EACV,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,UAAU,EACnB,aAAa,GAAG,CAAC,EACjB,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,GAChC,GAAG,OAAO,CAAC;IAEZ,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC;IAC3E,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE;QACjD,MAAM,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;KAC9B;IAED,KAAK,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,GAAG,aAAa,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3E,MAAM,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;KAC9B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,kCAqBC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { WindowFunctions } from './shapes/WindowFunctions';
|
|
2
|
+
interface ShapeToAdd {
|
|
3
|
+
/**
|
|
4
|
+
* Start Location for Applying Apodize Window
|
|
5
|
+
*/
|
|
6
|
+
start?: number;
|
|
7
|
+
/**
|
|
8
|
+
* parameters of the shape plus the kind of shape to identify
|
|
9
|
+
*/
|
|
10
|
+
shape: WindowFunctions;
|
|
11
|
+
}
|
|
12
|
+
export interface ShapeOptions {
|
|
13
|
+
/**
|
|
14
|
+
* length of the window shape
|
|
15
|
+
*/
|
|
16
|
+
length: number;
|
|
17
|
+
/**
|
|
18
|
+
* parameters of the shape plus the kind of shape to identify
|
|
19
|
+
*/
|
|
20
|
+
shapes?: ShapeToAdd[];
|
|
21
|
+
}
|
|
22
|
+
export declare function compose(shapeOptions: ShapeOptions): Float64Array;
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.compose = void 0;
|
|
4
|
+
const applyWindow_1 = require("./applyWindow");
|
|
5
|
+
const getFunction_1 = require("./getFunction");
|
|
6
|
+
const getData_1 = require("./utils/getData");
|
|
7
|
+
function compose(shapeOptions) {
|
|
8
|
+
const { length: dataLength, shapes = [] } = shapeOptions;
|
|
9
|
+
let data = new Float64Array(dataLength).fill(1);
|
|
10
|
+
shapes.forEach((options) => {
|
|
11
|
+
const { shape, start = 0 } = options;
|
|
12
|
+
const { options: shapeOptions } = shape;
|
|
13
|
+
const length = 'length' in shapeOptions ? shapeOptions.length : dataLength - start;
|
|
14
|
+
const windowData = (0, getData_1.getData)((0, getFunction_1.getFunction)(shape), length);
|
|
15
|
+
(0, applyWindow_1.applyWindow)(data, {
|
|
16
|
+
windowData,
|
|
17
|
+
length,
|
|
18
|
+
start,
|
|
19
|
+
output: data,
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
return data;
|
|
23
|
+
}
|
|
24
|
+
exports.compose = compose;
|
|
25
|
+
//# sourceMappingURL=compose.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/apodization/compose.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,+CAA4C;AAE5C,6CAA0C;AAyB1C,SAAgB,OAAO,CAAC,YAA0B;IAChD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,YAAY,CAAC;IACzD,IAAI,IAAI,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;QACrC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;QACxC,MAAM,MAAM,GACV,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QAEtE,MAAM,UAAU,GAAG,IAAA,iBAAO,EAAC,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;QACvD,IAAA,yBAAW,EAAC,IAAI,EAAE;YAChB,UAAU;YACV,MAAM;YACN,KAAK;YACL,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAlBD,0BAkBC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getFunction = void 0;
|
|
4
|
+
const exponential_1 = require("./shapes/exponential");
|
|
5
|
+
const lorentzToGauss_1 = require("./shapes/lorentzToGauss");
|
|
6
|
+
function getFunction(shape) {
|
|
7
|
+
const { kind, options } = shape;
|
|
8
|
+
switch (kind) {
|
|
9
|
+
case 'exponential':
|
|
10
|
+
return (0, exponential_1.exponential)(options);
|
|
11
|
+
case 'lorentzToGauss':
|
|
12
|
+
return (0, lorentzToGauss_1.lorentzToGauss)(options);
|
|
13
|
+
default:
|
|
14
|
+
throw Error(`Unknown distribution ${kind}`);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.getFunction = getFunction;
|
|
18
|
+
//# sourceMappingURL=getFunction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getFunction.js","sourceRoot":"","sources":["../../src/apodization/getFunction.ts"],"names":[],"mappings":";;;AACA,sDAAmD;AACnD,4DAAyD;AAEzD,SAAgB,WAAW,CAAC,KAAsB;IAChD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,QAAQ,IAAI,EAAE;QACZ,KAAK,aAAa;YAChB,OAAO,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;QAC9B,KAAK,gBAAgB;YACnB,OAAO,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;QACjC;YACE,MAAM,KAAK,CAAC,wBAAwB,IAAc,EAAE,CAAC,CAAC;KACzD;AACH,CAAC;AAVD,kCAUC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { ExponentialOptions } from './exponential';
|
|
2
|
+
import type { LorentzToGaussOptions } from './lorentzToGauss';
|
|
3
|
+
interface Exponential {
|
|
4
|
+
kind: 'exponential';
|
|
5
|
+
options: ExponentialOptions;
|
|
6
|
+
}
|
|
7
|
+
interface LorentToGauss {
|
|
8
|
+
kind: 'lorentzToGauss';
|
|
9
|
+
options: LorentzToGaussOptions;
|
|
10
|
+
}
|
|
11
|
+
export declare type WindowFunctions = Exponential | LorentToGauss;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WindowFunctions.js","sourceRoot":"","sources":["../../../src/apodization/shapes/WindowFunctions.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface ExponentialOptions {
|
|
2
|
+
/**
|
|
3
|
+
* line broadening value in Hz, a negative value will invert the shape
|
|
4
|
+
*/
|
|
5
|
+
lb: number;
|
|
6
|
+
/**
|
|
7
|
+
* increment value in time or the independent value
|
|
8
|
+
*/
|
|
9
|
+
dw: number;
|
|
10
|
+
}
|
|
11
|
+
export declare function exponential(options: ExponentialOptions): (i: number) => number;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.exponential = void 0;
|
|
4
|
+
function exponential(options) {
|
|
5
|
+
const { lb, dw } = options;
|
|
6
|
+
const coefExp = -lb * Math.PI * dw;
|
|
7
|
+
return (i) => Math.exp(coefExp * i);
|
|
8
|
+
}
|
|
9
|
+
exports.exponential = exponential;
|
|
10
|
+
//# sourceMappingURL=exponential.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exponential.js","sourceRoot":"","sources":["../../../src/apodization/shapes/exponential.ts"],"names":[],"mappings":";;;AAWA,SAAgB,WAAW,CAAC,OAA2B;IACrD,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACnC,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;AAC9C,CAAC;AAJD,kCAIC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export interface LorentzToGaussOptions {
|
|
2
|
+
/**
|
|
3
|
+
* size of the shape function
|
|
4
|
+
*/
|
|
5
|
+
length: number;
|
|
6
|
+
/**
|
|
7
|
+
* increment value in time or the independent value
|
|
8
|
+
*/
|
|
9
|
+
dw: number;
|
|
10
|
+
/**
|
|
11
|
+
* Gaussian Broaden Width, Hz
|
|
12
|
+
* @default 0
|
|
13
|
+
*/
|
|
14
|
+
gaussianHz?: number;
|
|
15
|
+
/**
|
|
16
|
+
* Inverse Exponential Width, Hz
|
|
17
|
+
* @default 0
|
|
18
|
+
*/
|
|
19
|
+
exponentialHz?: number;
|
|
20
|
+
/**
|
|
21
|
+
* Location of Gauss Maximum, this value should be between 0 to 1
|
|
22
|
+
* @default 0
|
|
23
|
+
*/
|
|
24
|
+
center?: number;
|
|
25
|
+
}
|
|
26
|
+
export declare function lorentzToGauss(options: LorentzToGaussOptions): (i: number) => number;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.lorentzToGauss = void 0;
|
|
4
|
+
function lorentzToGauss(options) {
|
|
5
|
+
const { dw, length, gaussianHz = 0, exponentialHz = 0, center = 0 } = options;
|
|
6
|
+
if (center > 1 || center < 0) {
|
|
7
|
+
throw new Error('The center of gaussian shape should be inside of the window function: 0 - 1');
|
|
8
|
+
}
|
|
9
|
+
const C5 = Math.pow(0.6 * Math.PI * gaussianHz * dw, 2);
|
|
10
|
+
const C2 = center * (length - 1);
|
|
11
|
+
const C6 = Math.PI * dw * exponentialHz;
|
|
12
|
+
return (i) => Math.exp(i * C6 - Math.pow(C2 - i, 2) * C5);
|
|
13
|
+
}
|
|
14
|
+
exports.lorentzToGauss = lorentzToGauss;
|
|
15
|
+
//# sourceMappingURL=lorentzToGauss.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lorentzToGauss.js","sourceRoot":"","sources":["../../../src/apodization/shapes/lorentzToGauss.ts"],"names":[],"mappings":";;;AA0BA,SAAgB,cAAc,CAAC,OAA8B;IAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAE9E,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;KACH;IAED,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,UAAU,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IAExC,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC;AAdD,wCAcC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getData = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* generate and scale the data of a window function
|
|
6
|
+
*/
|
|
7
|
+
function getData(func, length) {
|
|
8
|
+
const data = new Float64Array(length);
|
|
9
|
+
let max = Number.MIN_SAFE_INTEGER;
|
|
10
|
+
for (let i = 0; i < length; i++) {
|
|
11
|
+
const value = func(i);
|
|
12
|
+
data[i] = value;
|
|
13
|
+
if (value > max)
|
|
14
|
+
max = value;
|
|
15
|
+
}
|
|
16
|
+
for (let i = 0; i < length; i++)
|
|
17
|
+
data[i] /= max;
|
|
18
|
+
return data;
|
|
19
|
+
}
|
|
20
|
+
exports.getData = getData;
|
|
21
|
+
//# sourceMappingURL=getData.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getData.js","sourceRoot":"","sources":["../../../src/apodization/utils/getData.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,SAAgB,OAAO,CAAC,IAA2B,EAAE,MAAc;IACjE,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QAChB,IAAI,KAAK,GAAG,GAAG;YAAE,GAAG,GAAG,KAAK,CAAC;KAC9B;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;IAChD,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,0BAWC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import TreeSet from 'ml-tree-set';
|
|
2
2
|
import { Targets, NMRSignal1DWithAtomsAndDiaIDs } from '../get1HAssignments';
|
|
3
3
|
export interface RestrictionByCS1D {
|
|
4
4
|
chemicalShiftRestriction: boolean;
|
|
@@ -24,7 +24,7 @@ export interface Predictions1Dassignments {
|
|
|
24
24
|
[key: string]: Signals1DAssignment;
|
|
25
25
|
}
|
|
26
26
|
export interface StoreAssignments {
|
|
27
|
-
solutions:
|
|
27
|
+
solutions: TreeSet;
|
|
28
28
|
nSolutions: number;
|
|
29
29
|
}
|
|
30
30
|
export declare function buildAssignments(props: BuildAssignmentsProps): Promise<{
|
|
@@ -55,7 +55,7 @@ function addSolution(store, props) {
|
|
|
55
55
|
store.nSolutions++;
|
|
56
56
|
let solution = {
|
|
57
57
|
assignment: JSON.parse(JSON.stringify(partial)),
|
|
58
|
-
score
|
|
58
|
+
score,
|
|
59
59
|
};
|
|
60
60
|
if (store.nSolutions >= maxSolutions) {
|
|
61
61
|
if (solution.score > store.solutions.last().score) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exploreTreeRec.js","sourceRoot":"","sources":["../../../src/assignment/utils/exploreTreeRec.ts"],"names":[],"mappings":";;;AAQA,iDAA8C;AAgB9C,SAAgB,cAAc,CAC5B,KAA0B,EAC1B,YAAoB,EACpB,OAA6B,EAC7B,KAAuB;IAEvB,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,OAAO,EACP,SAAS,EACT,YAAY,EACZ,OAAO,EACP,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,GAC5B,GAAG,KAAK,CAAC;IAEV,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;IAC/B,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE;QAC/C,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACzD,KAAK,IAAI,QAAQ,IAAI,mBAAmB,EAAE;QACxC,OAAO,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;QACjC,IAAI,KAAK,GAAG,IAAA,2BAAY,EAAC,OAAO,EAAE;YAChC,yBAAyB;YACzB,2BAA2B;YAC3B,mBAAmB;YACnB,eAAe;YACf,WAAW;YACX,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,IAAI,QAAQ,KAAK,GAAG,EAAE;gBACpB,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;aAC9B;YACD,SAAS;SACV;QAED,IAAI,YAAY,KAAK,QAAQ,GAAG,CAAC,IAAI,KAAK,IAAI,eAAe,EAAE;YAC7D,WAAW,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;SACnE;aAAM,IAAI,YAAY,GAAG,QAAQ,GAAG,CAAC,EAAE;YACtC,cAAc,CACZ;gBACE,QAAQ;gBACR,eAAe;gBACf,OAAO;gBACP,SAAS;gBACT,YAAY;gBACZ,OAAO;gBACP,WAAW;gBACX,eAAe;gBACf,mBAAmB;gBACnB,qBAAqB;gBACrB,yBAAyB;gBACzB,2BAA2B;aAC5B,EACD,YAAY,GAAG,CAAC,EAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EACnC,KAAK,CACN,CAAC;SACH;KACF;AACH,CAAC;AAvED,wCAuEC;AAcD,SAAS,WAAW,CAAC,KAAuB,EAAE,KAAuB;IACnE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC1D,KAAK,IAAI,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvD,KAAK,CAAC,UAAU,EAAE,CAAC;IACnB,IAAI,QAAQ,GAAuB;QACjC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/C,KAAK
|
|
1
|
+
{"version":3,"file":"exploreTreeRec.js","sourceRoot":"","sources":["../../../src/assignment/utils/exploreTreeRec.ts"],"names":[],"mappings":";;;AAQA,iDAA8C;AAgB9C,SAAgB,cAAc,CAC5B,KAA0B,EAC1B,YAAoB,EACpB,OAA6B,EAC7B,KAAuB;IAEvB,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,OAAO,EACP,SAAS,EACT,YAAY,EACZ,OAAO,EACP,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,GAC5B,GAAG,KAAK,CAAC;IAEV,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;IAC/B,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE;QAC/C,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACzD,KAAK,IAAI,QAAQ,IAAI,mBAAmB,EAAE;QACxC,OAAO,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;QACjC,IAAI,KAAK,GAAG,IAAA,2BAAY,EAAC,OAAO,EAAE;YAChC,yBAAyB;YACzB,2BAA2B;YAC3B,mBAAmB;YACnB,eAAe;YACf,WAAW;YACX,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,IAAI,QAAQ,KAAK,GAAG,EAAE;gBACpB,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;aAC9B;YACD,SAAS;SACV;QAED,IAAI,YAAY,KAAK,QAAQ,GAAG,CAAC,IAAI,KAAK,IAAI,eAAe,EAAE;YAC7D,WAAW,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;SACnE;aAAM,IAAI,YAAY,GAAG,QAAQ,GAAG,CAAC,EAAE;YACtC,cAAc,CACZ;gBACE,QAAQ;gBACR,eAAe;gBACf,OAAO;gBACP,SAAS;gBACT,YAAY;gBACZ,OAAO;gBACP,WAAW;gBACX,eAAe;gBACf,mBAAmB;gBACnB,qBAAqB;gBACrB,yBAAyB;gBACzB,2BAA2B;aAC5B,EACD,YAAY,GAAG,CAAC,EAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EACnC,KAAK,CACN,CAAC;SACH;KACF;AACH,CAAC;AAvED,wCAuEC;AAcD,SAAS,WAAW,CAAC,KAAuB,EAAE,KAAuB;IACnE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC1D,KAAK,IAAI,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvD,KAAK,CAAC,UAAU,EAAE,CAAC;IACnB,IAAI,QAAQ,GAAuB;QACjC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/C,KAAK;KACN,CAAC;IAEF,IAAI,KAAK,CAAC,UAAU,IAAI,YAAY,EAAE;QACpC,IAAI,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE;YACjD,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC3B,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC/B;KACF;SAAM;QACL,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,KAAK,CAAC,UAAU,EAAE,CAAC;KACpB;AACH,CAAC;AAED,SAAS,uBAAuB,CAC9B,OAA6B,EAC7B,WAAqC;IAErC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;IAClD,IAAI,WAAW,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,kBAAkB,GAAG,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;IACtD,OAAO,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -29,6 +29,8 @@ export * from './databases/carbonImpurities';
|
|
|
29
29
|
export * from './databases/protonImpurities';
|
|
30
30
|
export * from './peaks/solventSuppression';
|
|
31
31
|
export * from './ranges/markSolventSignal';
|
|
32
|
+
export * from './apodization/apodization';
|
|
33
|
+
export * from './apodization/compose';
|
|
32
34
|
export type { NMRSignal1D } from './signals/NMRSignal1D';
|
|
33
35
|
export type { NMRSignal2D, Signal2DProjection } from './xyz/NMRSignal2D';
|
|
34
36
|
export type { NMRRange } from './xy/NMRRange';
|
package/lib/index.js
CHANGED
|
@@ -45,4 +45,6 @@ __exportStar(require("./databases/carbonImpurities"), exports);
|
|
|
45
45
|
__exportStar(require("./databases/protonImpurities"), exports);
|
|
46
46
|
__exportStar(require("./peaks/solventSuppression"), exports);
|
|
47
47
|
__exportStar(require("./ranges/markSolventSignal"), exports);
|
|
48
|
+
__exportStar(require("./apodization/apodization"), exports);
|
|
49
|
+
__exportStar(require("./apodization/compose"), exports);
|
|
48
50
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,+DAA6C;AAE7C,gEAA8C;AAE9C,6DAA2C;AAC3C,6DAA2C;AAC3C,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC;AACzC,0DAAwC;AACxC,iEAA+C;AAE/C,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAE5C,uDAAqC;AACrC,sDAAoC;AAEpC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC;AAEvC,wDAAsC;AACtC,8DAA4C;AAC5C,2DAAyC;AAEzC,0DAAwC;AACxC,2DAAyC;AAEzC,4DAA0C;AAC1C,wDAAsC;AAEtC,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAE7C,6DAA2C;AAC3C,6DAA2C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,+DAA6C;AAE7C,gEAA8C;AAE9C,6DAA2C;AAC3C,6DAA2C;AAC3C,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC;AACzC,0DAAwC;AACxC,iEAA+C;AAE/C,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAE5C,uDAAqC;AACrC,sDAAoC;AAEpC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC;AAEvC,wDAAsC;AACtC,8DAA4C;AAC5C,2DAAyC;AAEzC,0DAAwC;AACxC,2DAAyC;AAEzC,4DAA0C;AAC1C,wDAAsC;AAEtC,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAE7C,6DAA2C;AAC3C,6DAA2C;AAE3C,4DAA0C;AAC1C,wDAAsC"}
|
|
@@ -82,7 +82,7 @@ function peaksToRanges(data, peakList, options = {}) {
|
|
|
82
82
|
let peaksO = [];
|
|
83
83
|
for (let j = signal.maskPattern.length - 1; j >= 0; j--) {
|
|
84
84
|
sum += computeArea(signal.peaks[j]);
|
|
85
|
-
if (signal.maskPattern[j]
|
|
85
|
+
if (!signal.maskPattern[j]) {
|
|
86
86
|
let peakR = signal.peaks.splice(j, 1)[0];
|
|
87
87
|
peaksO.push({
|
|
88
88
|
x: peakR.x,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":";;;;;;AACA,iEAAsD;AAOtD,iEAAyC;AAEzC,kDAA+C;AAgE/C,SAAS,8BAA8B,CACrC,MAAoB;IAEpB,uBAAuB;IACvB,mEAAmE;IACnE,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxE,IAAI,CAAC,MAAM,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAC1E,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;KAC9D;AACH,CAAC;AAED,MAAM,YAAY,GAAG,CACnB,IAAqB,EACrB,SAAiB,EACjB,OAAe,EACD,EAAE;IAChB,OAAO;QACL,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK;QAC3B,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK;QAC1B,OAAO,EAAE,SAAS;QAClB,OAAO;QACP,YAAY,EAAE;YACZ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC;YAC7B,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC;YAC3B,KAAK,EAAE,CAAC;SACT;QACD,KAAK,EAAE;YACL;gBACE,CAAC,EAAE,IAAI,CAAC,CAAC;gBACT,SAAS,EAAE,IAAI,CAAC,CAAC;gBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AACF;;GAEG;AAEH,SAAgB,aAAa,CAC3B,IAAY,EACZ,QAA2B,EAC3B,UAAgC,EAAE;IAElC,IAAI,EACF,cAAc,GAAG,GAAG,EACpB,iBAAiB,GAAG,IAAI,EACxB,KAAK,GAAG,GAAG,EACX,OAAO,GAAG,IAAI,EACd,YAAY,GAAG,KAAK,EACpB,SAAS,GAAG,GAAG,EACf,gBAAgB,GAAG,EAAE,EACrB,SAAS,GAAG,KAAK,EACjB,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IAEZ,IAAI,aAAa,GAAG;QAClB,cAAc;QACd,YAAY;QACZ,gBAAgB;QAChB,SAAS;QACT,OAAO;KACR,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QACzB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;KAC3B;IAED,IAAI,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE3D,IAAI,KAAK,EAAE;QACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE;gBACnD,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACtB;SACF;KACF;IAED,IAAI,OAAO,EAAE;QACX,IAAI,GAAG,EAAE,GAAG,CAAC;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,OAAO,CAAC,CAAC,CAAC,GAAG,mBAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACxB,IACE,MAAM,CAAC,WAAW;gBAClB,MAAM,CAAC,YAAY,KAAK,GAAG;gBAC3B,MAAM,CAAC,YAAY,KAAK,EAAE,EAC1B;gBACA,8BAA8B,CAAC,MAAM,CAAC,CAAC;gBACvC,6CAA6C;gBAC7C,GAAG,GAAG,CAAC,CAAC;gBACR,GAAG,GAAG,CAAC,CAAC;gBACR,IAAI,MAAM,GAAG,EAAE,CAAC;gBAChB,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;oBACvD,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import { NMRSignal1D } from '../signals/NMRSignal1D';
|
|
2
2
|
import { NMRPeak1D } from './NMRPeak1D';
|
|
3
|
-
export declare function solventSuppression<T extends NMRPeak1D>(peakList: T[], solvent: NMRSignal1D[], options?:
|
|
3
|
+
export declare function solventSuppression<T extends NMRPeak1D>(peakList: T[], solvent: NMRSignal1D[], options?: {
|
|
4
|
+
markSolventPeaks?: boolean;
|
|
5
|
+
solventZoneExtension?: number;
|
|
6
|
+
}): T[];
|
|
@@ -20,9 +20,7 @@ function solventSuppression(peakList, solvent, options = {}) {
|
|
|
20
20
|
solventXYPeaks.sort((a, b) => a.x - b.x);
|
|
21
21
|
let upIndex = (0, ml_spectra_processing_1.xFindClosestIndex)(xValues, solventXYPeaks[solventXYPeaks.length - 1].x + solventZoneExtension);
|
|
22
22
|
let lowIndex = (0, ml_spectra_processing_1.xFindClosestIndex)(xValues, solventXYPeaks[0].x - solventZoneExtension);
|
|
23
|
-
|
|
24
|
-
continue;
|
|
25
|
-
const nearPeaks = peaks.slice(lowIndex, upIndex + 1);
|
|
23
|
+
const nearPeaks = peaks.filter((peak, index) => index >= lowIndex && index <= upIndex);
|
|
26
24
|
const amplitudeResiduals = [];
|
|
27
25
|
const deltaResiduals = [];
|
|
28
26
|
const positionResiduals = [];
|
|
@@ -48,9 +46,14 @@ function solventSuppression(peakList, solvent, options = {}) {
|
|
|
48
46
|
deltaResiduals.push(deltaResidual);
|
|
49
47
|
positionResiduals.push(positionResidual);
|
|
50
48
|
}
|
|
51
|
-
const maxAmplitude =
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
const [maxAmplitude, maxDelta, maxPosition] = [
|
|
50
|
+
amplitudeResiduals,
|
|
51
|
+
deltaResiduals,
|
|
52
|
+
positionResiduals,
|
|
53
|
+
].map((data) => {
|
|
54
|
+
const max = (0, ml_spectra_processing_1.xMaxValue)(data);
|
|
55
|
+
return max === 0 ? 1 : max;
|
|
56
|
+
});
|
|
54
57
|
let minIndex = -1;
|
|
55
58
|
let minScore = Number.MAX_SAFE_INTEGER;
|
|
56
59
|
let score = [];
|
|
@@ -66,7 +69,7 @@ function solventSuppression(peakList, solvent, options = {}) {
|
|
|
66
69
|
minScore = value;
|
|
67
70
|
}
|
|
68
71
|
}
|
|
69
|
-
if (minScore < 0) {
|
|
72
|
+
if (minScore < 0 || minIndex < 0) {
|
|
70
73
|
new Error('There is not a correct match with the pattern');
|
|
71
74
|
return peaks;
|
|
72
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solventSuppression.js","sourceRoot":"","sources":["../../src/peaks/solventSuppression.ts"],"names":[],"mappings":";;;AACA,iEAA4D;AAC5D,yCAAmC;AACnC,qEAAsD;AACtD,iEAAqE;AAGrE,gEAA6D;AAC7D,mFAAgF;AAChF,2EAAwE;AACxE,2EAAwE;AAIxE,SAAgB,kBAAkB,CAChC,QAAa,EACb,OAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"solventSuppression.js","sourceRoot":"","sources":["../../src/peaks/solventSuppression.ts"],"names":[],"mappings":";;;AACA,iEAA4D;AAC5D,yCAAmC;AACnC,qEAAsD;AACtD,iEAAqE;AAGrE,gEAA6D;AAC7D,mFAAgF;AAChF,2EAAwE;AACxE,2EAAwE;AAIxE,SAAgB,kBAAkB,CAChC,QAAa,EACb,OAAsB,EACtB,UAAyE,EAAE;IAE3E,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE5C,MAAM,EAAE,gBAAgB,GAAG,KAAK,EAAE,oBAAoB,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IAEzE,KAAK,MAAM,aAAa,IAAI,OAAO,EAAE;QACnC,IAAI,cAAc,GAAG,aAAa,CAAC,KAAK;YACtC,CAAC,CAAC,aAAa,CAAC,KAAK;YACrB,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QACnC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzC,IAAI,OAAO,GAAG,IAAA,yCAAiB,EAC7B,OAAO,EACP,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,oBAAoB,CACnE,CAAC;QACF,IAAI,QAAQ,GAAG,IAAA,yCAAiB,EAC9B,OAAO,EACP,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAC3C,CAAC;QAEF,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAC5B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,QAAQ,IAAI,KAAK,IAAI,OAAO,CACvD,CAAC;QACF,MAAM,kBAAkB,GAAG,EAAE,CAAC;QAC9B,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;YAC1B,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,GACvD,sBAAsB,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;YAE9D,MAAM,YAAY,GAAG,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YACrE,IAAI,aAAa,GAAG,CAAC,CAAC;YACtB,IAAI,iBAAiB,GAAG,CAAC,CAAC;YAC1B,IAAI,gBAAgB,GAAG,CAAC,CAAC;YAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC5C,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAC3B,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7C,CAAC;gBACF,aAAa,IAAI,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACzE;YAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,aAAa,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBACxC,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBAC5C,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;aAC5C;iBAAM;gBACL,gBAAgB,GAAG,IAAA,qCAAW,EAC5B,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,GAAG,YAAY,CAAC,EAC5C,GAAG,CACJ,CAAC;aACH;YAED,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC3C,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC1C;QAED,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,GAAG;YAC5C,kBAAkB;YAClB,cAAc;YACd,iBAAiB;SAClB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,MAAM,GAAG,GAAG,IAAA,iCAAS,EAAC,IAAI,CAAC,CAAC;YAC5B,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;QAClB,IAAI,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACvC,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,KAAK,GACT,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,YAAY;gBACnC,cAAc,CAAC,CAAC,CAAC,GAAG,QAAQ;gBAC5B,CAAC;gBACD,iBAAiB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;gBACrC,CAAC,CAAC;YAEJ,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClB,IAAI,QAAQ,GAAG,KAAK,EAAE;gBACpB,QAAQ,GAAG,CAAC,CAAC;gBACb,QAAQ,GAAG,KAAK,CAAC;aAClB;SACF;QAED,IAAI,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE;YAChC,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAC3D,OAAO,KAAK,CAAC;SACd;QAED,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,sBAAsB,CAC3D,SAAS,CAAC,QAAQ,CAAC,EACnB,aAAa,EACb,cAAc,CACf,CAAC;QACF,MAAM,IAAI,GAAG,aAAa,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAA,2CAAmB,EAAC,IAAI,EAAE;YACzD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,IAAI,IAAI,GAAG,CAAC,EAAE;YACZ,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACvC,OAAO,KAAK,CAAC;SACd;QAED,IAAI,gBAAgB,EAAE;YACpB,KAAK,IAAI,KAAK,IAAI,cAAc,EAAE;gBAChC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC;aAC1C;SACF;aAAM;YACL,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrC,KAAK,IAAI,KAAK,IAAI,cAAc,EAAE;gBAChC,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;aACnC;SACF;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AA5HD,gDA4HC;AAED,SAAS,eAAe,CACtB,MAAmB,EACnB,UAA2D,EAAE;IAE7D,IAAI,OAAO,GAAG,IAAA,iCAAe,EAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,GAAG,IAAA,yCAAmB,EAAC,OAAO,CAAC,CAAC;IAE9C,MAAM,EAAE,SAAS,GAAG,GAAG,EAAE,cAAc,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAExD,UAAU,CAAC,QAAQ,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE;QAChD,SAAS;QACT,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAC;IAC1C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAO,EACP,aAAkB,EAClB,cAAmB;IAEnB,MAAM,mBAAmB,GAAc,IAAI,CAAC,KAAK,CAC/C,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAC/B,CAAC;IACF,mEAAmE;IACnE,IAAI,QAAQ,GAAG,IAAI,CAAC,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC;IAC5C,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;QAChE,QAAQ,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjC;IACD,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EACrD,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CACzB,CAAC;IACF,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,KAAK,IAAI,kBAAkB,IAAI,mBAAmB,EAAE;QAClD,kBAAkB,CAAC,CAAC,IAAI,QAAQ,CAAC;QACjC,kBAAkB,CAAC,CAAC,IAAI,YAAY,CAAC;QACrC,YAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC;KACtC;IACD,OAAO;QACL,KAAK,EAAE,mBAAmB;QAC1B,KAAK,EAAE,YAAY,GAAG,mBAAmB,CAAC,MAAM;KACjD,CAAC;AACJ,CAAC;AACD,SAAS,eAAe,CAAC,mBAA8B,EAAE,SAAoB;IAC3E,MAAM,IAAI,GAAG,aAAa,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAA,2CAAmB,EAAC,IAAI,EAAE;QACzD,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IACH,IAAI,IAAI,KAAK,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,eAAe,GAAG,EAAE,CAAC;IAC3B,IAAI,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACvC,KAAK,IAAI,KAAK,IAAI,cAAc,EAAE;QAChC,IAAI,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjE,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KAC/C;IACD,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC;IAClE,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,aAAa,CAAoB,IAAS,EAAE,OAAY;IAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,kBAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAClC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACpD;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -55,10 +55,8 @@ exports.default = {
|
|
|
55
55
|
if (peaks.length === 1 && n === 0) {
|
|
56
56
|
validPattern = true;
|
|
57
57
|
}
|
|
58
|
-
else {
|
|
59
|
-
|
|
60
|
-
continue;
|
|
61
|
-
}
|
|
58
|
+
else if (peaks.length <= 1) {
|
|
59
|
+
continue;
|
|
62
60
|
}
|
|
63
61
|
// 1.3 Establish a range for the Heights Hi [peaks.intensity*0.85,peaks.intensity*1.15];
|
|
64
62
|
let ranges = getRanges(peaks);
|
|
@@ -323,7 +321,7 @@ function getRanges(peaks) {
|
|
|
323
321
|
}
|
|
324
322
|
currentIndex[i] = 0;
|
|
325
323
|
}
|
|
326
|
-
return { values: ranges, currentIndex
|
|
324
|
+
return { values: ranges, currentIndex, active: 0 };
|
|
327
325
|
}
|
|
328
326
|
/**
|
|
329
327
|
* Performs a symmetrization of the signal by using different aproximations to the center.
|
|
@@ -440,22 +438,22 @@ function symmetrize(signalInput, maxError, iteration, key) {
|
|
|
440
438
|
if (Math.abs(diffL - diffR) < maxError) {
|
|
441
439
|
avg = Math.min(peaks[left].intensity, peaks[right].intensity);
|
|
442
440
|
avgWidth = Math.min(peaks[left].width, peaks[right].width);
|
|
443
|
-
peaks[left].intensity =
|
|
444
|
-
peaks[
|
|
441
|
+
peaks[left].intensity = avg;
|
|
442
|
+
peaks[right].intensity = avg;
|
|
443
|
+
peaks[left].width = avgWidth;
|
|
444
|
+
peaks[right].width = avgWidth;
|
|
445
445
|
middle = [
|
|
446
446
|
middle[0] + (peaks[right].x + peaks[left].x) / 2,
|
|
447
447
|
middle[1] + 1,
|
|
448
448
|
];
|
|
449
449
|
}
|
|
450
|
+
else if (Math.max(diffL, diffR) === diffR) {
|
|
451
|
+
mask[right] = false;
|
|
452
|
+
left--;
|
|
453
|
+
}
|
|
450
454
|
else {
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
left--;
|
|
454
|
-
}
|
|
455
|
-
else {
|
|
456
|
-
mask[left] = false;
|
|
457
|
-
right++;
|
|
458
|
-
}
|
|
455
|
+
mask[left] = false;
|
|
456
|
+
right++;
|
|
459
457
|
}
|
|
460
458
|
}
|
|
461
459
|
}
|
|
@@ -499,10 +497,8 @@ function symmetrize(signalInput, maxError, iteration, key) {
|
|
|
499
497
|
}
|
|
500
498
|
symFactor /= weight;
|
|
501
499
|
}
|
|
502
|
-
else {
|
|
503
|
-
|
|
504
|
-
symFactor = 1;
|
|
505
|
-
}
|
|
500
|
+
else if (peaks.length === 1) {
|
|
501
|
+
symFactor = 1;
|
|
506
502
|
}
|
|
507
503
|
let newSumHeights = 0;
|
|
508
504
|
for (const peak of peaks) {
|
|
@@ -513,15 +509,13 @@ function symmetrize(signalInput, maxError, iteration, key) {
|
|
|
513
509
|
if (symFactor > 0.8 && symFactor < 0.97 && iteration < 2) {
|
|
514
510
|
return symmetrize(newSignal, maxErrorIter2, 2, key);
|
|
515
511
|
}
|
|
516
|
-
else {
|
|
512
|
+
else if (peaks.length > 1) {
|
|
517
513
|
// Center the given pattern at cs and symmetrize x
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
peaks[peaks.length - 1 - i].x = cs - dxi;
|
|
524
|
-
}
|
|
514
|
+
let dxi;
|
|
515
|
+
for (let i = Math.ceil(peaks.length / 2) - 1; i >= 0; i--) {
|
|
516
|
+
dxi = (peaks[i].x - peaks[peaks.length - 1 - i].x) / 2.0;
|
|
517
|
+
peaks[i].x = cs + dxi;
|
|
518
|
+
peaks[peaks.length - 1 - i].x = cs - dxi;
|
|
525
519
|
}
|
|
526
520
|
}
|
|
527
521
|
newSignal.symRank = symFactor;
|
|
@@ -564,7 +558,7 @@ function normalize(signal, n) {
|
|
|
564
558
|
let index = signal.mask2.length - 1;
|
|
565
559
|
for (let i = peaks.length - 1; i >= 0; i--) {
|
|
566
560
|
peaks[i].intensity *= norm;
|
|
567
|
-
while (index >= 0 && signal.mask2[index]
|
|
561
|
+
while (index >= 0 && !signal.mask2[index]) {
|
|
568
562
|
index--;
|
|
569
563
|
}
|
|
570
564
|
if (peaks[i].intensity < 0.75) {
|
|
@@ -595,7 +589,7 @@ function chemicalShift(peaks, mask = []) {
|
|
|
595
589
|
let area;
|
|
596
590
|
if (mask.length > 0) {
|
|
597
591
|
for (let i = 0; i < peaks.length; i++) {
|
|
598
|
-
if (mask[i]
|
|
592
|
+
if (mask[i]) {
|
|
599
593
|
area = getArea(peaks[i]);
|
|
600
594
|
sum += area;
|
|
601
595
|
cs += area * peaks[i].x;
|