nmr-processing 9.0.3 → 9.1.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/assignment/get13CAssignments.js +2 -5
- package/lib/assignment/get13CAssignments.js.map +1 -1
- package/lib/assignment/get1HAssignments.js +2 -5
- package/lib/assignment/get1HAssignments.js.map +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.d.ts +1 -1
- package/lib/assignment/utils/getAssignment/checkIDs.js +3 -6
- package/lib/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib/peaks/NMRPeak1D.d.ts +1 -0
- package/lib/peaks/peakToXY.js +6 -1
- package/lib/peaks/peakToXY.js.map +1 -1
- package/lib/peaks/peaksFilterImpurities.d.ts +1 -1
- package/lib/peaks/peaksFilterImpurities.js.map +1 -1
- package/lib/peaks/peaksToRanges.js +3 -0
- package/lib/peaks/peaksToRanges.js.map +1 -1
- package/lib/peaks/peaksToXY.js +4 -1
- package/lib/peaks/peaksToXY.js.map +1 -1
- package/lib/peaks/solventSuppression.js +2 -1
- package/lib/peaks/solventSuppression.js.map +1 -1
- package/lib/peaks/util/addMissingIDs.d.ts +7 -0
- package/lib/peaks/util/addMissingIDs.js +16 -0
- package/lib/peaks/util/addMissingIDs.js.map +1 -0
- package/lib/peaks/util/convertWidth.d.ts +3 -3
- package/lib/peaks/util/convertWidth.js +7 -7
- package/lib/peaks/util/convertWidth.js.map +1 -1
- package/lib/peaks/util/convertWidthToHz.d.ts +2 -2
- package/lib/peaks/util/convertWidthToHz.js.map +1 -1
- package/lib/peaks/util/convertWidthToPPM.d.ts +1 -1
- package/lib/peaks/util/convertWidthToPPM.js.map +1 -1
- package/lib/peaks/util/determineRealTop.d.ts +1 -1
- package/lib/peaks/util/determineRealTop.js.map +1 -1
- package/lib/peaks/util/setIDs.d.ts +5 -0
- package/lib/peaks/util/setIDs.js +14 -0
- package/lib/peaks/util/setIDs.js.map +1 -0
- package/lib/prediction/predictCOSY.d.ts +4 -2
- package/lib/prediction/predictCarbon.js +4 -1
- package/lib/prediction/predictCarbon.js.map +1 -1
- package/lib/prediction/predictHMBC.d.ts +4 -2
- package/lib/prediction/predictHSQC.d.ts +4 -2
- package/lib/prediction/predictProton.js +2 -0
- package/lib/prediction/predictProton.js.map +1 -1
- package/lib/prediction/utils/predict2D.d.ts +4 -2
- package/lib/prediction/utils/predict2D.js +6 -3
- package/lib/prediction/utils/predict2D.js.map +1 -1
- package/lib/ranges/markSolventSignal.js +4 -6
- package/lib/ranges/markSolventSignal.js.map +1 -1
- package/lib/ranges/utils/joinRanges.js +2 -0
- package/lib/ranges/utils/joinRanges.js.map +1 -1
- package/lib/signals/signalsJoin.js +2 -0
- package/lib/signals/signalsJoin.js.map +1 -1
- package/lib/signals/signalsToRanges.d.ts +3 -1
- package/lib/signals/signalsToRanges.js +2 -0
- package/lib/signals/signalsToRanges.js.map +1 -1
- package/lib/signals/utils/jAnalyzer.d.ts +1 -0
- package/lib/signals/utils/jAnalyzer.js.map +1 -1
- package/lib/utilities/clone.d.ts +1 -0
- package/lib/utilities/clone.js +9 -0
- package/lib/utilities/clone.js.map +1 -0
- package/lib/utilities/hasProperty.d.ts +3 -0
- package/lib/utilities/hasProperty.js +8 -0
- package/lib/utilities/hasProperty.js.map +1 -0
- package/lib/xy/xyAutoPeaksPicking.d.ts +4 -2
- package/lib/xy/xyAutoPeaksPicking.js +17 -7
- package/lib/xy/xyAutoPeaksPicking.js.map +1 -1
- package/lib/xy/xyPeaksOptimization.d.ts +3 -1
- package/lib/xy/xyPeaksOptimization.js.map +1 -1
- package/lib/xyz/NMRSignal2D.d.ts +2 -2
- package/lib/xyz/util/formatZone.d.ts +2 -3
- package/lib/xyz/util/formatZone.js +2 -0
- package/lib/xyz/util/formatZone.js.map +1 -1
- package/lib/xyz/xyzAutoZonesPicking.d.ts +7 -1
- package/lib/xyz/xyzAutoZonesPicking.js +8 -5
- package/lib/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib/xyz/xyzJResAnalyzer.d.ts +4 -1
- package/lib/xyz/xyzJResAnalyzer.js +8 -3
- package/lib/xyz/xyzJResAnalyzer.js.map +1 -1
- package/lib-esm/assignment/get13CAssignments.js +1 -1
- package/lib-esm/assignment/get13CAssignments.js.map +1 -1
- package/lib-esm/assignment/get1HAssignments.js +1 -1
- package/lib-esm/assignment/get1HAssignments.js.map +1 -1
- package/lib-esm/assignment/utils/getAssignment/checkIDs.js +1 -1
- package/lib-esm/assignment/utils/getAssignment/checkIDs.js.map +1 -1
- package/lib-esm/peaks/peakToXY.js +6 -1
- package/lib-esm/peaks/peakToXY.js.map +1 -1
- package/lib-esm/peaks/peaksFilterImpurities.js.map +1 -1
- package/lib-esm/peaks/peaksToRanges.js +3 -0
- package/lib-esm/peaks/peaksToRanges.js.map +1 -1
- package/lib-esm/peaks/peaksToXY.js +4 -1
- package/lib-esm/peaks/peaksToXY.js.map +1 -1
- package/lib-esm/peaks/solventSuppression.js +2 -1
- package/lib-esm/peaks/solventSuppression.js.map +1 -1
- package/lib-esm/peaks/util/addMissingIDs.js +12 -0
- package/lib-esm/peaks/util/addMissingIDs.js.map +1 -0
- package/lib-esm/peaks/util/convertWidth.js +7 -7
- package/lib-esm/peaks/util/convertWidth.js.map +1 -1
- package/lib-esm/peaks/util/convertWidthToHz.js.map +1 -1
- package/lib-esm/peaks/util/convertWidthToPPM.js.map +1 -1
- package/lib-esm/peaks/util/determineRealTop.js.map +1 -1
- package/lib-esm/peaks/util/setIDs.js +10 -0
- package/lib-esm/peaks/util/setIDs.js.map +1 -0
- package/lib-esm/prediction/predictCarbon.js +4 -1
- package/lib-esm/prediction/predictCarbon.js.map +1 -1
- package/lib-esm/prediction/predictProton.js +2 -0
- package/lib-esm/prediction/predictProton.js.map +1 -1
- package/lib-esm/prediction/utils/predict2D.js +6 -3
- package/lib-esm/prediction/utils/predict2D.js.map +1 -1
- package/lib-esm/ranges/markSolventSignal.js +3 -2
- package/lib-esm/ranges/markSolventSignal.js.map +1 -1
- package/lib-esm/ranges/utils/joinRanges.js +2 -0
- package/lib-esm/ranges/utils/joinRanges.js.map +1 -1
- package/lib-esm/signals/signalsJoin.js +2 -0
- package/lib-esm/signals/signalsJoin.js.map +1 -1
- package/lib-esm/signals/signalsToRanges.js +2 -0
- package/lib-esm/signals/signalsToRanges.js.map +1 -1
- package/lib-esm/signals/utils/jAnalyzer.js.map +1 -1
- package/lib-esm/utilities/clone.js +5 -0
- package/lib-esm/utilities/clone.js.map +1 -0
- package/lib-esm/utilities/hasProperty.js +4 -0
- package/lib-esm/utilities/hasProperty.js.map +1 -0
- package/lib-esm/xy/xyAutoPeaksPicking.js +18 -8
- package/lib-esm/xy/xyAutoPeaksPicking.js.map +1 -1
- package/lib-esm/xy/xyPeaksOptimization.js.map +1 -1
- package/lib-esm/xyz/util/formatZone.js +2 -0
- package/lib-esm/xyz/util/formatZone.js.map +1 -1
- package/lib-esm/xyz/xyzAutoZonesPicking.js +8 -5
- package/lib-esm/xyz/xyzAutoZonesPicking.js.map +1 -1
- package/lib-esm/xyz/xyzJResAnalyzer.js +8 -3
- package/lib-esm/xyz/xyzJResAnalyzer.js.map +1 -1
- package/package.json +4 -3
- package/src/assignment/get13CAssignments.ts +1 -1
- package/src/assignment/get1HAssignments.ts +1 -1
- package/src/assignment/utils/getAssignment/checkIDs.ts +2 -1
- package/src/ml-matrix-peaks-finder.d.ts +1 -0
- package/src/peaks/NMRPeak1D.ts +1 -0
- package/src/peaks/peakToXY.ts +12 -1
- package/src/peaks/peaksFilterImpurities.ts +4 -4
- package/src/peaks/peaksToRanges.ts +3 -0
- package/src/peaks/peaksToXY.ts +6 -3
- package/src/peaks/solventSuppression.ts +2 -1
- package/src/peaks/util/addMissingIDs.ts +17 -0
- package/src/peaks/util/convertWidth.ts +16 -11
- package/src/peaks/util/convertWidthToHz.ts +5 -2
- package/src/peaks/util/convertWidthToPPM.ts +4 -1
- package/src/peaks/util/determineRealTop.ts +1 -1
- package/src/peaks/util/setIDs.ts +14 -0
- package/src/prediction/predictCarbon.ts +4 -1
- package/src/prediction/predictProton.ts +2 -0
- package/src/prediction/utils/predict2D.ts +6 -3
- package/src/ranges/markSolventSignal.ts +4 -2
- package/src/ranges/utils/joinRanges.ts +3 -0
- package/src/signals/signalsJoin.ts +2 -0
- package/src/signals/signalsToRanges.ts +5 -2
- package/src/signals/utils/jAnalyzer.ts +1 -0
- package/src/utilities/clone.ts +5 -0
- package/src/utilities/hasProperty.ts +6 -0
- package/src/xy/xyAutoPeaksPicking.ts +34 -14
- package/src/xy/xyPeaksOptimization.ts +2 -2
- package/src/xyz/NMRSignal2D.ts +2 -2
- package/src/xyz/util/formatZone.ts +6 -4
- package/src/xyz/xyzAutoZonesPicking.ts +24 -9
- package/src/xyz/xyzJResAnalyzer.ts +24 -16
- package/lib/assignment/utils/generateID.d.ts +0 -1
- package/lib/assignment/utils/generateID.js +0 -13
- package/lib/assignment/utils/generateID.js.map +0 -1
- package/lib-esm/assignment/utils/generateID.js +0 -10
- package/lib-esm/assignment/utils/generateID.js.map +0 -1
- package/src/assignment/utils/generateID.ts +0 -11
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.get13CAssignments = void 0;
|
|
4
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
7
5
|
const openchemlib_utils_1 = require("openchemlib-utils");
|
|
8
6
|
const predictCarbon_1 = require("../prediction/predictCarbon");
|
|
9
7
|
const buildAssignments_1 = require("./utils/buildAssignments");
|
|
10
|
-
const generateID_1 = __importDefault(require("./utils/generateID"));
|
|
11
8
|
function checkAtomsAndDiaIDs(signals) {
|
|
12
9
|
for (const signal of signals) {
|
|
13
10
|
if (!signal.atoms)
|
|
@@ -36,7 +33,7 @@ async function get13CAssignments(ranges, molecule, options = {}) {
|
|
|
36
33
|
const copyRanges = checkIntegration(ranges);
|
|
37
34
|
const targets = {};
|
|
38
35
|
for (const range of copyRanges) {
|
|
39
|
-
const { id = (0,
|
|
36
|
+
const { id = (0, uuid_1.v4)() } = range;
|
|
40
37
|
targets[id] = JSON.parse(JSON.stringify(range));
|
|
41
38
|
}
|
|
42
39
|
return (0, buildAssignments_1.buildAssignments)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get13CAssignments.js","sourceRoot":"","sources":["../../src/assignment/get13CAssignments.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get13CAssignments.js","sourceRoot":"","sources":["../../src/assignment/get13CAssignments.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,yDAAsE;AAGtE,+DAGqC;AAOrC,+DAA+E;AAE/E,SAAS,mBAAmB,CAC1B,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACzE;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkB;IAC1C,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;QACxB,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;YAAE,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;KAC5D;IACD,OAAO,MAAmC,CAAC;AAC7C,CAAC;AA8BM,KAAK,UAAU,iBAAiB,CACrC,MAAkB,EAClB,QAAkB,EAClB,UAAoC,EAAE;IAEtC,IAAI,EACF,eAAe,GAAG,EAAE,EACpB,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,GAAG,CAAC,EACvB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,GACvB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,IAAA,qDAAiC,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAE3E,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE;QAC9B,MAAM,EAAE,EAAE,GAAG,IAAA,SAAU,GAAE,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACjD;IAED,OAAO,IAAA,mCAAgB,EAAC;QACtB,eAAe;QACf,OAAO;QACP,QAAQ;QACR,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,aAAa;QACb,yBAAyB,EAAE,KAAK;KACjC,CAAC,CAAC;AACL,CAAC;AAxCD,8CAwCC"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.get1HAssignments = void 0;
|
|
4
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
7
5
|
const openchemlib_utils_1 = require("openchemlib-utils");
|
|
8
6
|
const predictProton_1 = require("../prediction/predictProton");
|
|
9
7
|
const buildAssignments_1 = require("./utils/buildAssignments");
|
|
10
|
-
const generateID_1 = __importDefault(require("./utils/generateID"));
|
|
11
8
|
function checkAtomsAndDiaIDs(signals) {
|
|
12
9
|
for (const signal of signals) {
|
|
13
10
|
if (!signal.atoms)
|
|
@@ -37,7 +34,7 @@ async function get1HAssignments(ranges, molecule, options = {}) {
|
|
|
37
34
|
checkAtomsAndDiaIDs(joinedSignals);
|
|
38
35
|
const targets = {};
|
|
39
36
|
for (const range of ranges) {
|
|
40
|
-
const { id = (0,
|
|
37
|
+
const { id = (0, uuid_1.v4)() } = range;
|
|
41
38
|
targets[id] = JSON.parse(JSON.stringify(range));
|
|
42
39
|
}
|
|
43
40
|
return (0, buildAssignments_1.buildAssignments)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get1HAssignments.js","sourceRoot":"","sources":["../../src/assignment/get1HAssignments.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get1HAssignments.js","sourceRoot":"","sources":["../../src/assignment/get1HAssignments.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,yDAAsE;AAGtE,+DAGqC;AAIrC,+DAA+E;AAO/E,SAAS,mBAAmB,CAC1B,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACzE;AACH,CAAC;AAID,SAAS,mBAAmB,CAC1B,MAAkB;IAElB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;QACxB,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;KACF;AACH,CAAC;AAkCM,KAAK,UAAU,gBAAgB,CACpC,MAAkB,EAClB,QAAkB,EAClB,UAAmC,EAAE;IAErC,IAAI,EACF,eAAe,EACf,QAAQ,GAAG,CAAC,EACZ,YAAY,GAAG,EAAE,EACjB,mBAAmB,GAAG,CAAC,EACvB,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,EAAE,GACvB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAChC,IAAA,qDAAiC,EAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAE3E,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC5B,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAEnC,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,EAAE,EAAE,GAAG,IAAA,SAAU,GAAE,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACjD;IAED,OAAO,IAAA,mCAAgB,EAAC;QACtB,eAAe;QACf,OAAO;QACP,QAAQ;QACR,mBAAmB;QACnB,YAAY;QACZ,OAAO;QACP,aAAa;QACb,yBAAyB,EAAE,IAAI;KAChC,CAAC,CAAC;AACL,CAAC;AA1CD,4CA0CC"}
|
|
@@ -3,4 +3,4 @@ import type { SpectraData } from '../../getAssignments';
|
|
|
3
3
|
import type { SpectraDataWithIds, NMRRangeWithIds, NMRZoneWithIds } from '../../nmrAssigment';
|
|
4
4
|
export declare function checkIDs(input?: SpectraData[]): SpectraDataWithIds[];
|
|
5
5
|
export declare function hasIDs(data: NMRRange[] | NMRZone[]): asserts data is NMRRangeWithIds[] | NMRZoneWithIds[];
|
|
6
|
-
export declare function addIDs<T extends NMRRange[] | NMRZone[]>(data: T): T &
|
|
6
|
+
export declare function addIDs<T extends NMRRange[] | NMRZone[]>(data: T): (T & NMRRangeWithIds[]) | (T & NMRZoneWithIds[]);
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.addIDs = exports.hasIDs = exports.checkIDs = void 0;
|
|
7
|
-
const
|
|
4
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
8
5
|
const isSpectraData1D_1 = require("./isSpectraData1D");
|
|
9
6
|
function checkIDs(input = []) {
|
|
10
7
|
let inputClone = JSON.parse(JSON.stringify(input));
|
|
@@ -40,10 +37,10 @@ exports.hasIDs = hasIDs;
|
|
|
40
37
|
function addIDs(data) {
|
|
41
38
|
for (const element of data) {
|
|
42
39
|
if (!element.id)
|
|
43
|
-
element.id = (0,
|
|
40
|
+
element.id = (0, uuid_1.v4)();
|
|
44
41
|
for (let signal of element.signals || []) {
|
|
45
42
|
if (!signal.id)
|
|
46
|
-
signal.id = (0,
|
|
43
|
+
signal.id = (0, uuid_1.v4)();
|
|
47
44
|
}
|
|
48
45
|
}
|
|
49
46
|
hasIDs(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkIDs.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/checkIDs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"checkIDs.js","sourceRoot":"","sources":["../../../../src/assignment/utils/getAssignment/checkIDs.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAUhD,uDAAoD;AAEpD,SAAgB,QAAQ,CAAC,QAAuB,EAAE;IAChD,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAkB,CAAC;IACpE,IAAI,OAAO,GAAyB,EAAE,CAAC;IACvC,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;QACpC,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;SACH;QAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;QACjC,IAAI,IAAA,iCAAe,EAAC,WAAW,CAAC,EAAE;YAChC,IAAI,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAsB,CAAC;YAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;SACpC;aAAM;YACL,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAqB,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SACzC;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AApBD,4BAoBC;AAED,SAAgB,MAAM,CACpB,IAA4B;IAE5B,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/D,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3D;KACF;AACH,CAAC;AATD,wBASC;AAED,SAAgB,MAAM,CAAmC,IAAO;IAC9D,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,GAAG,IAAA,SAAU,GAAE,CAAC;QAC3C,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,GAAG,IAAA,SAAU,GAAE,CAAC;SAC1C;KACF;IACD,MAAM,CAAC,IAAI,CAAC,CAAC;IACb,OAAO,IAAI,CAAC;AACd,CAAC;AATD,wBASC"}
|
package/lib/peaks/NMRPeak1D.d.ts
CHANGED
package/lib/peaks/peakToXY.js
CHANGED
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.peakToXY = void 0;
|
|
4
|
+
const ml_gsd_1 = require("ml-gsd");
|
|
5
|
+
const ml_peak_shape_generator_1 = require("ml-peak-shape-generator");
|
|
4
6
|
const peaksToXY_1 = require("./peaksToXY");
|
|
5
7
|
function peakToXY(peak, options) {
|
|
6
|
-
|
|
8
|
+
const newPeak = (0, ml_gsd_1.addMissingShape)([peak])[0];
|
|
9
|
+
const factor = (0, ml_peak_shape_generator_1.getShape1D)(newPeak.shape).getFactor();
|
|
10
|
+
const { from = newPeak.x - (peak.width * factor) / options.frequency, to = newPeak.x + (peak.width * factor) / options.frequency, } = options;
|
|
11
|
+
return (0, peaksToXY_1.peaksToXY)([peak], { ...options, from, to });
|
|
7
12
|
}
|
|
8
13
|
exports.peakToXY = peakToXY;
|
|
9
14
|
//# sourceMappingURL=peakToXY.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peakToXY.js","sourceRoot":"","sources":["../../src/peaks/peakToXY.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"peakToXY.js","sourceRoot":"","sources":["../../src/peaks/peakToXY.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AACzC,qEAAqD;AAGrD,2CAA0D;AAE1D,SAAgB,QAAQ,CAAC,IAAe,EAAE,OAAyB;IACjE,MAAM,OAAO,GAAG,IAAA,wBAAe,EAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAA,oCAAU,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IAErD,MAAM,EACJ,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,EAC5D,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,GAC3D,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,qBAAS,EAAC,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAVD,4BAUC"}
|
|
@@ -20,5 +20,5 @@ export interface OptionsPeaksFilterImpurities {
|
|
|
20
20
|
/**
|
|
21
21
|
* Try to remove peaks of impurities.
|
|
22
22
|
*/
|
|
23
|
-
export declare function peaksFilterImpurities(peakList:
|
|
23
|
+
export declare function peaksFilterImpurities<T extends NMRPeak1D>(peakList: T[], options?: OptionsPeaksFilterImpurities): T[];
|
|
24
24
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksFilterImpurities.js","sourceRoot":"","sources":["../../src/peaks/peaksFilterImpurities.ts"],"names":[],"mappings":";;;AAAA,wDAAqD;AAKrD,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AA2B1C;;GAEG;AAEH,SAAgB,qBAAqB,CACnC,
|
|
1
|
+
{"version":3,"file":"peaksFilterImpurities.js","sourceRoot":"","sources":["../../src/peaks/peaksFilterImpurities.ts"],"names":[],"mappings":";;;AAAA,wDAAqD;AAKrD,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AA2B1C;;GAEG;AAEH,SAAgB,qBAAqB,CACnC,QAAa,EACb,UAAwC,EAAE;IAE1C,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAEzD,IAAI,OAAO,EAAE;QACX,IAAI,OAAO,KAAK,UAAU;YAAE,OAAO,GAAG,MAAM,CAAC;QAC7C,IAAI,OAAO,KAAK,MAAM;YAAE,OAAO,GAAG,OAAO,CAAC;QAC1C,IAAI,iBAAiB,GAAG,uBAAU,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,IAAI,QAAQ,IAAI,OAAO,EAAE;YAC5B,IAAI,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACjD,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE;gBACtC,KAAK;gBACL,MAAM;gBACN,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;SACJ;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AApBD,sDAoBC;AAED,SAAS,aAAa,CACpB,QAAa,EACb,QAA0B,EAC1B,OAA6B;IAE7B,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC;IAC7B,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,EAAE;QACV,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,EAAE;YACV,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACtC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,IAAI,UAAU,GAAG,SAAS,EAAE;gBAC1B,0LAA0L;gBAC1L,IAAI,MAAM,EAAE;oBACV,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACvB;qBAAM;oBACL,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;iBACzB;aACF;SACF;KACF;AACH,CAAC"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.detectSignals = exports.peaksToRanges = void 0;
|
|
7
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
7
8
|
const ml_spectra_processing_1 = require("ml-spectra-processing");
|
|
8
9
|
const joinRanges_1 = require("../ranges/utils/joinRanges");
|
|
9
10
|
const jAnalyzer_1 = __importDefault(require("../signals/utils/jAnalyzer"));
|
|
@@ -20,6 +21,7 @@ function checkSignalAfterCompilePattern(signal) {
|
|
|
20
21
|
}
|
|
21
22
|
const assignSignal = (peak, frequency, nucleus) => {
|
|
22
23
|
return {
|
|
24
|
+
id: (0, uuid_1.v4)(),
|
|
23
25
|
delta: NaN,
|
|
24
26
|
nbPeaks: 1,
|
|
25
27
|
kind: 'signal',
|
|
@@ -138,6 +140,7 @@ function peaksToRanges(data, peakList, options = {}) {
|
|
|
138
140
|
for (let i = 0; i < signals.length; i++) {
|
|
139
141
|
let signal = signals[i];
|
|
140
142
|
const range = {
|
|
143
|
+
id: (0, uuid_1.v4)(),
|
|
141
144
|
from: signal.integralData.from,
|
|
142
145
|
to: signal.integralData.to,
|
|
143
146
|
integration: signal.integralData.value,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"peaksToRanges.js","sourceRoot":"","sources":["../../src/peaks/peaksToRanges.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAgD;AAEhD,iEAAsD;AAEtD,2DAAwD;AAExD,2EAAmD;AAqEnD,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,EAAE,EAAE,IAAA,SAAU,GAAE;QAChB,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,SAAS;QACvC,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,SAAS;QACtC,OAAO,EAAE,SAAS;QAClB,OAAO;QACP,YAAY,EAAE;YACZ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,SAAS;YAC3C,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,SAAS;YACzC,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;IAC3D,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,EAAE,SAAS,CAAC,CAAC;oBAC/C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;wBAC1B,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACzC,MAAM,CAAC,IAAI,CAAC;4BACV,CAAC,EAAE,KAAK,CAAC,CAAC;4BACV,CAAC,EAAE,KAAK,CAAC,SAAS;4BAClB,KAAK,EAAE,KAAK,CAAC,KAAK;yBACnB,CAAC,CAAC;wBACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACzB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBAChC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACjB,GAAG,IAAI,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;qBACtC;iBACF;gBACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrB,GAAG,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;oBAC9C,MAAM,CAAC,YAAY,CAAC,KAAK,IAAI,GAAG,CAAC;oBACjC,IAAI,MAAM,GAAG,EAAE,CAAC;oBAChB,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC3C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;qBACxB;oBACD,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC7C,IAAI,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;oBAExD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;wBAC1B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACrB;iBACF;aACF;SACF;QACD,qCAAqC;QACrC,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;QACD,IAAI,WAAW,KAAK,cAAc,EAAE;YAClC,WAAW,GAAG,cAAc,GAAG,WAAW,CAAC;YAC3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,MAAM,CAAC,YAAY,CAAC,KAAK,IAAI,WAAW,CAAC;aAC1C;SACF;KACF;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpB,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE;QACT,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC5C,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;IACD,IAAI,MAAM,GAAe,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,KAAK,GAAa;YACtB,EAAE,EAAE,IAAA,SAAU,GAAE;YAChB,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,IAAI;YAC9B,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE;YAC1B,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;SACvC,CAAC;QACF,MAAM,YAAY,GAAgB;YAChC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,QAAQ;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;SACvC,CAAC;QACF,IAAI,SAAS,EAAE;YACb,YAAY,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC7C,MAAM,SAAS,GAAQ;oBACrB,CAAC,EAAE,IAAI,CAAC,SAAS;oBACjB,GAAG,IAAI;iBACR,CAAC;gBACF,OAAO,SAAS,CAAC,SAAS,CAAC;gBAC3B,OAAO,SAAsB,CAAC;YAChC,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,YAAY,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;SAChC;QAED,KAAK,CAAC,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACnB;IAED,IAAI,iBAAiB;QAAE,MAAM,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC;AAChB,CAAC;AApJD,sCAoJC;AAED;;;;;;;;;;;;;GAaG;AAEH,SAAgB,aAAa,CAC3B,IAAY,EACZ,QAA2B,EAC3B,UAAgC,EAAE;IAElC,IAAI,EACF,cAAc,GAAG,GAAG,EACpB,YAAY,GAAG,KAAK,EACpB,gBAAgB,GAAG,EAAE,EACrB,SAAS,GAAG,GAAG,EACf,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IAEZ,IAAI,QAAQ,GAAiB,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3E,IAAI,KAAK,CAAC;IACV,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,QAAQ,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAC9C,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,gBAAgB,IAAI,SAAS,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,gBAAgB,EAAE;YACpD,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAClD,IAAI,IAAI,CAAC,IAAI;gBAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACxB;aAAM;YACL,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1C,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC/C,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACjD,QAAQ,CAAC,OAAO,EAAE,CAAC;YACnB,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;gBAClB,CAAC,EAAE,IAAI,CAAC,CAAC;gBACT,SAAS,EAAE,IAAI,CAAC,CAAC;gBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC;YACH,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CACnC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAC1B,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,SAAS,CACtC,CAAC;YACF,QAAQ,CAAC,YAAY,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,EACxB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,SAAS,CACtC,CAAC;YACF,IAAI,IAAI,CAAC,IAAI;gBAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;SAC1C;QACD,QAAQ,GAAG,IAAI,CAAC;KACjB;IACD,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;QAC1B,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACrB,IAAI,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;QACtC,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,aAAa,GAAG,CAAC,CAAC;QAEtB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,IAAI,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACxC,aAAa,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;YAC/B,aAAa,IAAI,IAAI,CAAC;SACvB;QACD,MAAM,CAAC,KAAK,GAAG,aAAa,GAAG,aAAa,CAAC;QAE7C,IAAI,YAAY,KAAK,KAAK,EAAE;YAC1B,WAAW,CAAC,KAAK,GAAG,IAAA,qCAAa,EAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,EAAE,EAAE,WAAW,CAAC,EAAE;aACnB,CAAC,CAAC;SACJ;aAAM;YACL,WAAW,CAAC,KAAK,GAAG,aAAa,CAAC;SACnC;QACD,gBAAgB,IAAI,WAAW,CAAC,KAAK,CAAC;KACvC;IAED,IAAI,cAAc,GAAG,CAAC,EAAE;QACtB,IAAI,cAAc,GAAG,cAAc,GAAG,gBAAgB,CAAC;QACvD,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;YAC1B,IAAI,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;YACtC,WAAW,CAAC,KAAK,IAAI,cAAc,CAAC;SACrC;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA/ED,sCA+EC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,IAAkB,EAAE,SAAiB;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,kDAAkD;AACzH,CAAC"}
|
package/lib/peaks/peaksToXY.js
CHANGED
|
@@ -5,6 +5,9 @@ const spectrum_generator_1 = require("spectrum-generator");
|
|
|
5
5
|
const convertWidthToPPM_1 = require("./util/convertWidthToPPM");
|
|
6
6
|
function peaksToXY(peaks, options) {
|
|
7
7
|
const { frequency, nbPoints = 1024, shape } = options;
|
|
8
|
+
if (!frequency) {
|
|
9
|
+
throw new Error('frequency is mandatory');
|
|
10
|
+
}
|
|
8
11
|
const newPeaks = (0, convertWidthToPPM_1.convertWidthToPPM)(peaks, { frequency });
|
|
9
12
|
return (0, spectrum_generator_1.generateSpectrum)(newPeaks, {
|
|
10
13
|
generator: {
|
|
@@ -25,7 +28,7 @@ function getFromTo(newPeaks, options) {
|
|
|
25
28
|
newPeaks.sort((a, b) => a.x - b.x);
|
|
26
29
|
const firstPeak = newPeaks[0];
|
|
27
30
|
const lastPeak = newPeaks[newPeaks.length - 1];
|
|
28
|
-
const { from = firstPeak.x - firstPeak.width * 2, to = lastPeak.x + lastPeak.width * 2, } = options;
|
|
31
|
+
const { from = firstPeak.x - (firstPeak.width * 2) / options.frequency, to = lastPeak.x + (lastPeak.width * 2) / options.frequency, } = options;
|
|
29
32
|
return {
|
|
30
33
|
from,
|
|
31
34
|
to,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peaksToXY.js","sourceRoot":"","sources":["../../src/peaks/peaksToXY.ts"],"names":[],"mappings":";;;AAAA,2DAAmE;AAGnE,gEAA6D;AAuB7D,SAAgB,SAAS,CAAC,KAAkB,EAAE,OAAyB;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"peaksToXY.js","sourceRoot":"","sources":["../../src/peaks/peaksToXY.ts"],"names":[],"mappings":";;;AAAA,2DAAmE;AAGnE,gEAA6D;AAuB7D,SAAgB,SAAS,CAAC,KAAkB,EAAE,OAAyB;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEtD,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IACD,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,OAAO,IAAA,qCAAgB,EAAC,QAAQ,EAAE;QAChC,SAAS,EAAE;YACT,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC/B,QAAQ;YACR,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAdD,8BAcC;AAED,SAAS,SAAS,CAAC,QAAqB,EAAE,OAAyB;IACjE,IAAI,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,EAAE;QACxC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,EAAE,EAAE,OAAO,CAAC,EAAE;SACf,CAAC;KACH;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE/C,MAAM,EACJ,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,EAC9D,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,GAC3D,GAAG,OAAO,CAAC;IAEZ,OAAO;QACL,IAAI;QACJ,EAAE;KACH,CAAC;AACJ,CAAC"}
|
|
@@ -9,8 +9,9 @@ const addDummySignals_1 = require("../signals/addDummySignals");
|
|
|
9
9
|
const signalsToSpinSystem_1 = require("../signals/simulation/signalsToSpinSystem");
|
|
10
10
|
const simulateXYPeaks_1 = require("../signals/simulation/simulateXYPeaks");
|
|
11
11
|
const splitSpinSystem_1 = require("../signals/simulation/splitSpinSystem");
|
|
12
|
+
const clone_1 = require("../utilities/clone");
|
|
12
13
|
function solventSuppression(peakList, solvent, options = {}) {
|
|
13
|
-
const peaks =
|
|
14
|
+
const peaks = (0, clone_1.cloneArray)(peakList).sort((a, b) => a.x - b.x);
|
|
14
15
|
const xValues = peaks.map((peak) => peak.x);
|
|
15
16
|
const { markSolventPeaks = false, solventZoneExtension = 1.2 } = options;
|
|
16
17
|
for (const solventSignal of solvent) {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"solventSuppression.js","sourceRoot":"","sources":["../../src/peaks/solventSuppression.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addMissingIDs = void 0;
|
|
4
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
5
|
+
const { parse, stringify } = JSON;
|
|
6
|
+
function addMissingIDs(peaks, options = {}) {
|
|
7
|
+
const { output = parse(stringify(peaks)) } = options;
|
|
8
|
+
for (const peak of output) {
|
|
9
|
+
if (!('id' in peak)) {
|
|
10
|
+
peak.id = (0, uuid_1.v4)();
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
return output;
|
|
14
|
+
}
|
|
15
|
+
exports.addMissingIDs = addMissingIDs;
|
|
16
|
+
//# sourceMappingURL=addMissingIDs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addMissingIDs.js","sourceRoot":"","sources":["../../../src/peaks/util/addMissingIDs.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;AAElC,SAAgB,aAAa,CAC3B,KAAU,EACV,UAA4B,EAAE;IAE9B,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAQ,EAAE,GAAG,OAAO,CAAC;IAC5D,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;YACnB,IAAI,CAAC,EAAE,GAAG,IAAA,SAAU,GAAE,CAAC;SACxB;KACF;IAED,OAAO,MAAgC,CAAC;AAC1C,CAAC;AAZD,sCAYC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { MakeMandatory } from '../../utilities/MakeMandatory';
|
|
2
2
|
import { NMRPeak1D } from '../NMRPeak1D';
|
|
3
3
|
export declare type NMRPeak1DWithShape = MakeMandatory<NMRPeak1D, 'shape'>;
|
|
4
|
-
export interface ConvertWidthOptions {
|
|
4
|
+
export interface ConvertWidthOptions<T> {
|
|
5
5
|
convertTo: string & {
|
|
6
6
|
_kind?: 'hz' | 'ppm';
|
|
7
7
|
};
|
|
8
8
|
frequency: number;
|
|
9
|
-
output?:
|
|
9
|
+
output?: T[];
|
|
10
10
|
}
|
|
11
11
|
/**
|
|
12
12
|
* convert width and fwhm to ppm
|
|
13
13
|
*/
|
|
14
|
-
export declare function convertWidth(peaks:
|
|
14
|
+
export declare function convertWidth<T extends NMRPeak1D>(peaks: T[], options: ConvertWidthOptions<T>): T[];
|
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertWidth = void 0;
|
|
4
|
+
const hasProperty_1 = require("../../utilities/hasProperty");
|
|
5
|
+
const { parse, stringify } = JSON;
|
|
4
6
|
/**
|
|
5
7
|
* convert width and fwhm to ppm
|
|
6
8
|
*/
|
|
7
9
|
function convertWidth(peaks, options) {
|
|
8
|
-
const { frequency, convertTo, output =
|
|
10
|
+
const { frequency, convertTo, output = parse(stringify(peaks)), } = options;
|
|
9
11
|
const convert = getConverter(convertTo, frequency);
|
|
10
12
|
for (const peak of output) {
|
|
11
13
|
peak.width = convert(peak.width);
|
|
12
|
-
if (
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
if ((0, hasProperty_1.hasProperty)(peak, 'shape')) {
|
|
15
|
+
const shape = peak.shape;
|
|
16
|
+
if (shape.fwhm) {
|
|
17
|
+
shape.fwhm = convert(shape.fwhm);
|
|
15
18
|
}
|
|
16
19
|
}
|
|
17
20
|
}
|
|
18
21
|
return output;
|
|
19
22
|
}
|
|
20
23
|
exports.convertWidth = convertWidth;
|
|
21
|
-
function hasShape(peak) {
|
|
22
|
-
return 'shape' in peak;
|
|
23
|
-
}
|
|
24
24
|
function getConverter(convertTo, frequency) {
|
|
25
25
|
switch (convertTo) {
|
|
26
26
|
case 'ppm':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertWidth.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"convertWidth.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidth.ts"],"names":[],"mappings":";;;AAGA,6DAA0D;AAG1D,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;AASlC;;GAEG;AACH,SAAgB,YAAY,CAC1B,KAAU,EACV,OAA+B;IAE/B,MAAM,EACJ,SAAS,EACT,SAAS,EACT,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAQ,GACxC,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,IAAA,yBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAgB,CAAC;YACpC,IAAI,KAAK,CAAC,IAAI,EAAE;gBACd,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAClC;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAtBD,oCAsBC;AAED,SAAS,YAAY,CAAC,SAAiB,EAAE,SAAiB;IACxD,QAAQ,SAAS,EAAE;QACjB,KAAK,KAAK;YACR,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC,KAAK,IAAI;YACP,OAAO,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;QACtC;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { NMRPeak1D } from '../NMRPeak1D';
|
|
2
2
|
import { ConvertWidthOptions } from './convertWidth';
|
|
3
|
-
export declare type ConvertWidthTo = Omit<ConvertWidthOptions
|
|
4
|
-
export declare function convertWidthToHz(peaks:
|
|
3
|
+
export declare type ConvertWidthTo<T> = Omit<ConvertWidthOptions<T>, 'convertTo'>;
|
|
4
|
+
export declare function convertWidthToHz<T extends NMRPeak1D>(peaks: T[], options: ConvertWidthTo<T>): T[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertWidthToHz.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidthToHz.ts"],"names":[],"mappings":";;;AAEA,iDAAmE;AAInE,SAAgB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"convertWidthToHz.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidthToHz.ts"],"names":[],"mappings":";;;AAEA,iDAAmE;AAInE,SAAgB,gBAAgB,CAC9B,KAAU,EACV,OAA0B;IAE1B,OAAO,IAAA,2BAAY,EAAC,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,CAAC;AALD,4CAKC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { NMRPeak1D } from '../NMRPeak1D';
|
|
2
2
|
import { ConvertWidthTo } from './convertWidthToHz';
|
|
3
|
-
export declare function convertWidthToPPM(peaks:
|
|
3
|
+
export declare function convertWidthToPPM<T extends NMRPeak1D>(peaks: T[], options: ConvertWidthTo<T>): T[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertWidthToPPM.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidthToPPM.ts"],"names":[],"mappings":";;;AAEA,iDAA8C;AAG9C,SAAgB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"convertWidthToPPM.js","sourceRoot":"","sources":["../../../src/peaks/util/convertWidthToPPM.ts"],"names":[],"mappings":";;;AAEA,iDAA8C;AAG9C,SAAgB,iBAAiB,CAC/B,KAAU,EACV,OAA0B;IAE1B,OAAO,IAAA,2BAAY,EAAC,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;AAC/D,CAAC;AALD,8CAKC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { Peak2D } from 'ml-matrix-peaks-finder';
|
|
2
|
-
export declare function determineRealTop(peaks:
|
|
2
|
+
export declare function determineRealTop<T extends Peak2D>(peaks: T[], options: any): T[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"determineRealTop.js","sourceRoot":"","sources":["../../../src/peaks/util/determineRealTop.ts"],"names":[],"mappings":";;;AAAA,mEAA4D;AAE5D,qEAAqD;AAErD,MAAM,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAChD,MAAM,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAChD,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7E,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAI7E,SAAgB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"determineRealTop.js","sourceRoot":"","sources":["../../../src/peaks/util/determineRealTop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setIDs = void 0;
|
|
4
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
5
|
+
const { parse, stringify } = JSON;
|
|
6
|
+
function setIDs(peaks, options = {}) {
|
|
7
|
+
const output = (options.output || parse(stringify(peaks)));
|
|
8
|
+
for (const peak of output) {
|
|
9
|
+
peak.id = (0, uuid_1.v4)();
|
|
10
|
+
}
|
|
11
|
+
return output;
|
|
12
|
+
}
|
|
13
|
+
exports.setIDs = setIDs;
|
|
14
|
+
//# sourceMappingURL=setIDs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setIDs.js","sourceRoot":"","sources":["../../../src/peaks/util/setIDs.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;AAElC,SAAgB,MAAM,CAAI,KAAU,EAAE,UAA4B,EAAE;IAClE,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAErD,CAAC;IACL,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,EAAE,GAAG,IAAA,SAAU,GAAE,CAAC;KACxB;IAED,OAAO,MAAgC,CAAC;AAC1C,CAAC;AATD,wBASC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference path="../../src/ml-matrix-peaks-finder.d.ts" />
|
|
1
2
|
import { Molecule } from 'openchemlib';
|
|
2
3
|
import { PredictProtonOptions } from './predictProton';
|
|
3
4
|
import type { Prediction1D } from './prediction1D';
|
|
@@ -59,10 +60,10 @@ export declare function predictCOSY(molecule: Molecule, options?: PredictCOSYOpt
|
|
|
59
60
|
molfile: string;
|
|
60
61
|
diaIDs: string[];
|
|
61
62
|
nuclei: string[];
|
|
62
|
-
joinedSignals: import("..").NMRSignal2D[];
|
|
63
|
+
joinedSignals: import("..").NMRSignal2D<import("ml-matrix-peaks-finder").Peak2D>[];
|
|
63
64
|
signals: any[];
|
|
64
65
|
zones: {
|
|
65
|
-
signals: import("..").NMRSignal2D[];
|
|
66
|
+
signals: import("..").NMRSignal2D<import("ml-matrix-peaks-finder").Peak2D>[];
|
|
66
67
|
x: {
|
|
67
68
|
from: number;
|
|
68
69
|
to: number;
|
|
@@ -71,6 +72,7 @@ export declare function predictCOSY(molecule: Molecule, options?: PredictCOSYOpt
|
|
|
71
72
|
from: number;
|
|
72
73
|
to: number;
|
|
73
74
|
};
|
|
75
|
+
id: string;
|
|
74
76
|
}[];
|
|
75
77
|
molecule: Molecule;
|
|
76
78
|
}>;
|
|
@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.predictCarbon = void 0;
|
|
7
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
7
8
|
const cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
9
|
+
const setIDs_1 = require("../peaks/util/setIDs");
|
|
8
10
|
const signalsToRanges_1 = require("../signals/signalsToRanges");
|
|
9
11
|
const fetchPrediction_1 = require("./utils/fetchPrediction");
|
|
10
12
|
const flatGroupedDiaIDs_1 = require("./utils/flatGroupedDiaIDs");
|
|
@@ -70,6 +72,7 @@ function formatSignals(predictions) {
|
|
|
70
72
|
for (const prediction of predictions) {
|
|
71
73
|
const { atoms, nbAtoms, delta, diaIDs, statistic } = prediction;
|
|
72
74
|
const signal = {
|
|
75
|
+
id: (0, uuid_1.v4)(),
|
|
73
76
|
delta: delta || NaN,
|
|
74
77
|
atoms,
|
|
75
78
|
diaIDs,
|
|
@@ -95,6 +98,6 @@ function joinSignalByDiaID(signals) {
|
|
|
95
98
|
joinedSignals[diaID].atoms.push(...signal.atoms);
|
|
96
99
|
}
|
|
97
100
|
}
|
|
98
|
-
return Object.values(joinedSignals);
|
|
101
|
+
return (0, setIDs_1.setIDs)(Object.values(joinedSignals));
|
|
99
102
|
}
|
|
100
103
|
//# sourceMappingURL=predictCarbon.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predictCarbon.js","sourceRoot":"","sources":["../../src/prediction/predictCarbon.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAgC;
|
|
1
|
+
{"version":3,"file":"predictCarbon.js","sourceRoot":"","sources":["../../src/prediction/predictCarbon.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference path="../../src/ml-matrix-peaks-finder.d.ts" />
|
|
1
2
|
import { Molecule } from 'openchemlib';
|
|
2
3
|
import type { PredictCarbonOptions } from './predictCarbon';
|
|
3
4
|
import type { PredictProtonOptions } from './predictProton';
|
|
@@ -58,10 +59,10 @@ export declare function predictHMBC(molecule: Molecule, options?: PredictHMBCOpt
|
|
|
58
59
|
molfile: string;
|
|
59
60
|
diaIDs: string[];
|
|
60
61
|
nuclei: string[];
|
|
61
|
-
joinedSignals: import("..").NMRSignal2D[];
|
|
62
|
+
joinedSignals: import("..").NMRSignal2D<import("ml-matrix-peaks-finder").Peak2D>[];
|
|
62
63
|
signals: any[];
|
|
63
64
|
zones: {
|
|
64
|
-
signals: import("..").NMRSignal2D[];
|
|
65
|
+
signals: import("..").NMRSignal2D<import("ml-matrix-peaks-finder").Peak2D>[];
|
|
65
66
|
x: {
|
|
66
67
|
from: number;
|
|
67
68
|
to: number;
|
|
@@ -70,6 +71,7 @@ export declare function predictHMBC(molecule: Molecule, options?: PredictHMBCOpt
|
|
|
70
71
|
from: number;
|
|
71
72
|
to: number;
|
|
72
73
|
};
|
|
74
|
+
id: string;
|
|
73
75
|
}[];
|
|
74
76
|
molecule: Molecule;
|
|
75
77
|
}>;
|