nmr-processing 9.4.1 → 9.4.2-pre.1684301205
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/constants/MultiplicityPatterns.d.ts +1 -0
- package/lib/constants/MultiplicityPatterns.js +3 -1
- package/lib/constants/MultiplicityPatterns.js.map +1 -1
- package/lib/constants/couplingPatterns.d.ts +1 -0
- package/lib/constants/couplingPatterns.js +5 -1
- package/lib/constants/couplingPatterns.js.map +1 -1
- package/lib/index.d.ts +6 -1
- package/lib/index.js +6 -1
- package/lib/index.js.map +1 -1
- package/lib/multiplicity/checkMultiplet.d.ts +1 -0
- package/lib/multiplicity/checkMultiplet.js +13 -0
- package/lib/multiplicity/checkMultiplet.js.map +1 -0
- package/lib/multiplicity/checkMultiplicity.d.ts +1 -0
- package/lib/multiplicity/checkMultiplicity.js +17 -0
- package/lib/multiplicity/checkMultiplicity.js.map +1 -0
- package/lib/multiplicity/findMultiplet.d.ts +1 -0
- package/lib/multiplicity/findMultiplet.js +12 -0
- package/lib/multiplicity/findMultiplet.js.map +1 -0
- package/lib/multiplicity/joinPatterns.d.ts +3 -0
- package/lib/{utilities → multiplicity}/joinPatterns.js +2 -2
- package/lib/multiplicity/joinPatterns.js.map +1 -0
- package/lib/multiplicity/splitPatterns.js.map +1 -0
- package/lib/multiplicity/translateMultiplet.d.ts +1 -0
- package/lib/multiplicity/translateMultiplet.js +14 -0
- package/lib/multiplicity/translateMultiplet.js.map +1 -0
- package/lib/ranges/rangesToACS.js +1 -0
- package/lib/ranges/rangesToACS.js.map +1 -1
- package/lib/signal/signalJoinCouplings.d.ts +5 -0
- package/lib/signal/signalJoinCouplings.js +7 -6
- package/lib/signal/signalJoinCouplings.js.map +1 -1
- package/lib/signal/signalMultiplicityPattern.d.ts +3 -1
- package/lib/signal/signalMultiplicityPattern.js +6 -2
- package/lib/signal/signalMultiplicityPattern.js.map +1 -1
- package/lib/utilities/normalizeNucleus.d.ts +1 -0
- package/lib/utilities/normalizeNucleus.js +22 -0
- package/lib/utilities/normalizeNucleus.js.map +1 -0
- package/lib/utilities/nucleusMap.d.ts +5 -0
- package/lib/utilities/nucleusMap.js +22 -0
- package/lib/utilities/nucleusMap.js.map +1 -0
- package/lib/utilities/resurrectRange.js +1 -1
- package/lib/utilities/resurrectRange.js.map +1 -1
- package/lib/utilities/selectACSPattern.d.ts +1 -0
- package/lib/utilities/selectACSPattern.js +14 -0
- package/lib/utilities/selectACSPattern.js.map +1 -0
- package/lib/xyz/Data2D.d.ts +7 -0
- package/lib/xyz/Data2D.js +3 -0
- package/lib/xyz/Data2D.js.map +1 -0
- package/lib/xyz/util/formatZone.d.ts +2 -1
- package/lib/xyz/util/formatZone.js.map +1 -1
- package/lib/xyz/util/padData.d.ts +10 -0
- package/lib/xyz/util/padData.js +38 -0
- package/lib/xyz/util/padData.js.map +1 -0
- package/lib/xyz/xyzAutoSignalsPicking.d.ts +84 -0
- package/lib/xyz/xyzAutoSignalsPicking.js +193 -0
- package/lib/xyz/xyzAutoSignalsPicking.js.map +1 -0
- package/lib/xyz/xyzAutoZonesPicking.d.ts +0 -22
- package/lib/xyz/xyzAutoZonesPicking.js +2 -214
- package/lib/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib-esm/constants/MultiplicityPatterns.js +3 -1
- package/lib-esm/constants/MultiplicityPatterns.js.map +1 -1
- package/lib-esm/constants/couplingPatterns.js +4 -0
- package/lib-esm/constants/couplingPatterns.js.map +1 -1
- package/lib-esm/index.js +6 -1
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/multiplicity/checkMultiplet.js +9 -0
- package/lib-esm/multiplicity/checkMultiplet.js.map +1 -0
- package/lib-esm/multiplicity/checkMultiplicity.js +13 -0
- package/lib-esm/multiplicity/checkMultiplicity.js.map +1 -0
- package/lib-esm/multiplicity/findMultiplet.js +8 -0
- package/lib-esm/multiplicity/findMultiplet.js.map +1 -0
- package/lib-esm/{utilities → multiplicity}/joinPatterns.js +3 -3
- package/lib-esm/multiplicity/joinPatterns.js.map +1 -0
- package/lib-esm/multiplicity/splitPatterns.js.map +1 -0
- package/lib-esm/multiplicity/translateMultiplet.js +10 -0
- package/lib-esm/multiplicity/translateMultiplet.js.map +1 -0
- package/lib-esm/ranges/rangesToACS.js +1 -0
- package/lib-esm/ranges/rangesToACS.js.map +1 -1
- package/lib-esm/signal/signalJoinCouplings.js +7 -6
- package/lib-esm/signal/signalJoinCouplings.js.map +1 -1
- package/lib-esm/signal/signalMultiplicityPattern.js +6 -2
- package/lib-esm/signal/signalMultiplicityPattern.js.map +1 -1
- package/lib-esm/utilities/normalizeNucleus.js +18 -0
- package/lib-esm/utilities/normalizeNucleus.js.map +1 -0
- package/lib-esm/utilities/nucleusMap.js +19 -0
- package/lib-esm/utilities/nucleusMap.js.map +1 -0
- package/lib-esm/utilities/resurrectRange.js +1 -1
- package/lib-esm/utilities/resurrectRange.js.map +1 -1
- package/lib-esm/utilities/selectACSPattern.js +10 -0
- package/lib-esm/utilities/selectACSPattern.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/util/formatZone.js.map +1 -1
- package/lib-esm/xyz/util/padData.js +31 -0
- package/lib-esm/xyz/util/padData.js.map +1 -0
- package/lib-esm/xyz/xyzAutoSignalsPicking.js +163 -0
- package/lib-esm/xyz/xyzAutoSignalsPicking.js.map +1 -0
- package/lib-esm/xyz/xyzAutoZonesPicking.js +2 -188
- package/lib-esm/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/package.json +1 -1
- package/src/constants/MultiplicityPatterns.ts +4 -1
- package/src/constants/couplingPatterns.ts +9 -0
- package/src/index.ts +7 -1
- package/src/multiplicity/checkMultiplet.ts +11 -0
- package/src/multiplicity/checkMultiplicity.ts +21 -0
- package/src/multiplicity/findMultiplet.ts +8 -0
- package/src/{utilities → multiplicity}/joinPatterns.ts +9 -3
- package/src/multiplicity/translateMultiplet.ts +11 -0
- package/src/ranges/rangesToACS.ts +1 -0
- package/src/signal/signalJoinCouplings.ts +12 -5
- package/src/signal/signalMultiplicityPattern.ts +9 -2
- package/src/utilities/normalizeNucleus.ts +24 -0
- package/src/utilities/nucleusMap.ts +40 -0
- package/src/utilities/resurrectRange.ts +1 -1
- package/src/utilities/selectACSPattern.ts +10 -0
- package/src/xyz/Data2D.ts +7 -0
- package/src/xyz/util/formatZone.ts +2 -1
- package/src/xyz/util/padData.ts +37 -0
- package/src/xyz/xyzAutoSignalsPicking.ts +309 -0
- package/src/xyz/xyzAutoZonesPicking.ts +2 -276
- package/lib/utilities/joinPatterns.d.ts +0 -1
- package/lib/utilities/joinPatterns.js.map +0 -1
- package/lib/utilities/splitPatterns.js.map +0 -1
- package/lib-esm/utilities/joinPatterns.js.map +0 -1
- package/lib-esm/utilities/splitPatterns.js.map +0 -1
- /package/lib/{utilities → multiplicity}/splitPatterns.d.ts +0 -0
- /package/lib/{utilities → multiplicity}/splitPatterns.js +0 -0
- /package/lib-esm/{utilities → multiplicity}/splitPatterns.js +0 -0
- /package/src/{utilities → multiplicity}/splitPatterns.ts +0 -0
package/lib-esm/index.js
CHANGED
|
@@ -23,13 +23,13 @@ export * from './signals/optimizeSignals';
|
|
|
23
23
|
export * from './signals/signalsToFID';
|
|
24
24
|
export * from './signal/signalJoinCouplings';
|
|
25
25
|
export * from './utilities/resurrect';
|
|
26
|
-
export * from './utilities/splitPatterns';
|
|
27
26
|
export * from './utilities/rangeFromSignal';
|
|
28
27
|
export * from './utilities/getFrequency';
|
|
29
28
|
export * from './xy/xyAutoPeaksPicking';
|
|
30
29
|
export * from './xy/xyAutoRangesPicking';
|
|
31
30
|
export * from './xy/xyPeaksOptimization';
|
|
32
31
|
export * from './xyz/xyzAutoZonesPicking';
|
|
32
|
+
export * from './xyz/xyzAutoSignalsPicking';
|
|
33
33
|
export * from './xyz/xyzJResAnalyzer';
|
|
34
34
|
export * from './databases/getDatabase';
|
|
35
35
|
export * from './databases/carbonImpurities';
|
|
@@ -38,4 +38,9 @@ export * from './peaks/solventSuppression';
|
|
|
38
38
|
export * from './ranges/markSolventSignal';
|
|
39
39
|
export * from './apodization/apodization';
|
|
40
40
|
export * from './constants/MultiplicityPatterns';
|
|
41
|
+
export * from './multiplicity/findMultiplet';
|
|
42
|
+
export * from './multiplicity/splitPatterns';
|
|
43
|
+
export * from './multiplicity/checkMultiplet';
|
|
44
|
+
export * from './multiplicity/checkMultiplicity';
|
|
45
|
+
export * from './multiplicity/translateMultiplet';
|
|
41
46
|
//# sourceMappingURL=index.js.map
|
package/lib-esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAE/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAE/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AAEzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AAEtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAE3C,cAAc,2BAA2B,CAAC;AAE1C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { findMultiplet } from './findMultiplet';
|
|
2
|
+
export function checkMultiplet(string, rejected = []) {
|
|
3
|
+
const multiplet = findMultiplet(string);
|
|
4
|
+
return (multiplet &&
|
|
5
|
+
!rejected.includes(multiplet.label) &&
|
|
6
|
+
!rejected.includes(multiplet.value) &&
|
|
7
|
+
!multiplet.names.some((name) => rejected.includes(name)));
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=checkMultiplet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/checkMultiplet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,WAAqB,EAAE;IACpE,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,CACL,SAAS;QACT,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC;QACnC,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC;QACnC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACzD,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { splitPatterns } from '..';
|
|
2
|
+
import { checkMultiplet } from './checkMultiplet';
|
|
3
|
+
export function checkMultiplicity(multiplicity, rejected = []) {
|
|
4
|
+
// options to determine whether a massive (m), for example, should be considered as rejected multiplicity
|
|
5
|
+
if (multiplicity === undefined || multiplicity.length === 0) {
|
|
6
|
+
return false;
|
|
7
|
+
}
|
|
8
|
+
const multiplets = splitPatterns(multiplicity);
|
|
9
|
+
const allIncluded = multiplets.join('').length === multiplicity.length;
|
|
10
|
+
return (allIncluded &&
|
|
11
|
+
multiplets.every((_multiplet) => checkMultiplet(_multiplet, rejected)));
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=checkMultiplicity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkMultiplicity.js","sourceRoot":"","sources":["../../src/multiplicity/checkMultiplicity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAC/B,YAAoB,EACpB,WAAqB,EAAE;IAEvB,yGAAyG;IACzG,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,CAAC;IAEvE,OAAO,CACL,WAAW;QACX,UAAU,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CACvE,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { MultiplicityPatterns } from '..';
|
|
2
|
+
export function findMultiplet(name) {
|
|
3
|
+
return MultiplicityPatterns.find((multiplet) => {
|
|
4
|
+
const { label, value, names } = multiplet;
|
|
5
|
+
return [label, value, ...names].includes(name);
|
|
6
|
+
});
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=findMultiplet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"findMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/findMultiplet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAE1C,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QAC1C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { couplingPatterns } from '../constants/couplingPatterns';
|
|
1
|
+
import { couplingACSPatterns, couplingPatterns, } from '../constants/couplingPatterns';
|
|
2
2
|
import { couplingValues } from '../constants/couplingValues';
|
|
3
|
-
export function joinPatterns(patterns) {
|
|
3
|
+
export function joinPatterns(patterns, options) {
|
|
4
4
|
const sum = patterns.reduce((sum, pattern) => {
|
|
5
5
|
if (isNaN(couplingValues[pattern])) {
|
|
6
6
|
throw new Error(`pattern ${pattern} is not in ${Object.keys(couplingValues).join(' ')}`);
|
|
@@ -10,6 +10,6 @@ export function joinPatterns(patterns) {
|
|
|
10
10
|
if (!couplingPatterns[sum]) {
|
|
11
11
|
throw new Error("The joined pattern doesn't exist");
|
|
12
12
|
}
|
|
13
|
-
return couplingPatterns[sum];
|
|
13
|
+
return (options === null || options === void 0 ? void 0 : options.acsFormat) ? couplingACSPatterns[sum] : couplingPatterns[sum];
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=joinPatterns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"joinPatterns.js","sourceRoot":"","sources":["../../src/multiplicity/joinPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,UAAU,YAAY,CAC1B,QAAkB,EAClB,OAAiC;IAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QAC3C,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CACb,WAAW,OAAO,cAAc,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACxE,CAAC;SACH;QACD,OAAO,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"splitPatterns.js","sourceRoot":"","sources":["../../src/multiplicity/splitPatterns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,IAAI,gBAAgB,GAAa,EAAE,CAAC;AACpC,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,oBAAoB,EAAE;IAC1D,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;CAC/C;AACD,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { findMultiplet } from './findMultiplet';
|
|
2
|
+
export function translateMultiplet(name) {
|
|
3
|
+
const multiplet = findMultiplet(name);
|
|
4
|
+
if (!multiplet) {
|
|
5
|
+
throw new Error(`multiplet ${name} is not supported`);
|
|
6
|
+
}
|
|
7
|
+
const { value, label } = multiplet;
|
|
8
|
+
return name === label ? value : label;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=translateMultiplet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"translateMultiplet.js","sourceRoot":"","sources":["../../src/multiplicity/translateMultiplet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,mBAAmB,CAAC,CAAC;KACvD;IACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IACnC,OAAO,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;AACxC,CAAC"}
|
|
@@ -158,6 +158,7 @@ function pushmultiplicityFromSignal(signal, parenthesis) {
|
|
|
158
158
|
let multiplicity = signal.multiplicity;
|
|
159
159
|
if (!multiplicity) {
|
|
160
160
|
let joinedCouplings = signalJoinCouplings(signal, {
|
|
161
|
+
acsFormat: true,
|
|
161
162
|
tolerance: 0.05,
|
|
162
163
|
ignoreDiaIDs: true,
|
|
163
164
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rangesToACS.js","sourceRoot":"","sources":["../../src/ranges/rangesToACS.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rangesToACS.js","sourceRoot":"","sources":["../../src/ranges/rangesToACS.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import sum from 'ml-array-sum';
|
|
2
|
-
import { joinPatterns } from '../
|
|
2
|
+
import { joinPatterns } from '../multiplicity/joinPatterns';
|
|
3
3
|
const localeCompare = (a, b) => a.localeCompare(b);
|
|
4
4
|
const localeCompareJcouplingKeys = (a, b) => {
|
|
5
5
|
const aa = `${a.diaIDs.sort(localeCompare).join(' ')}`;
|
|
@@ -14,19 +14,20 @@ const takeCareDiaIDs = (a, b, tolerance) => localeCompareJcouplingKeys(a, b) ===
|
|
|
14
14
|
* If pathLength is specified and is not always the same this property will be removed.
|
|
15
15
|
*/
|
|
16
16
|
export function signalJoinCouplings(signal, options = {}) {
|
|
17
|
-
const { tolerance = 0.05, ignoreDiaIDs = false } = options;
|
|
17
|
+
const { tolerance = 0.05, ignoreDiaIDs = false, acsFormat = false } = options;
|
|
18
18
|
if (!signal.js || signal.js.length < 2)
|
|
19
19
|
return signal;
|
|
20
20
|
if (ignoreDiaIDs) {
|
|
21
21
|
checkJs(signal);
|
|
22
|
-
return groupJCouplings(signal, areThanClose, tolerance);
|
|
22
|
+
return groupJCouplings(signal, areThanClose, { tolerance, acsFormat });
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
25
|
checkJsAndDiaID(signal);
|
|
26
|
-
return groupJCouplings(signal, takeCareDiaIDs, tolerance);
|
|
26
|
+
return groupJCouplings(signal, takeCareDiaIDs, { tolerance, acsFormat });
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
function groupJCouplings(signal, comparator,
|
|
29
|
+
function groupJCouplings(signal, comparator, options) {
|
|
30
|
+
const { tolerance, acsFormat } = options;
|
|
30
31
|
signal.js.sort((a, b) => b.coupling - a.coupling);
|
|
31
32
|
let currentGroup = [signal.js[0]];
|
|
32
33
|
let groups = [currentGroup];
|
|
@@ -58,7 +59,7 @@ function groupJCouplings(signal, comparator, tolerance) {
|
|
|
58
59
|
let distances = distinctValues(group.map((group) => group.pathLength));
|
|
59
60
|
let multiplicity = joinPatterns(group
|
|
60
61
|
.filter((group) => group.multiplicity)
|
|
61
|
-
.map((group) => group.multiplicity));
|
|
62
|
+
.map((group) => group.multiplicity), { acsFormat });
|
|
62
63
|
let newJ = {
|
|
63
64
|
coupling,
|
|
64
65
|
multiplicity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signalJoinCouplings.js","sourceRoot":"","sources":["../../src/signal/signalJoinCouplings.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"signalJoinCouplings.js","sourceRoot":"","sources":["../../src/signal/signalJoinCouplings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
|
+
import { selectACSPattern } from '../utilities/selectACSPattern';
|
|
1
2
|
/**
|
|
2
3
|
* Return
|
|
3
4
|
* @param {*} signal
|
|
4
5
|
*/
|
|
5
|
-
export function signalMultiplicityPattern(signal) {
|
|
6
|
+
export function signalMultiplicityPattern(signal, options) {
|
|
6
7
|
let js = signal.js;
|
|
7
8
|
let pattern = '';
|
|
8
9
|
if (js && js.length > 0) {
|
|
9
10
|
for (let coupling of js) {
|
|
10
|
-
|
|
11
|
+
const { multiplicity = '' } = coupling;
|
|
12
|
+
pattern += (options === null || options === void 0 ? void 0 : options.acsFormat)
|
|
13
|
+
? selectACSPattern(multiplicity)
|
|
14
|
+
: multiplicity;
|
|
11
15
|
}
|
|
12
16
|
}
|
|
13
17
|
else if (signal.delta) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signalMultiplicityPattern.js","sourceRoot":"","sources":["../../src/signal/signalMultiplicityPattern.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,MAAM,UAAU,yBAAyB,
|
|
1
|
+
{"version":3,"file":"signalMultiplicityPattern.js","sourceRoot":"","sources":["../../src/signal/signalMultiplicityPattern.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE;;;GAGG;AAEH,MAAM,UAAU,yBAAyB,CACvC,MAAmB,EACnB,OAAiC;IAEjC,IAAI,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACnB,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,KAAK,IAAI,QAAQ,IAAI,EAAE,EAAE;YACvB,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC;YACvC,OAAO,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;gBAC3B,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC;gBAChC,CAAC,CAAC,YAAY,CAAC;SAClB;KACF;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE;QACvB,OAAO,GAAG,EAAE,CAAC;KACd;SAAM;QACL,OAAO,GAAG,GAAG,CAAC;KACf;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { gyromagneticRatio } from 'gyromagnetic-ratio';
|
|
2
|
+
import { nucleusSymbolMap } from './nucleusMap';
|
|
3
|
+
export function normilizeNucleus(name) {
|
|
4
|
+
if (gyromagneticRatio[name]) {
|
|
5
|
+
return name;
|
|
6
|
+
}
|
|
7
|
+
const massNumber = name.replace(/\D/g, '');
|
|
8
|
+
const atomName = name.replace(/\d*\W*/g, '').toLowerCase();
|
|
9
|
+
const nucleusName = atomName.length > 1
|
|
10
|
+
? nucleusSymbolMap[atomName]
|
|
11
|
+
: atomName.toUpperCase();
|
|
12
|
+
const symbol = `${massNumber}${nucleusName}`;
|
|
13
|
+
if (!gyromagneticRatio[symbol]) {
|
|
14
|
+
throw new Error(`nucleus ${name} is not supported`);
|
|
15
|
+
}
|
|
16
|
+
return symbol;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=normalizeNucleus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizeNucleus.js","sourceRoot":"","sources":["../../src/utilities/normalizeNucleus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAe,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,iBAAiB,CAAC,IAAc,CAAC,EAAE;QACrC,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAE3D,MAAM,WAAW,GACf,QAAQ,CAAC,MAAM,GAAG,CAAC;QACjB,CAAC,CAAC,gBAAgB,CAAC,QAAuB,CAAC;QAC3C,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAE7B,MAAM,MAAM,GAAG,GAAG,UAAU,GAAG,WAAW,EAAE,CAAC;IAC7C,IAAI,CAAC,iBAAiB,CAAC,MAAgB,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,mBAAmB,CAAC,CAAC;KACrD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export const nucleusSymbolMap = {
|
|
2
|
+
proton: '1H',
|
|
3
|
+
hydrogen: 'H',
|
|
4
|
+
helium: 'He',
|
|
5
|
+
lithium: 'Li',
|
|
6
|
+
carbon: 'C',
|
|
7
|
+
nitrogen: 'N',
|
|
8
|
+
oxigen: 'O',
|
|
9
|
+
fluorine: 'F',
|
|
10
|
+
sodium: 'Na',
|
|
11
|
+
aluminum: 'Al',
|
|
12
|
+
silicon: 'Si',
|
|
13
|
+
phosphorus: 'P',
|
|
14
|
+
iron: 'Fe',
|
|
15
|
+
copper: 'Cu',
|
|
16
|
+
zinc: 'Zn',
|
|
17
|
+
xenon: 'Xe',
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=nucleusMap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nucleusMap.js","sourceRoot":"","sources":["../../src/utilities/nucleusMap.ts"],"names":[],"mappings":"AAsBA,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAChD,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,GAAG;IACb,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,GAAG;IACb,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,GAAG;IACb,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,UAAU,EAAE,GAAG;IACf,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;CACZ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { splitPatterns } from '../multiplicity/splitPatterns';
|
|
1
2
|
import { rangeFromSignal } from './rangeFromSignal';
|
|
2
3
|
import { splitParenthesis } from './splitParenthesis';
|
|
3
|
-
import { splitPatterns } from './splitPatterns';
|
|
4
4
|
export function resurrectRange(part, options = {}) {
|
|
5
5
|
const { nucleus = '1h', frequency = 400 } = options;
|
|
6
6
|
const split = splitParenthesis(part);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resurrectRange.js","sourceRoot":"","sources":["../../src/utilities/resurrectRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { couplingACSPatterns } from '..';
|
|
2
|
+
import { couplingValues } from '../constants/couplingValues';
|
|
3
|
+
export function selectACSPattern(pattern) {
|
|
4
|
+
const multiplicity = couplingValues[pattern];
|
|
5
|
+
if (!multiplicity) {
|
|
6
|
+
throw new Error(`multiplicity pattern ${pattern} is not supported`);
|
|
7
|
+
}
|
|
8
|
+
return couplingACSPatterns[multiplicity];
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=selectACSPattern.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"selectACSPattern.js","sourceRoot":"","sources":["../../src/utilities/selectACSPattern.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,mBAAmB,CAAC,CAAC;KACrE;IACD,OAAO,mBAAmB,CAAC,YAAY,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Data2D.js","sourceRoot":"","sources":["../../src/xyz/Data2D.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatZone.js","sourceRoot":"","sources":["../../../src/xyz/util/formatZone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"formatZone.js","sourceRoot":"","sources":["../../../src/xyz/util/formatZone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAKhD,MAAM,UAAU,WAAW,CAAC,OAA4B;IACtD,IAAI,KAAK,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpC,IAAI,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE;YACrC,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;aACxB;SACF;QACD,KAAK,CAAC,IAAI,CAAC;YACT,EAAE,EAAE,UAAU,EAAE;YAChB,CAAC,EAAE;gBACD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;aACf;YACD,CAAC,EAAE;gBACD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;aACf;YACD,OAAO,EAAE,CAAC,MAAM,CAAC;SAClB,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import Matrix from 'ml-matrix';
|
|
2
|
+
export function padData(spectraData, options) {
|
|
3
|
+
let { minX, maxX, minY, maxY } = spectraData;
|
|
4
|
+
const width = options.width;
|
|
5
|
+
let nbPoints = spectraData.z[0].length;
|
|
6
|
+
let nbSubSpectra = spectraData.z.length;
|
|
7
|
+
let yInterval = (maxY - minY) / (nbSubSpectra - 1);
|
|
8
|
+
let xInterval = (maxX - minX) / (nbPoints - 1);
|
|
9
|
+
let yDiff = width - nbSubSpectra;
|
|
10
|
+
let xDiff = Math.max(width - nbPoints, 0);
|
|
11
|
+
if (xDiff % 2)
|
|
12
|
+
xDiff++;
|
|
13
|
+
if (yDiff % 2)
|
|
14
|
+
yDiff++;
|
|
15
|
+
let xOffset = xDiff / 2;
|
|
16
|
+
let yOffset = yDiff / 2;
|
|
17
|
+
let newMatrix = Matrix.zeros(nbSubSpectra + yDiff, nbPoints + xDiff);
|
|
18
|
+
for (let i = 0; i < nbSubSpectra; i++) {
|
|
19
|
+
for (let j = 0; j < nbPoints; j++) {
|
|
20
|
+
newMatrix.set(i + yOffset, j + xOffset, spectraData.z[i][j]);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return {
|
|
24
|
+
z: newMatrix.to2DArray(),
|
|
25
|
+
minX: minX - xOffset * xInterval,
|
|
26
|
+
maxX: maxX + xOffset * xInterval,
|
|
27
|
+
minY: minY - yOffset * yInterval,
|
|
28
|
+
maxY: maxY + yOffset * yInterval,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=padData.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"padData.js","sourceRoot":"","sources":["../../../src/xyz/util/padData.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,WAAW,CAAC;AAI/B,MAAM,UAAU,OAAO,CAAC,WAAmB,EAAE,OAA0B;IACrE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,IAAI,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;IAExC,IAAI,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACnD,IAAI,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAE/C,IAAI,KAAK,GAAG,KAAK,GAAG,YAAY,CAAC;IACjC,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC1C,IAAI,KAAK,GAAG,CAAC;QAAE,KAAK,EAAE,CAAC;IACvB,IAAI,KAAK,GAAG,CAAC;QAAE,KAAK,EAAE,CAAC;IAEvB,IAAI,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC;IACxB,IAAI,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC;IACxB,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,EAAE,QAAQ,GAAG,KAAK,CAAC,CAAC;IACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YACjC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D;KACF;IAED,OAAO;QACL,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE;QACxB,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS;QAChC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS;QAChC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS;QAChC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS;KACjC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { v4 as generateID } from '@lukeed/uuid';
|
|
2
|
+
import * as convolution from 'ml-matrix-convolution';
|
|
3
|
+
import * as matrixPeakFinders from 'ml-matrix-peaks-finder';
|
|
4
|
+
import simpleClustering from 'ml-simple-clustering';
|
|
5
|
+
import { addMissingIDs } from '../peaks/util/addMissingIDs';
|
|
6
|
+
import { determineRealTop } from '../peaks/util/determineRealTop';
|
|
7
|
+
import { getKernel } from '../peaks/util/getKernel';
|
|
8
|
+
import * as PeakOptimizer from '../peaks/util/peakOptimizer';
|
|
9
|
+
import { padData } from './util/padData';
|
|
10
|
+
const smallFilter = [
|
|
11
|
+
[0, 0, 1, 2, 2, 2, 1, 0, 0],
|
|
12
|
+
[0, 1, 4, 7, 7, 7, 4, 1, 0],
|
|
13
|
+
[1, 4, 5, 3, 0, 3, 5, 4, 1],
|
|
14
|
+
[2, 7, 3, -12, -23, -12, 3, 7, 2],
|
|
15
|
+
[2, 7, 0, -23, -40, -23, 0, 7, 2],
|
|
16
|
+
[2, 7, 3, -12, -23, -12, 3, 7, 2],
|
|
17
|
+
[1, 4, 5, 3, 0, 3, 5, 4, 1],
|
|
18
|
+
[0, 1, 3, 7, 7, 7, 3, 1, 0],
|
|
19
|
+
[0, 0, 1, 2, 2, 2, 1, 0, 0],
|
|
20
|
+
];
|
|
21
|
+
export function xyzAutoSignalsPicking(spectraData, options) {
|
|
22
|
+
let { sizeToPad = 14, realTopDetection = true, thresholdFactor = 0.5, nuclei = ['1H', '1H'], observedFrequencies, enhanceSymmetry = false, clean = true, maxPercentCutOff = 0.03, tolerances = [24, 24], convolutionByFFT = true, kernel: kernelOptions, } = options;
|
|
23
|
+
if (!Array.isArray(observedFrequencies) &&
|
|
24
|
+
!ArrayBuffer.isView(observedFrequencies)) {
|
|
25
|
+
throw new Error('observedFrequencies is mandatory');
|
|
26
|
+
}
|
|
27
|
+
thresholdFactor = thresholdFactor === 0 ? 1 : Math.abs(thresholdFactor);
|
|
28
|
+
let nbPoints = spectraData.z[0].length;
|
|
29
|
+
let nbSubSpectra = spectraData.z.length;
|
|
30
|
+
if (nbSubSpectra < sizeToPad) {
|
|
31
|
+
spectraData = padData(spectraData, { width: sizeToPad });
|
|
32
|
+
nbPoints = spectraData.z[0].length;
|
|
33
|
+
nbSubSpectra = spectraData.z.length;
|
|
34
|
+
}
|
|
35
|
+
let absoluteData = new Float64Array(nbPoints * nbSubSpectra);
|
|
36
|
+
let originalData = new Float64Array(nbPoints * nbSubSpectra);
|
|
37
|
+
for (let iSubSpectra = 0; iSubSpectra < nbSubSpectra; iSubSpectra++) {
|
|
38
|
+
let spectrum = spectraData.z[iSubSpectra];
|
|
39
|
+
for (let iCol = 0; iCol < nbPoints; iCol++) {
|
|
40
|
+
let index = iSubSpectra * nbPoints + iCol;
|
|
41
|
+
absoluteData[index] = Math.abs(spectrum[iCol]);
|
|
42
|
+
originalData[index] = spectrum[iCol]; //@todo pensar si se puede evitar originalData
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
const kernel = kernelOptions ? getKernel(kernelOptions) : smallFilter;
|
|
46
|
+
let convolutedSpectrum = convolutionByFFT
|
|
47
|
+
? convolution.fft(absoluteData, kernel, {
|
|
48
|
+
rows: nbSubSpectra,
|
|
49
|
+
cols: nbPoints,
|
|
50
|
+
})
|
|
51
|
+
: convolution.direct(absoluteData, kernel, {
|
|
52
|
+
rows: nbSubSpectra,
|
|
53
|
+
cols: nbPoints,
|
|
54
|
+
});
|
|
55
|
+
let peaksMC1 = matrixPeakFinders.findPeaks2DRegion(absoluteData, {
|
|
56
|
+
originalData,
|
|
57
|
+
filteredData: convolutedSpectrum,
|
|
58
|
+
rows: nbSubSpectra,
|
|
59
|
+
cols: nbPoints,
|
|
60
|
+
nStdDev: thresholdFactor,
|
|
61
|
+
});
|
|
62
|
+
if (clean) {
|
|
63
|
+
// Remove peaks with less than x% of the intensity of the highest peak
|
|
64
|
+
peaksMC1 = PeakOptimizer.clean(peaksMC1, maxPercentCutOff);
|
|
65
|
+
}
|
|
66
|
+
let signals = createSignals2D(addMissingIDs(peaksMC1), {
|
|
67
|
+
nRows: nbSubSpectra,
|
|
68
|
+
nCols: nbPoints,
|
|
69
|
+
minX: spectraData.minX,
|
|
70
|
+
maxX: spectraData.maxX,
|
|
71
|
+
minY: spectraData.minY,
|
|
72
|
+
maxY: spectraData.maxY,
|
|
73
|
+
absoluteData,
|
|
74
|
+
originalData,
|
|
75
|
+
tolerances,
|
|
76
|
+
nuclei,
|
|
77
|
+
observedFrequencies,
|
|
78
|
+
realTopDetection,
|
|
79
|
+
});
|
|
80
|
+
if (enhanceSymmetry) {
|
|
81
|
+
signals = PeakOptimizer.enhanceSymmetry(signals);
|
|
82
|
+
}
|
|
83
|
+
return signals;
|
|
84
|
+
}
|
|
85
|
+
function createSignals2D(peaks, options) {
|
|
86
|
+
let { nCols, nRows, absoluteData, originalData, observedFrequencies, tolerances, nuclei, realTopDetection, minY, maxY, minX, maxX, } = options;
|
|
87
|
+
let [nucleusX, nucleusY] = nuclei;
|
|
88
|
+
let [toleranceX, toleranceY] = tolerances;
|
|
89
|
+
let [observeFrequencyX, observeFrequencyY] = observedFrequencies;
|
|
90
|
+
let dy = (maxY - minY) / (nRows - 1);
|
|
91
|
+
let dx = (maxX - minX) / (nCols - 1);
|
|
92
|
+
if (realTopDetection) {
|
|
93
|
+
peaks = determineRealTop(peaks, {
|
|
94
|
+
nCols,
|
|
95
|
+
absoluteData,
|
|
96
|
+
originalData,
|
|
97
|
+
minX,
|
|
98
|
+
maxX,
|
|
99
|
+
minY,
|
|
100
|
+
maxY,
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
for (let i = peaks.length - 1; i >= 0; i--) {
|
|
104
|
+
let { x, y } = peaks[i];
|
|
105
|
+
peaks[i].x = minX + dx * x;
|
|
106
|
+
peaks[i].y = minY + dy * y;
|
|
107
|
+
peaks[i].minX = minX + dx * peaks[i].minX;
|
|
108
|
+
peaks[i].minY = minY + dy * peaks[i].minY;
|
|
109
|
+
peaks[i].maxX = minX + dx * peaks[i].maxX;
|
|
110
|
+
peaks[i].maxY = minY + dy * peaks[i].maxY;
|
|
111
|
+
// Still having problems to correctly detect peaks on those areas. So I'm removing everything there.
|
|
112
|
+
}
|
|
113
|
+
// The connectivity matrix is an square and symmetric matrix, so we'll only store the upper diagonal in an
|
|
114
|
+
// array like form
|
|
115
|
+
let connectivity = [];
|
|
116
|
+
for (let i = 0; i < peaks.length; i++) {
|
|
117
|
+
for (let j = i; j < peaks.length; j++) {
|
|
118
|
+
if (Math.abs(peaks[i].x - peaks[j].x) * observeFrequencyX < toleranceX &&
|
|
119
|
+
Math.abs(peaks[i].y - peaks[j].y) * observeFrequencyY < toleranceY) {
|
|
120
|
+
// 24*24Hz We cannot distinguish peaks with less than 20 Hz of separation
|
|
121
|
+
connectivity.push(1);
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
connectivity.push(0);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
let clusters = simpleClustering(connectivity);
|
|
129
|
+
let signals = [];
|
|
130
|
+
if (clusters) {
|
|
131
|
+
for (const cluster of clusters) {
|
|
132
|
+
let signal = {
|
|
133
|
+
id: generateID(),
|
|
134
|
+
x: {
|
|
135
|
+
delta: 0,
|
|
136
|
+
nucleus: nucleusX,
|
|
137
|
+
resolution: dx,
|
|
138
|
+
},
|
|
139
|
+
y: {
|
|
140
|
+
delta: 0,
|
|
141
|
+
nucleus: nucleusY,
|
|
142
|
+
resolution: dy,
|
|
143
|
+
},
|
|
144
|
+
};
|
|
145
|
+
let peaks2D = [];
|
|
146
|
+
let sumZ = 0;
|
|
147
|
+
for (let jPeak = 0; jPeak < cluster.length; jPeak++) {
|
|
148
|
+
if (cluster[jPeak] === 1) {
|
|
149
|
+
peaks2D.push(peaks[jPeak]);
|
|
150
|
+
signal.x.delta += peaks[jPeak].x * peaks[jPeak].z;
|
|
151
|
+
signal.y.delta += peaks[jPeak].y * peaks[jPeak].z;
|
|
152
|
+
sumZ += peaks[jPeak].z;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
signal.x.delta /= sumZ;
|
|
156
|
+
signal.y.delta /= sumZ;
|
|
157
|
+
signal.peaks = peaks2D;
|
|
158
|
+
signals.push(signal);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return signals;
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=xyzAutoSignalsPicking.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"xyzAutoSignalsPicking.js","sourceRoot":"","sources":["../../src/xyz/xyzAutoSignalsPicking.ts"],"names":[],"mappings":"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"}
|