nmr-processing 9.3.6 → 9.3.8-pre.1681135907
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 +9 -4
- package/lib/apodization/apodization.js +3 -1
- package/lib/apodization/apodization.js.map +1 -1
- package/lib/apodization/applyWindow.js.map +1 -1
- package/lib/apodization/compose.js.map +1 -1
- package/lib/apodization/getFunction.js +3 -0
- package/lib/apodization/getFunction.js.map +1 -1
- package/lib/apodization/shapes/WindowFunctions.d.ts +6 -1
- package/lib/apodization/shapes/sineBell.d.ts +27 -0
- package/lib/apodization/shapes/sineBell.js +17 -0
- package/lib/apodization/shapes/sineBell.js.map +1 -0
- package/lib/apodization/utils/getData.js.map +1 -1
- package/lib/assignment/utils/buildAssignments.js +1 -2
- package/lib/assignment/utils/buildAssignments.js.map +1 -1
- package/lib/assignment/utils/exploreTreeRec.js +1 -2
- package/lib/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib/assignment/utils/getAssignment/buildAssignments.js +1 -2
- package/lib/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib/assignment/utils/getAssignment/exploreTree.js +1 -2
- package/lib/assignment/utils/getAssignment/exploreTree.js.map +1 -1
- package/lib/signals/signalsToFID.d.ts +3 -0
- package/lib/utilities/checkData2DFid.d.ts +3 -0
- package/lib/utilities/checkData2DFid.js +10 -0
- package/lib/utilities/checkData2DFid.js.map +1 -0
- package/lib/xyz/Data2D.d.ts +21 -0
- package/lib/xyz/Data2D.js +3 -0
- package/lib/xyz/Data2D.js.map +1 -0
- package/lib/xyz/quadrature.d.ts +8 -0
- package/lib/xyz/quadrature.js +54 -0
- package/lib/xyz/quadrature.js.map +1 -0
- package/lib/xyz/util/fft2d/digitalFilter.d.ts +7 -0
- package/lib/xyz/util/fft2d/digitalFilter.js +20 -0
- package/lib/xyz/util/fft2d/digitalFilter.js.map +1 -0
- package/lib/xyz/util/fft2d/fftDirectDimension.d.ts +24 -0
- package/lib/xyz/util/fft2d/fftDirectDimension.js +57 -0
- package/lib/xyz/util/fft2d/fftDirectDimension.js.map +1 -0
- package/lib/xyz/util/fft2d/fftIndirectDimension.d.ts +23 -0
- package/lib/xyz/util/fft2d/fftIndirectDimension.js +72 -0
- package/lib/xyz/util/fft2d/fftIndirectDimension.js.map +1 -0
- package/lib/xyz/util/fft2d/removeDCOffset.d.ts +5 -0
- package/lib/xyz/util/fft2d/removeDCOffset.js +19 -0
- package/lib/xyz/util/fft2d/removeDCOffset.js.map +1 -0
- package/lib/xyz/util/fft2d/zeroFilling.d.ts +10 -0
- package/lib/xyz/util/fft2d/zeroFilling.js +29 -0
- package/lib/xyz/util/fft2d/zeroFilling.js.map +1 -0
- package/lib/xyz/xyzBidimensionalFFT.d.ts +41 -0
- package/lib/xyz/xyzBidimensionalFFT.js +79 -0
- package/lib/xyz/xyzBidimensionalFFT.js.map +1 -0
- package/lib-esm/apodization/apodization.js +3 -1
- package/lib-esm/apodization/apodization.js.map +1 -1
- package/lib-esm/apodization/applyWindow.js.map +1 -1
- package/lib-esm/apodization/compose.js.map +1 -1
- package/lib-esm/apodization/getFunction.js +3 -0
- package/lib-esm/apodization/getFunction.js.map +1 -1
- package/lib-esm/apodization/shapes/sineBell.js +13 -0
- package/lib-esm/apodization/shapes/sineBell.js.map +1 -0
- package/lib-esm/apodization/utils/getData.js.map +1 -1
- package/lib-esm/assignment/utils/buildAssignments.js +1 -2
- package/lib-esm/assignment/utils/buildAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/exploreTreeRec.js +1 -2
- package/lib-esm/assignment/utils/exploreTreeRec.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js +1 -2
- package/lib-esm/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/exploreTree.js +1 -2
- package/lib-esm/assignment/utils/getAssignment/exploreTree.js.map +1 -1
- package/lib-esm/utilities/checkData2DFid.js +6 -0
- package/lib-esm/utilities/checkData2DFid.js.map +1 -0
- package/lib-esm/xyz/Data2D.js +2 -0
- package/lib-esm/xyz/Data2D.js.map +1 -0
- package/lib-esm/xyz/quadrature.js +50 -0
- package/lib-esm/xyz/quadrature.js.map +1 -0
- package/lib-esm/xyz/util/fft2d/digitalFilter.js +16 -0
- package/lib-esm/xyz/util/fft2d/digitalFilter.js.map +1 -0
- package/lib-esm/xyz/util/fft2d/fftDirectDimension.js +50 -0
- package/lib-esm/xyz/util/fft2d/fftDirectDimension.js.map +1 -0
- package/lib-esm/xyz/util/fft2d/fftIndirectDimension.js +65 -0
- package/lib-esm/xyz/util/fft2d/fftIndirectDimension.js.map +1 -0
- package/lib-esm/xyz/util/fft2d/removeDCOffset.js +15 -0
- package/lib-esm/xyz/util/fft2d/removeDCOffset.js.map +1 -0
- package/lib-esm/xyz/util/fft2d/zeroFilling.js +25 -0
- package/lib-esm/xyz/util/fft2d/zeroFilling.js.map +1 -0
- package/lib-esm/xyz/xyzBidimensionalFFT.js +75 -0
- package/lib-esm/xyz/xyzBidimensionalFFT.js.map +1 -0
- package/package.json +17 -17
- package/src/apodization/apodization.ts +6 -4
- package/src/apodization/applyWindow.ts +0 -1
- package/src/apodization/compose.ts +1 -0
- package/src/apodization/getFunction.ts +3 -0
- package/src/apodization/shapes/WindowFunctions.ts +7 -1
- package/src/apodization/shapes/sineBell.ts +41 -0
- package/src/apodization/utils/getData.ts +0 -1
- package/src/assignment/utils/buildAssignments.ts +2 -3
- package/src/assignment/utils/exploreTreeRec.ts +1 -2
- package/src/assignment/utils/getAssignment/buildAssignments.ts +2 -2
- package/src/assignment/utils/getAssignment/exploreTree.ts +1 -2
- package/src/utilities/checkData2DFid.ts +10 -0
- package/src/xyz/Data2D.ts +25 -0
- package/src/xyz/quadrature.ts +69 -0
- package/src/xyz/util/fft2d/digitalFilter.ts +24 -0
- package/src/xyz/util/fft2d/fftDirectDimension.ts +111 -0
- package/src/xyz/util/fft2d/fftIndirectDimension.ts +123 -0
- package/src/xyz/util/fft2d/removeDCOffset.ts +19 -0
- package/src/xyz/util/fft2d/zeroFilling.ts +39 -0
- package/src/xyz/xyzBidimensionalFFT.ts +123 -0
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import Matrix from 'ml-matrix';
|
|
2
|
+
import { reimAutoPhaseCorrection, reimFFT, reimPhaseCorrection, } from 'ml-spectra-processing';
|
|
3
|
+
import { apodization, } from '../../../apodization/apodization';
|
|
4
|
+
import { digitalFilter } from './digitalFilter';
|
|
5
|
+
import { removeDCOffset } from './removeDCOffset';
|
|
6
|
+
import { zeroFilling } from './zeroFilling';
|
|
7
|
+
export function fftDirectDimension(data, options) {
|
|
8
|
+
const { re: reData, im: imData } = data;
|
|
9
|
+
const nbRows = reData.length;
|
|
10
|
+
const nbColumns = reData[0].length;
|
|
11
|
+
const { zeroFilling: zeroFillingF2, digitalFilterValue = 0 } = options;
|
|
12
|
+
const { factor: f2Factor = 2 } = zeroFillingF2 || {};
|
|
13
|
+
const nbPointsF2 = (zeroFillingF2 === null || zeroFillingF2 === void 0 ? void 0 : zeroFillingF2.nbPoints) || 2 ** Math.round(Math.log2(nbColumns * f2Factor));
|
|
14
|
+
const reFFT = new Matrix(nbRows, nbPointsF2);
|
|
15
|
+
const imFFT = new Matrix(nbRows, nbPointsF2);
|
|
16
|
+
const { apodization: apodizationF2 } = options;
|
|
17
|
+
let { ph0: ph0F2, ph1: ph1F2, mode: pcModeF2 = 'no', } = (options === null || options === void 0 ? void 0 : options.phaseCorrection) || {};
|
|
18
|
+
for (let i = 0; i < nbRows; i++) {
|
|
19
|
+
const newData = digitalFilter({ re: reData[i], im: imData[i] }, { digitalFilterValue });
|
|
20
|
+
Object.assign(newData, removeDCOffset(newData, { digitalFilterValue }));
|
|
21
|
+
if (apodizationF2) {
|
|
22
|
+
const { re: aRe, im: aIm } = apodization(newData, apodizationF2);
|
|
23
|
+
Object.assign(newData, { re: aRe, im: aIm });
|
|
24
|
+
}
|
|
25
|
+
Object.assign(newData, zeroFilling(newData, { digitalFilterValue, nbPoints: nbPointsF2 }));
|
|
26
|
+
Object.assign(newData, reimFFT(newData, { applyZeroShift: true }));
|
|
27
|
+
const dfResidual = (digitalFilterValue - Math.round(digitalFilterValue)) * Math.PI * 2;
|
|
28
|
+
if (dfResidual > 0) {
|
|
29
|
+
Object.assign(newData, reimPhaseCorrection(newData, 0, -dfResidual));
|
|
30
|
+
}
|
|
31
|
+
if (i === 0 &&
|
|
32
|
+
pcModeF2 === 'pk' &&
|
|
33
|
+
ph0F2 === undefined &&
|
|
34
|
+
ph1F2 === undefined) {
|
|
35
|
+
const phased = reimAutoPhaseCorrection(newData, { magnitudeMode: false });
|
|
36
|
+
ph0F2 = phased.ph0;
|
|
37
|
+
ph1F2 = phased.ph1;
|
|
38
|
+
}
|
|
39
|
+
if (pcModeF2 === 'pk' && ph0F2 !== undefined && ph1F2 !== undefined) {
|
|
40
|
+
Object.assign(newData, reimPhaseCorrection(newData, (ph0F2 * Math.PI) / 180, (ph1F2 * Math.PI) / 180));
|
|
41
|
+
}
|
|
42
|
+
reFFT.setRow(i, newData.re);
|
|
43
|
+
imFFT.setRow(i, newData.im);
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
re: reFFT,
|
|
47
|
+
im: imFFT,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=fftDirectDimension.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fftDirectDimension.js","sourceRoot":"","sources":["../../../../src/xyz/util/fft2d/fftDirectDimension.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import Matrix from 'ml-matrix';
|
|
2
|
+
import { reimAbsolute, reimAutoPhaseCorrection, reimFFT, reimPhaseCorrection, } from 'ml-spectra-processing';
|
|
3
|
+
import { apodization, } from '../../../apodization/apodization';
|
|
4
|
+
import { zeroFilling } from './zeroFilling';
|
|
5
|
+
export function fftIndirectDimension(data, options) {
|
|
6
|
+
var _a;
|
|
7
|
+
const reData = Matrix.checkMatrix(data.re);
|
|
8
|
+
const imData = Matrix.checkMatrix(data.im);
|
|
9
|
+
const nbRows = reData.rows;
|
|
10
|
+
const nbColumns = reData.columns;
|
|
11
|
+
const { zeroFilling: zeroFillingF1 } = options;
|
|
12
|
+
const { factor: f1Factor = 2 } = zeroFillingF1 || {};
|
|
13
|
+
const nbPointsF1 = (zeroFillingF1 === null || zeroFillingF1 === void 0 ? void 0 : zeroFillingF1.nbPoints) || 2 ** Math.round(Math.log2(nbRows * f1Factor));
|
|
14
|
+
const { apodization: apodizationF1 } = options;
|
|
15
|
+
let { ph0: ph0F1, ph1: ph1F1, mode: pcModeF1, } = options.phaseCorrection || {};
|
|
16
|
+
const reResult = new Matrix(nbPointsF1, nbColumns);
|
|
17
|
+
const imResult = new Matrix(nbPointsF1, nbColumns);
|
|
18
|
+
for (let i = 0; i < nbColumns; i++) {
|
|
19
|
+
const { re: aRe, im: aIm } = apodization({
|
|
20
|
+
re: reData.getColumn(i),
|
|
21
|
+
im: imData.getColumn(i),
|
|
22
|
+
}, apodizationF1);
|
|
23
|
+
const newRe = [];
|
|
24
|
+
const newIm = [];
|
|
25
|
+
if (options.fnMode === 'echo') {
|
|
26
|
+
for (let j = 0; j < aRe.length; j += 2) {
|
|
27
|
+
newRe.push(aRe[j]);
|
|
28
|
+
newIm.push(aRe[j + 1]);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
for (let j = 0; j < aRe.length; j++) {
|
|
33
|
+
newRe.push(aRe[j]);
|
|
34
|
+
newIm.push(-aIm[j]);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
let transformed = reimFFT(zeroFilling({
|
|
38
|
+
re: newRe,
|
|
39
|
+
im: newIm,
|
|
40
|
+
}, { digitalFilterValue: 0, nbPoints: nbPointsF1 }), { applyZeroShift: true });
|
|
41
|
+
let { re, im } = transformed;
|
|
42
|
+
if (((_a = options.phaseCorrection) === null || _a === void 0 ? void 0 : _a.mode) === 'mc') {
|
|
43
|
+
re = reimAbsolute({ re, im });
|
|
44
|
+
im = new Float64Array(im.length);
|
|
45
|
+
}
|
|
46
|
+
if (pcModeF1 === 'pk') {
|
|
47
|
+
if (i === 0 && ph0F1 === undefined && ph1F1 === undefined) {
|
|
48
|
+
//here we can improve it by checking if the experiment is phase sensitive.
|
|
49
|
+
const phased = reimAutoPhaseCorrection({ re, im }, { magnitudeMode: false });
|
|
50
|
+
ph0F1 = phased.ph0;
|
|
51
|
+
ph1F1 = phased.ph1;
|
|
52
|
+
}
|
|
53
|
+
if (ph0F1 !== undefined && ph1F1 !== undefined) {
|
|
54
|
+
Object.assign(transformed, reimPhaseCorrection(transformed, (ph0F1 * Math.PI) / 180, (ph1F1 * Math.PI) / 180));
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
reResult.setColumn(i, re);
|
|
58
|
+
imResult.setColumn(i, im);
|
|
59
|
+
}
|
|
60
|
+
return {
|
|
61
|
+
re: reResult,
|
|
62
|
+
im: imResult,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=fftIndirectDimension.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fftIndirectDimension.js","sourceRoot":"","sources":["../../../../src/xyz/util/fft2d/fftIndirectDimension.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { xMean } from 'ml-spectra-processing';
|
|
2
|
+
export function removeDCOffset(data, options) {
|
|
3
|
+
let { digitalFilterValue = 0 } = options;
|
|
4
|
+
const nbPoints = data.re.length;
|
|
5
|
+
const newRe = new Float64Array(data.re);
|
|
6
|
+
const newIm = new Float64Array(data.im);
|
|
7
|
+
const averageRe = xMean(data.re.slice((nbPoints * 0.75) >> 0, nbPoints - digitalFilterValue));
|
|
8
|
+
const averageIm = xMean(data.im.slice((nbPoints * 0.75) >> 0, nbPoints - digitalFilterValue));
|
|
9
|
+
for (let i = digitalFilterValue; i < nbPoints - digitalFilterValue; i++) {
|
|
10
|
+
newRe[i] -= averageRe;
|
|
11
|
+
newIm[i] -= averageIm;
|
|
12
|
+
}
|
|
13
|
+
return { re: newRe, im: newIm };
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=removeDCOffset.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removeDCOffset.js","sourceRoot":"","sources":["../../../../src/xyz/util/fft2d/removeDCOffset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,cAAc,CAAC,IAAc,EAAE,OAAY;IACzD,IAAI,EAAE,kBAAkB,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,KAAK,CACrB,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,kBAAkB,CAAC,CACrE,CAAC;IACF,MAAM,SAAS,GAAG,KAAK,CACrB,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,kBAAkB,CAAC,CACrE,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,QAAQ,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;QACvE,KAAK,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACtB,KAAK,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;KACvB;IACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;AAClC,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
export function zeroFilling(data, options) {
|
|
2
|
+
let { nbPoints, factor = 2, digitalFilterValue: grpdly = 0 } = options;
|
|
3
|
+
if (!nbPoints) {
|
|
4
|
+
nbPoints = 2 ** Math.round(Math.log2(data.re.length * factor));
|
|
5
|
+
}
|
|
6
|
+
let pointsToShift;
|
|
7
|
+
if (grpdly > 0) {
|
|
8
|
+
pointsToShift = Math.floor(grpdly);
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
pointsToShift = 0;
|
|
12
|
+
}
|
|
13
|
+
const { re, im } = data;
|
|
14
|
+
let newRE = new Float64Array(nbPoints);
|
|
15
|
+
let newIM = new Float64Array(nbPoints);
|
|
16
|
+
const length = Math.min(nbPoints, re.length);
|
|
17
|
+
newRE.set(re.slice(0, length - pointsToShift));
|
|
18
|
+
newIM.set(im.slice(0, length - pointsToShift));
|
|
19
|
+
if (pointsToShift > 0 && pointsToShift < nbPoints) {
|
|
20
|
+
newRE.set(re.slice(re.length - pointsToShift), nbPoints - pointsToShift);
|
|
21
|
+
newIM.set(im.slice(re.length - pointsToShift), nbPoints - pointsToShift);
|
|
22
|
+
}
|
|
23
|
+
return { re: newRE, im: newIM };
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=zeroFilling.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zeroFilling.js","sourceRoot":"","sources":["../../../../src/xyz/util/fft2d/zeroFilling.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,WAAW,CAAC,IAAc,EAAE,OAA2B;IACrE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAEvE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;KAChE;IAED,IAAI,aAAa,CAAC;IAClB,IAAI,MAAM,GAAG,CAAC,EAAE;QACd,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACpC;SAAM;QACL,aAAa,GAAG,CAAC,CAAC;KACnB;IAED,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAExB,IAAI,KAAK,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,KAAK,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAE7C,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC;IAC/C,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC;IAE/C,IAAI,aAAa,GAAG,CAAC,IAAI,aAAa,GAAG,QAAQ,EAAE;QACjD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,aAAa,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC,CAAC;QACzE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,aAAa,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC,CAAC;KAC1E;IAED,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;AAClC,CAAC"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { quadrature } from './quadrature';
|
|
2
|
+
import { fftDirectDimension, } from './util/fft2d/fftDirectDimension';
|
|
3
|
+
import { fftIndirectDimension, } from './util/fft2d/fftIndirectDimension';
|
|
4
|
+
export function xyzBidimensionalFFT(data, options) {
|
|
5
|
+
ensureData2DFid(data);
|
|
6
|
+
const { info, fnMode, digitalFilterValue = 0, zeroFilling: zeroFillingGeneral, } = options;
|
|
7
|
+
const orderedData = quadrature(data, { fnMode });
|
|
8
|
+
const { re: reData } = orderedData;
|
|
9
|
+
const nbRows = reData.length;
|
|
10
|
+
const nbColumns = reData[0].length;
|
|
11
|
+
const { direct = {}, indirect = {} } = options;
|
|
12
|
+
const { zeroFilling: zeroFillingF2 = zeroFillingGeneral } = direct;
|
|
13
|
+
const { factor: f2Factor = 2 } = zeroFillingF2 || {};
|
|
14
|
+
const nbPointsF2 = (zeroFillingF2 === null || zeroFillingF2 === void 0 ? void 0 : zeroFillingF2.nbPoints) || 2 ** Math.round(Math.log2(nbColumns * f2Factor));
|
|
15
|
+
const transformed = fftDirectDimension(orderedData, {
|
|
16
|
+
...direct,
|
|
17
|
+
fnMode,
|
|
18
|
+
digitalFilterValue,
|
|
19
|
+
zeroFilling: { nbPoints: nbPointsF2 },
|
|
20
|
+
});
|
|
21
|
+
const { zeroFilling: zeroFillingF1 } = options;
|
|
22
|
+
const { factor: f1Factor = 2 } = zeroFillingF1 || {};
|
|
23
|
+
const nbPointsF1 = (zeroFillingF1 === null || zeroFillingF1 === void 0 ? void 0 : zeroFillingF1.nbPoints) || 2 ** Math.round(Math.log2(nbRows * f1Factor));
|
|
24
|
+
const { re: reResult, im: imResult } = fftIndirectDimension(transformed, {
|
|
25
|
+
...indirect,
|
|
26
|
+
fnMode,
|
|
27
|
+
zeroFilling: { nbPoints: nbPointsF1 },
|
|
28
|
+
});
|
|
29
|
+
const minMaxXY = getMinMaxXY(info);
|
|
30
|
+
return {
|
|
31
|
+
re: {
|
|
32
|
+
z: convertToDoubleArray(reResult),
|
|
33
|
+
maxZ: reResult.max(),
|
|
34
|
+
minZ: reResult.min(),
|
|
35
|
+
...minMaxXY,
|
|
36
|
+
},
|
|
37
|
+
im: {
|
|
38
|
+
z: convertToDoubleArray(imResult),
|
|
39
|
+
maxZ: imResult.max(),
|
|
40
|
+
minZ: imResult.min(),
|
|
41
|
+
...minMaxXY,
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
function ensureData2DFid(data) {
|
|
46
|
+
if (!('re' in data)) {
|
|
47
|
+
throw new Error('bidimensional FFT only can be applied to raw data');
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
function convertToDoubleArray(data) {
|
|
51
|
+
const result = new Array(data.rows);
|
|
52
|
+
for (let i = 0; i < data.rows; i++) {
|
|
53
|
+
result[i] = new Float64Array(data.getRow(i));
|
|
54
|
+
}
|
|
55
|
+
return result;
|
|
56
|
+
}
|
|
57
|
+
function getMinMaxXY(info) {
|
|
58
|
+
const min = [];
|
|
59
|
+
const max = [];
|
|
60
|
+
for (let i = 0; i < info.baseFrequency.length; i++) {
|
|
61
|
+
const baseFrequency = Number.parseFloat(info.baseFrequency[i]);
|
|
62
|
+
const frequencyOffset = Number.parseFloat(info.frequencyOffset[i]);
|
|
63
|
+
const spectralWidth = Number.parseFloat(info.spectralWidth[i]);
|
|
64
|
+
const offset = frequencyOffset / baseFrequency;
|
|
65
|
+
min.push(offset - spectralWidth * 0.5);
|
|
66
|
+
max.push(offset + spectralWidth * 0.5);
|
|
67
|
+
}
|
|
68
|
+
return {
|
|
69
|
+
minX: min[0],
|
|
70
|
+
maxX: max[0],
|
|
71
|
+
minY: min[1],
|
|
72
|
+
maxY: max[1],
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=xyzBidimensionalFFT.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"xyzBidimensionalFFT.js","sourceRoot":"","sources":["../../src/xyz/xyzBidimensionalFFT.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nmr-processing",
|
|
3
|
-
"version": "9.3.
|
|
3
|
+
"version": "9.3.8-pre.1681135907",
|
|
4
4
|
"description": "Pure functions allowing to process NMR spectra.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -38,20 +38,20 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/cheminfo/nmr-processing#readme",
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@types/jest": "^29.
|
|
42
|
-
"cheminfo-build": "^1.
|
|
41
|
+
"@types/jest": "^29.5.0",
|
|
42
|
+
"cheminfo-build": "^1.2.0",
|
|
43
43
|
"cheminfo-types": "^1.4.0",
|
|
44
|
-
"eslint": "^8.
|
|
45
|
-
"eslint-config-cheminfo-typescript": "^11.
|
|
46
|
-
"jest": "^29.
|
|
44
|
+
"eslint": "^8.36.0",
|
|
45
|
+
"eslint-config-cheminfo-typescript": "^11.3.1",
|
|
46
|
+
"jest": "^29.5.0",
|
|
47
47
|
"jest-matcher-deep-close-to": "^3.0.2",
|
|
48
48
|
"md5": "^2.3.0",
|
|
49
49
|
"nmr-xy-testdata": "^0.5.1",
|
|
50
|
-
"openchemlib": "^8.0
|
|
51
|
-
"prettier": "^2.8.
|
|
52
|
-
"rimraf": "^4.1
|
|
53
|
-
"ts-jest": "^29.0.
|
|
54
|
-
"typescript": "^
|
|
50
|
+
"openchemlib": "^8.2.0",
|
|
51
|
+
"prettier": "^2.8.7",
|
|
52
|
+
"rimraf": "^4.4.1",
|
|
53
|
+
"ts-jest": "^29.0.5",
|
|
54
|
+
"typescript": "^5.0.2"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@lukeed/uuid": "^2.0.0",
|
|
@@ -60,12 +60,12 @@
|
|
|
60
60
|
"form-data": "^4.0.0",
|
|
61
61
|
"gyromagnetic-ratio": "^1.0.0",
|
|
62
62
|
"is-any-array": "^2.0.0",
|
|
63
|
-
"linear-sum-assignment": "^1.0.
|
|
63
|
+
"linear-sum-assignment": "^1.0.5",
|
|
64
64
|
"ml-array-mean": "^1.1.6",
|
|
65
65
|
"ml-array-rescale": "^1.3.7",
|
|
66
66
|
"ml-array-sum": "^1.1.6",
|
|
67
|
-
"ml-direct": "^0.1.
|
|
68
|
-
"ml-gsd": "^12.1.
|
|
67
|
+
"ml-direct": "^0.1.3",
|
|
68
|
+
"ml-gsd": "^12.1.3",
|
|
69
69
|
"ml-hclust": "^3.1.0",
|
|
70
70
|
"ml-levenberg-marquardt": "^4.1.0",
|
|
71
71
|
"ml-matrix": "^6.10.4",
|
|
@@ -74,11 +74,11 @@
|
|
|
74
74
|
"ml-peak-shape-generator": "^4.1.2",
|
|
75
75
|
"ml-simple-clustering": "^0.1.0",
|
|
76
76
|
"ml-sparse-matrix": "^2.1.0",
|
|
77
|
-
"ml-spectra-processing": "^
|
|
77
|
+
"ml-spectra-processing": "^12.0.0",
|
|
78
78
|
"ml-tree-set": "^0.1.1",
|
|
79
79
|
"nmr-correlation": "^2.3.3",
|
|
80
80
|
"nmredata": "^0.9.2",
|
|
81
|
-
"openchemlib-utils": "^2.
|
|
82
|
-
"spectrum-generator": "^8.0.
|
|
81
|
+
"openchemlib-utils": "^2.4.0",
|
|
82
|
+
"spectrum-generator": "^8.0.7"
|
|
83
83
|
}
|
|
84
84
|
}
|
|
@@ -10,23 +10,25 @@ export interface DataReIm {
|
|
|
10
10
|
im: DoubleArray;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
interface ApodizationOptions {
|
|
13
|
+
export interface ApodizationOptions {
|
|
14
14
|
/**
|
|
15
15
|
* number of points at the end of the shape to apply the window function inverted
|
|
16
16
|
* @default 0
|
|
17
17
|
*/
|
|
18
18
|
pointsToShift?: number;
|
|
19
|
-
compose
|
|
19
|
+
compose?: ShapeOptions;
|
|
20
20
|
}
|
|
21
|
-
export function apodization(data: DataReIm, options: ApodizationOptions) {
|
|
21
|
+
export function apodization(data: DataReIm, options: ApodizationOptions = {}) {
|
|
22
22
|
const { compose: composeOptions, pointsToShift } = options;
|
|
23
|
+
|
|
24
|
+
if (!composeOptions) return { ...data, windowData: [] };
|
|
25
|
+
|
|
23
26
|
const windowData = compose(composeOptions);
|
|
24
27
|
|
|
25
28
|
const applyWindowOptions = {
|
|
26
29
|
windowData,
|
|
27
30
|
pointsToShift,
|
|
28
31
|
};
|
|
29
|
-
|
|
30
32
|
const re = applyWindow(data.re, applyWindowOptions);
|
|
31
33
|
const im = applyWindow(data.im, applyWindowOptions);
|
|
32
34
|
|
|
@@ -42,7 +42,6 @@ export function applyWindow(data: DoubleArray, options: ApplyWindowOptions) {
|
|
|
42
42
|
for (let i = start, j = 0; i < firstEndPoint; i++) {
|
|
43
43
|
output[i] *= windowData[j++];
|
|
44
44
|
}
|
|
45
|
-
|
|
46
45
|
for (let i = dataLength - 1, j = 0; i > dataLength - pointsToShift - 1; i--) {
|
|
47
46
|
output[i] *= windowData[j++];
|
|
48
47
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { WindowFunctions } from './shapes/WindowFunctions';
|
|
2
2
|
import { exponential } from './shapes/exponential';
|
|
3
3
|
import { lorentzToGauss } from './shapes/lorentzToGauss';
|
|
4
|
+
import { sineBell } from './shapes/sineBell';
|
|
4
5
|
|
|
5
6
|
export function getFunction(shape: WindowFunctions) {
|
|
6
7
|
const { kind, options } = shape;
|
|
@@ -9,6 +10,8 @@ export function getFunction(shape: WindowFunctions) {
|
|
|
9
10
|
return exponential(options);
|
|
10
11
|
case 'lorentzToGauss':
|
|
11
12
|
return lorentzToGauss(options);
|
|
13
|
+
case 'sineBell':
|
|
14
|
+
return sineBell(options);
|
|
12
15
|
default:
|
|
13
16
|
throw Error(`Unknown distribution ${kind as string}`);
|
|
14
17
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ExponentialOptions } from './exponential';
|
|
2
2
|
import type { LorentzToGaussOptions } from './lorentzToGauss';
|
|
3
|
+
import { SineBellOptions } from './sineBell';
|
|
3
4
|
|
|
4
5
|
interface Exponential {
|
|
5
6
|
kind: 'exponential';
|
|
@@ -11,4 +12,9 @@ interface LorentToGauss {
|
|
|
11
12
|
options: LorentzToGaussOptions;
|
|
12
13
|
}
|
|
13
14
|
|
|
14
|
-
|
|
15
|
+
interface SineBell {
|
|
16
|
+
kind: 'sineBell';
|
|
17
|
+
options: SineBellOptions;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export type WindowFunctions = Exponential | LorentToGauss | SineBell;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export interface SineBellOptions {
|
|
2
|
+
/**
|
|
3
|
+
* Specifies the exponent of the sine-bell; Non-integer values are allowed.
|
|
4
|
+
* Common values are 1.0 (for ordinary sine-bell) and 2.0 (for squared-bell functions).
|
|
5
|
+
* @default 1
|
|
6
|
+
*/
|
|
7
|
+
exponent?: number;
|
|
8
|
+
/**
|
|
9
|
+
* Specifies the starting point of the sine-bell in units of pi radians.
|
|
10
|
+
* Common values are 0.0 (for a sine window which starts height at 0.0) and
|
|
11
|
+
* 0.5 (for a cosine window, which starts at height 1.0).
|
|
12
|
+
* @default 0
|
|
13
|
+
*/
|
|
14
|
+
offset?: number;
|
|
15
|
+
/**
|
|
16
|
+
* Specifies the ending point of the sine-bell in units of pi radians.
|
|
17
|
+
* Common values are 1.0 (for a window which goes to 0.0 height at the last point) and
|
|
18
|
+
* 0.95 (for a window which doesn't go all the way to 0.0).
|
|
19
|
+
* @default 1
|
|
20
|
+
*/
|
|
21
|
+
end?: number;
|
|
22
|
+
/**
|
|
23
|
+
* Specifies the number of points in the window function.
|
|
24
|
+
*/
|
|
25
|
+
length: number;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export function sineBell(options: SineBellOptions) {
|
|
29
|
+
const { exponent = 1, offset = 0, end = 1, length } = options;
|
|
30
|
+
|
|
31
|
+
if (length === undefined) {
|
|
32
|
+
throw new Error('length options should exists for sineBell shape');
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
if (end < 0 || end > 1) {
|
|
36
|
+
throw new Error(`the end parameter should be [0-1]`);
|
|
37
|
+
}
|
|
38
|
+
const c1 = Math.PI * offset;
|
|
39
|
+
const c2 = (Math.PI * (end - offset)) / (length - 1);
|
|
40
|
+
return (i: number) => Math.pow(Math.sin(c1 + c2 * i), exponent);
|
|
41
|
+
}
|
|
@@ -60,9 +60,6 @@ export async function buildAssignments(props: BuildAssignmentsProps) {
|
|
|
60
60
|
chemicalShiftRestriction = true,
|
|
61
61
|
} = restrictionByCS;
|
|
62
62
|
|
|
63
|
-
let date = new Date();
|
|
64
|
-
let timeStart = date.getTime();
|
|
65
|
-
|
|
66
63
|
let store: StoreAssignments = {
|
|
67
64
|
solutions: new TreeSet(comparator),
|
|
68
65
|
nSolutions: 0,
|
|
@@ -101,6 +98,8 @@ export async function buildAssignments(props: BuildAssignmentsProps) {
|
|
|
101
98
|
nSolutions: 0,
|
|
102
99
|
};
|
|
103
100
|
|
|
101
|
+
const timeStart = Date.now();
|
|
102
|
+
|
|
104
103
|
exploreTreeRec(
|
|
105
104
|
{
|
|
106
105
|
nSources,
|
|
@@ -43,8 +43,7 @@ export function exploreTreeRec(
|
|
|
43
43
|
diaIDPeerPossibleAssignment,
|
|
44
44
|
} = props;
|
|
45
45
|
|
|
46
|
-
|
|
47
|
-
if (currentDate.getTime() - timeStart > timeout) {
|
|
46
|
+
if (Date.now() - timeStart > timeout) {
|
|
48
47
|
new Error('timeout expired');
|
|
49
48
|
return store;
|
|
50
49
|
}
|
|
@@ -130,8 +130,6 @@ export async function buildAssignments(props: BuildAssignmentInput) {
|
|
|
130
130
|
targets,
|
|
131
131
|
} = props;
|
|
132
132
|
|
|
133
|
-
let date = new Date();
|
|
134
|
-
let timeStart = date.getTime();
|
|
135
133
|
let lowerBoundScore = minScore;
|
|
136
134
|
|
|
137
135
|
let store: StoreAssignments = {
|
|
@@ -208,6 +206,8 @@ export async function buildAssignments(props: BuildAssignmentInput) {
|
|
|
208
206
|
nSolutions: 0,
|
|
209
207
|
};
|
|
210
208
|
|
|
209
|
+
const timeStart = Date.now();
|
|
210
|
+
|
|
211
211
|
for (let partial of sourceOfPartials) {
|
|
212
212
|
exploreTree(
|
|
213
213
|
{
|
|
@@ -55,8 +55,7 @@ export function exploreTree(
|
|
|
55
55
|
diaIDPeerPossibleAssignment,
|
|
56
56
|
} = props;
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
if (currentDate.getTime() - timeStart > timeout) {
|
|
58
|
+
if (Date.now() - timeStart > timeout) {
|
|
60
59
|
new Error('timeout expired');
|
|
61
60
|
return store;
|
|
62
61
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Data2D, Data2DFid } from '../xyz/Data2D';
|
|
2
|
+
|
|
3
|
+
export type Data2DFidComplete = Required<Data2DFid>;
|
|
4
|
+
export function checkData2DFid(
|
|
5
|
+
data: Data2D,
|
|
6
|
+
): asserts data is Data2DFidComplete {
|
|
7
|
+
if (!('re' in data && 'im' in data)) {
|
|
8
|
+
throw new Error('imaginary (im) data should exists');
|
|
9
|
+
}
|
|
10
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { DoubleArray } from 'cheminfo-types';
|
|
2
|
+
|
|
3
|
+
export interface MinMaxContent {
|
|
4
|
+
z: DoubleArray[];
|
|
5
|
+
minX: number;
|
|
6
|
+
minY: number;
|
|
7
|
+
minZ: number;
|
|
8
|
+
maxX: number;
|
|
9
|
+
maxY: number;
|
|
10
|
+
maxZ: number;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export type Data2D = Data2DFid | Data2DFt;
|
|
14
|
+
|
|
15
|
+
export interface Data2DFid {
|
|
16
|
+
re: MinMaxContent;
|
|
17
|
+
im?: MinMaxContent;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export interface Data2DFt {
|
|
21
|
+
rr: MinMaxContent;
|
|
22
|
+
ri?: MinMaxContent;
|
|
23
|
+
ir?: MinMaxContent;
|
|
24
|
+
ii?: MinMaxContent;
|
|
25
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { DoubleArray } from 'cheminfo-types';
|
|
2
|
+
import { xAdd, xMultiply, xSubtract } from 'ml-spectra-processing';
|
|
3
|
+
|
|
4
|
+
import { checkData2DFid, Data2DFidComplete } from '../utilities/checkData2DFid';
|
|
5
|
+
import { Data2D } from './Data2D';
|
|
6
|
+
|
|
7
|
+
export function quadrature(data: Data2D, options: { fnMode: string }) {
|
|
8
|
+
checkData2DFid(data);
|
|
9
|
+
|
|
10
|
+
const { fnMode } = options;
|
|
11
|
+
|
|
12
|
+
switch (fnMode) {
|
|
13
|
+
case 'ttpi':
|
|
14
|
+
return ttpiQuadrature(data);
|
|
15
|
+
case 'states':
|
|
16
|
+
return shrQuadrature(data);
|
|
17
|
+
case 'echo':
|
|
18
|
+
return echoQuadrature(data);
|
|
19
|
+
default:
|
|
20
|
+
return {
|
|
21
|
+
re: data.re.z,
|
|
22
|
+
im: data.im.z,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function echoQuadrature(data: Data2DFidComplete) {
|
|
28
|
+
const {
|
|
29
|
+
re: { z: reMatrix },
|
|
30
|
+
im: { z: imMatrix },
|
|
31
|
+
} = data;
|
|
32
|
+
|
|
33
|
+
const newRe: DoubleArray[] = [];
|
|
34
|
+
const newIm: DoubleArray[] = [];
|
|
35
|
+
for (let i = 0; i < reMatrix.length; i += 2) {
|
|
36
|
+
let reCosine = reMatrix[i];
|
|
37
|
+
let imCosine = imMatrix[i];
|
|
38
|
+
let reSine = reMatrix[i + 1];
|
|
39
|
+
let imSine = imMatrix[i + 1];
|
|
40
|
+
|
|
41
|
+
newRe.push(xSubtract(xMultiply(imSine, -1), imCosine));
|
|
42
|
+
newRe.push(xSubtract(reSine, reCosine));
|
|
43
|
+
newIm.push(xAdd(reSine, reCosine));
|
|
44
|
+
newIm.push(xSubtract(imSine, imCosine));
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return { re: newRe, im: newIm };
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
function shrQuadrature(data: Data2DFidComplete) {
|
|
51
|
+
const { re, im } = data;
|
|
52
|
+
return { re: re.z, im: im.z };
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function ttpiQuadrature(data: Data2DFidComplete) {
|
|
56
|
+
const newRe: DoubleArray[] = [];
|
|
57
|
+
const newIm: DoubleArray[] = [];
|
|
58
|
+
|
|
59
|
+
const {
|
|
60
|
+
re: { z: reMatrix },
|
|
61
|
+
im: { z: imMatrix },
|
|
62
|
+
} = data;
|
|
63
|
+
for (let i = 0; i < reMatrix.length; i++) {
|
|
64
|
+
newRe.push(i % 2 ? reMatrix[i].slice() : xMultiply(reMatrix[i], -1));
|
|
65
|
+
newIm.push(i % 2 ? imMatrix[i].slice() : xMultiply(imMatrix[i], -1));
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
return { re: newRe, im: newIm };
|
|
69
|
+
}
|