nmr-processing 10.0.7 → 11.0.1

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.
Files changed (51) hide show
  1. package/lib/datum/data1d/utils/mapIntegrals.d.ts +2 -2
  2. package/lib/datum/data1d/utils/mapIntegrals.js +7 -7
  3. package/lib/datum/data1d/utils/mapIntegrals.js.map +1 -1
  4. package/lib/datum/data1d/utils/mapPeaks.d.ts +6 -1
  5. package/lib/datum/data1d/utils/mapPeaks.js +2 -1
  6. package/lib/datum/data1d/utils/mapPeaks.js.map +1 -1
  7. package/lib/datum/data1d/utils/mapRanges.d.ts +12 -4
  8. package/lib/datum/data1d/utils/mapRanges.js +22 -12
  9. package/lib/datum/data1d/utils/mapRanges.js.map +1 -1
  10. package/lib/datum/data1d/utils/mapValues.d.ts +4 -4
  11. package/lib/datum/data2d/utils/mapZones.d.ts +32 -12
  12. package/lib/datum/data2d/utils/mapZones.js +67 -8
  13. package/lib/datum/data2d/utils/mapZones.js.map +1 -1
  14. package/lib/index.d.ts +1 -0
  15. package/lib/index.js +1 -0
  16. package/lib/index.js.map +1 -1
  17. package/lib/peaks/NMRPeak1D.d.ts +1 -0
  18. package/lib/types/Integral.d.ts +2 -2
  19. package/lib/types/Peaks/Peak2D.d.ts +3 -3
  20. package/lib/types/Ranges/Ranges.d.ts +2 -2
  21. package/lib/types/Signals/Signal1D.d.ts +1 -1
  22. package/lib/types/Signals/Signal2D.d.ts +1 -1
  23. package/lib/types/Zones/Zone.d.ts +2 -0
  24. package/lib/utilities/getSum.js +1 -1
  25. package/lib/utilities/getSum.js.map +1 -1
  26. package/lib-esm/datum/data1d/utils/mapIntegrals.js +7 -7
  27. package/lib-esm/datum/data1d/utils/mapIntegrals.js.map +1 -1
  28. package/lib-esm/datum/data1d/utils/mapPeaks.js +1 -1
  29. package/lib-esm/datum/data1d/utils/mapPeaks.js.map +1 -1
  30. package/lib-esm/datum/data1d/utils/mapRanges.js +22 -12
  31. package/lib-esm/datum/data1d/utils/mapRanges.js.map +1 -1
  32. package/lib-esm/datum/data2d/utils/mapZones.js +67 -8
  33. package/lib-esm/datum/data2d/utils/mapZones.js.map +1 -1
  34. package/lib-esm/index.js +1 -0
  35. package/lib-esm/index.js.map +1 -1
  36. package/lib-esm/utilities/getSum.js +1 -1
  37. package/lib-esm/utilities/getSum.js.map +1 -1
  38. package/package.json +3 -3
  39. package/src/datum/data1d/utils/mapIntegrals.ts +7 -7
  40. package/src/datum/data1d/utils/mapPeaks.ts +6 -1
  41. package/src/datum/data1d/utils/mapRanges.ts +23 -12
  42. package/src/datum/data2d/utils/mapZones.ts +69 -8
  43. package/src/index.ts +1 -0
  44. package/src/peaks/NMRPeak1D.ts +1 -0
  45. package/src/types/Integral.ts +2 -2
  46. package/src/types/Peaks/Peak2D.ts +3 -3
  47. package/src/types/Ranges/Ranges.ts +2 -2
  48. package/src/types/Signals/Signal1D.ts +1 -1
  49. package/src/types/Signals/Signal2D.ts +1 -1
  50. package/src/types/Zones/Zone.ts +2 -0
  51. package/src/utilities/getSum.ts +1 -1
@@ -3,8 +3,8 @@ import { ShiftTarget } from '../../../types/common/MapOptions';
3
3
  import { Entry1D } from '../Entry1D';
4
4
  export declare function mapIntegrals(integrals: Integral[], spectrum: Entry1D, shiftTarget?: ShiftTarget): {
5
5
  absolute: number;
6
- originFrom: number;
7
- originTo: number;
6
+ originalFrom: number;
7
+ originalTo: number;
8
8
  from: number;
9
9
  to: number;
10
10
  id: string;
@@ -5,21 +5,21 @@ const uuid_1 = require("@lukeed/uuid");
5
5
  const ml_spectra_processing_1 = require("ml-spectra-processing");
6
6
  const getShiftX_1 = require("./getShiftX");
7
7
  function getRange(integral, shiftTarget, shift) {
8
- const { originFrom, originTo, from, to } = integral;
8
+ const { originalFrom, originalTo, from, to } = integral;
9
9
  if (shiftTarget === 'origin') {
10
10
  return {
11
- originFrom: from - shift,
12
- originTo: to - shift,
11
+ originalFrom: from - shift,
12
+ originalTo: to - shift,
13
13
  from,
14
14
  to,
15
15
  };
16
16
  }
17
17
  else {
18
18
  return {
19
- originFrom,
20
- originTo,
21
- from: originFrom + shift,
22
- to: originTo + shift,
19
+ originalFrom,
20
+ originalTo,
21
+ from: originalFrom + shift,
22
+ to: originalTo + shift,
23
23
  };
24
24
  }
25
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mapIntegrals.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapIntegrals.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAClC,iEAAsD;AAMtD,2CAAwC;AAExC,SAAS,QAAQ,CAAC,QAAkB,EAAE,WAAwB,EAAE,KAAa;IAC3E,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;IACpD,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,UAAU,EAAE,IAAI,GAAG,KAAK;YACxB,QAAQ,EAAE,EAAE,GAAG,KAAK;YACpB,IAAI;YACJ,EAAE;SACH,CAAC;KACH;SAAM;QACL,OAAO;YACL,UAAU;YACV,QAAQ;YACR,IAAI,EAAE,UAAU,GAAG,KAAK;YACxB,EAAE,EAAE,QAAQ,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAED,SAAgB,YAAY,CAC1B,SAAqB,EACrB,QAAiB,EACjB,cAA2B,QAAQ;IAEnC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,IAAA,qCAAa,EAC5B,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EACZ,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CACxE,CAAC;QAEF,OAAO;YACL,GAAG,QAAQ;YACX,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,IAAA,SAAE,GAAE;YACvB,GAAG,gBAAgB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,oCAuBC"}
1
+ {"version":3,"file":"mapIntegrals.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapIntegrals.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAClC,iEAAsD;AAMtD,2CAAwC;AAExC,SAAS,QAAQ,CAAC,QAAkB,EAAE,WAAwB,EAAE,KAAa;IAC3E,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;IACxD,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,YAAY,EAAE,IAAI,GAAG,KAAK;YAC1B,UAAU,EAAE,EAAE,GAAG,KAAK;YACtB,IAAI;YACJ,EAAE;SACH,CAAC;KACH;SAAM;QACL,OAAO;YACL,YAAY;YACZ,UAAU;YACV,IAAI,EAAE,YAAY,GAAG,KAAK;YAC1B,EAAE,EAAE,UAAU,GAAG,KAAK;SACvB,CAAC;KACH;AACH,CAAC;AAED,SAAgB,YAAY,CAC1B,SAAqB,EACrB,QAAiB,EACjB,cAA2B,QAAQ;IAEnC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,IAAA,qCAAa,EAC5B,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EACZ,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CACxE,CAAC;QAEF,OAAO;YACL,GAAG,QAAQ;YACX,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,IAAA,SAAE,GAAE;YACvB,GAAG,gBAAgB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,oCAuBC"}
@@ -1,4 +1,9 @@
1
1
  import { Peak1D } from '../../../types/Peaks/Peak1D';
2
- import { MapOptions } from '../../../types/common/MapOptions';
2
+ import { MapOptions, ShiftTarget } from '../../../types/common/MapOptions';
3
3
  import { Entry1D } from '../Entry1D';
4
+ import { NMRPeak1D } from '../../..';
5
+ export declare function getPeakDelta(peak: Peak1D | NMRPeak1D, shiftTarget: ShiftTarget, shift: number): {
6
+ originalX: number;
7
+ x: number;
8
+ };
4
9
  export declare function mapPeaks(peaks: Peak1D[], spectrum: Entry1D, options?: MapOptions): Peak1D[];
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.mapPeaks = void 0;
3
+ exports.mapPeaks = exports.getPeakDelta = void 0;
4
4
  const uuid_1 = require("@lukeed/uuid");
5
5
  const getShiftX_1 = require("./getShiftX");
6
6
  const getSpectrumErrorValue_1 = require("./getSpectrumErrorValue");
@@ -28,6 +28,7 @@ function getPeakDelta(peak, shiftTarget, shift) {
28
28
  };
29
29
  }
30
30
  }
31
+ exports.getPeakDelta = getPeakDelta;
31
32
  function mapPeaks(peaks, spectrum, options = {}) {
32
33
  const { checkIsExisting = true, shiftTarget = 'origin' } = options;
33
34
  const shiftX = (0, getShiftX_1.getShiftX)(spectrum);
@@ -1 +1 @@
1
- {"version":3,"file":"mapPeaks.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapPeaks.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAMlC,2CAAwC;AACxC,mEAAgE;AAEhE,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAiB,EAAE,KAAa;IAC9D,sCAAsC;IACtC,KAAK,MAAM,EAAE,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,IAAY,EAAE,WAAwB,EAAE,KAAa;IACzE,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAClC,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,SAAS,EAAE,CAAC,GAAG,KAAK;YACpB,CAAC;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,SAAS;YACT,CAAC,EAAE,SAAS,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAED,SAAgB,QAAQ,CACtB,KAAe,EACf,QAAiB,EACjB,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAA,6CAAqB,EAAC,QAAQ,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1D,IACE,CAAC,eAAe;YAChB,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,EACrD;YACA,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,IAAI;gBACP,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,IAAA,SAAE,GAAE;gBACpB,GAAG,SAAS;aACb,CAAC,CAAC;SACJ;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA3BD,4BA2BC"}
1
+ {"version":3,"file":"mapPeaks.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapPeaks.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAMlC,2CAAwC;AACxC,mEAAgE;AAGhE,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAiB,EAAE,KAAa;IAC9D,sCAAsC;IACtC,KAAK,MAAM,EAAE,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,YAAY,CAC1B,IAAwB,EACxB,WAAwB,EACxB,KAAa;IAEb,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAClC,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,SAAS,EAAE,CAAC,GAAG,KAAK;YACpB,CAAC;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,SAAS;YACT,CAAC,EAAE,SAAS,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAjBD,oCAiBC;AAED,SAAgB,QAAQ,CACtB,KAAe,EACf,QAAiB,EACjB,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAA,6CAAqB,EAAC,QAAQ,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1D,IACE,CAAC,eAAe;YAChB,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,EACrD;YACA,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,IAAI;gBACP,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,IAAA,SAAE,GAAE;gBACpB,GAAG,SAAS;aACb,CAAC,CAAC;SACJ;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA3BD,4BA2BC"}
@@ -5,7 +5,7 @@ import { Entry1D } from '../Entry1D';
5
5
  export declare function mapRanges(ranges: Range[] | NMRRange[], spectrum: Entry1D, options?: MapOptions): {
6
6
  absolute: number;
7
7
  signals: {
8
- originDelta: number | undefined;
8
+ originalDelta: number | undefined;
9
9
  delta: number;
10
10
  multiplicity: string;
11
11
  js: import("../../..").Jcoupling[];
@@ -14,7 +14,6 @@ export declare function mapRanges(ranges: Range[] | NMRRange[], spectrum: Entry1
14
14
  assignment?: string | undefined;
15
15
  nbAtoms?: number | undefined;
16
16
  integration?: number | undefined;
17
- peaks?: import("../../..").NMRPeak1D[] | undefined;
18
17
  statistic?: {
19
18
  mean: number;
20
19
  sd: number;
@@ -24,9 +23,18 @@ export declare function mapRanges(ranges: Range[] | NMRRange[], spectrum: Entry1
24
23
  } | undefined;
25
24
  kind: string;
26
25
  id: string;
26
+ peaks: {
27
+ originalX: number;
28
+ x: number;
29
+ id: string;
30
+ kind?: string | undefined;
31
+ shape?: import("ml-peak-shape-generator").Shape1D | undefined;
32
+ y: number;
33
+ width: number;
34
+ }[];
27
35
  }[];
28
- originFrom: number | undefined;
29
- originTo: number | undefined;
36
+ originalFrom: number | undefined;
37
+ originalTo: number | undefined;
30
38
  from: number;
31
39
  to: number;
32
40
  id: string;
@@ -7,6 +7,7 @@ const SignalsKinds_1 = require("../../../constants/SignalsKinds");
7
7
  const signalMultiplicityPattern_1 = require("../../../signal/signalMultiplicityPattern");
8
8
  const getShiftX_1 = require("./getShiftX");
9
9
  const getSpectrumErrorValue_1 = require("./getSpectrumErrorValue");
10
+ const mapPeaks_1 = require("./mapPeaks");
10
11
  function checkRange(range, spectrum, error) {
11
12
  // check if the range is already exists
12
13
  for (const { from, to } of spectrum.ranges?.values || []) {
@@ -17,36 +18,36 @@ function checkRange(range, spectrum, error) {
17
18
  }
18
19
  }
19
20
  function getRange(range, shiftTarget, shift) {
20
- const { originFrom, originTo, from, to } = range;
21
+ const { originalFrom, originalTo, from, to } = range;
21
22
  if (shiftTarget === 'origin') {
22
23
  return {
23
- originFrom: from - shift,
24
- originTo: to - shift,
24
+ originalFrom: from - shift,
25
+ originalTo: to - shift,
25
26
  from,
26
27
  to,
27
28
  };
28
29
  }
29
30
  else {
30
31
  return {
31
- originFrom,
32
- originTo,
33
- from: (originFrom || 0) + shift,
34
- to: (originTo || 0) + shift,
32
+ originalFrom,
33
+ originalTo,
34
+ from: (originalFrom || 0) + shift,
35
+ to: (originalTo || 0) + shift,
35
36
  };
36
37
  }
37
38
  }
38
39
  function getSignalDelta(signal, shiftTarget, shift) {
39
- const { delta, originDelta } = signal;
40
+ const { delta, originalDelta } = signal;
40
41
  if (shiftTarget === 'origin') {
41
42
  return {
42
- originDelta: delta - shift,
43
+ originalDelta: delta - shift,
43
44
  delta,
44
45
  };
45
46
  }
46
47
  else {
47
48
  return {
48
- originDelta,
49
- delta: (originDelta || 0) + shift,
49
+ originalDelta,
50
+ delta: (originalDelta || 0) + shift,
50
51
  };
51
52
  }
52
53
  }
@@ -83,10 +84,19 @@ function mapRanges(ranges, spectrum, options = {}) {
83
84
  const rangeBoundary = getRange(range, shiftTarget, shiftX);
84
85
  const absolute = (0, ml_spectra_processing_1.xyIntegration)({ x, y: re }, { from: rangeBoundary.from, to: rangeBoundary.to, reverse: true });
85
86
  const signals = range.signals.map((signal) => {
86
- const { kind = null, id, ...resSignal } = signal;
87
+ const { kind = null, id, peaks: inputPeaks = [], ...resSignal } = signal;
88
+ const peaks = inputPeaks.map((peak) => {
89
+ const peakDelta = (0, mapPeaks_1.getPeakDelta)(peak, shiftTarget, shiftX);
90
+ return {
91
+ id: peak?.id || (0, uuid_1.v4)(),
92
+ ...peak,
93
+ ...peakDelta,
94
+ };
95
+ });
87
96
  return {
88
97
  kind: kind || 'signal',
89
98
  id: id || (0, uuid_1.v4)(),
99
+ peaks,
90
100
  ...resSignal,
91
101
  ...getSignalDelta(signal, shiftTarget, shiftX),
92
102
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mapRanges.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapRanges.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapRanges.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapRanges.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@ import { Integral } from '../../../types/Integral';
2
2
  import { Range } from '../../../types/Ranges/Ranges';
3
3
  export declare function mapValues<T extends Integral[] | Range[]>(values: T, key: string, factor: number, check: (value: any) => boolean): ({
4
4
  id: string;
5
- originFrom: number;
6
- originTo: number;
5
+ originalFrom: number;
6
+ originalTo: number;
7
7
  from: number;
8
8
  to: number;
9
9
  absolute: number;
@@ -11,8 +11,8 @@ export declare function mapValues<T extends Integral[] | Range[]>(values: T, key
11
11
  kind: string;
12
12
  } | {
13
13
  id: string;
14
- originFrom?: number | undefined;
15
- originTo?: number | undefined;
14
+ originalFrom?: number | undefined;
15
+ originalTo?: number | undefined;
16
16
  absolute: number;
17
17
  signals: import("../../..").Signal1D[];
18
18
  integration: number;
@@ -2,35 +2,55 @@ import { Zone } from '../../../types/Zones/Zone';
2
2
  import { MapOptions } from '../../../types/common/MapOptions';
3
3
  import { Entry2D } from '../Entry2D';
4
4
  export declare function mapZones(zones: Zone[], datum: Entry2D, options?: MapOptions): {
5
- id: string;
6
- x: {
7
- from: number;
8
- to: number;
9
- };
10
- y: {
11
- from: number;
12
- to: number;
13
- };
14
5
  signals: {
6
+ peaks: {
7
+ id: string;
8
+ x: number;
9
+ y: number;
10
+ z: number;
11
+ originalX?: number | undefined;
12
+ originalY?: number | undefined;
13
+ originalZ?: number | undefined;
14
+ width?: number | {
15
+ x: number;
16
+ y: number;
17
+ } | undefined;
18
+ }[] | undefined;
15
19
  id: string;
16
20
  kind: string;
17
21
  x: {
18
- originDelta: number;
22
+ originalDelta: number;
19
23
  delta: number;
20
24
  nbAtoms?: number | undefined;
21
25
  diaIDs?: string[] | undefined;
22
26
  };
23
27
  y: {
24
- originDelta: number;
28
+ originalDelta: number;
25
29
  delta: number;
26
30
  nbAtoms?: number | undefined;
27
31
  diaIDs?: string[] | undefined;
28
32
  };
29
33
  sign?: number | undefined;
30
- peaks?: import("../../..").Peak2D[] | undefined;
31
34
  j?: {
32
35
  pathLength?: number | import("cheminfo-types").FromTo | undefined;
33
36
  } | undefined;
34
37
  }[];
35
38
  kind: string;
39
+ x: {
40
+ from: number;
41
+ to: number;
42
+ nbAtoms?: number | undefined;
43
+ diaIDs?: string[] | undefined;
44
+ originalFrom?: number | undefined;
45
+ originalTo?: number | undefined;
46
+ };
47
+ y: {
48
+ from: number;
49
+ to: number;
50
+ nbAtoms?: number | undefined;
51
+ diaIDs?: string[] | undefined;
52
+ originalFrom?: number | undefined;
53
+ originalTo?: number | undefined;
54
+ };
55
+ id: string;
36
56
  }[];
@@ -13,11 +13,11 @@ function getSignal(signal, shiftTarget, shift) {
13
13
  ...signal,
14
14
  x: {
15
15
  ...x,
16
- originDelta: x.delta - shift.x,
16
+ originalDelta: x.delta - shift.x,
17
17
  },
18
18
  y: {
19
19
  ...y,
20
- originDelta: y.delta - shift.y,
20
+ originalDelta: y.delta - shift.y,
21
21
  },
22
22
  };
23
23
  }
@@ -26,15 +26,63 @@ function getSignal(signal, shiftTarget, shift) {
26
26
  ...signal,
27
27
  x: {
28
28
  ...x,
29
- delta: x.originDelta + shift.x,
29
+ delta: x.originalDelta + shift.x,
30
30
  },
31
31
  y: {
32
32
  ...y,
33
- delta: y.originDelta + shift.y,
33
+ delta: y.originalDelta + shift.y,
34
34
  },
35
35
  };
36
36
  }
37
37
  }
38
+ function getZoneAxis(zone, shiftTarget, shift) {
39
+ const { x, y } = zone;
40
+ if (shiftTarget === 'origin') {
41
+ return {
42
+ x: {
43
+ ...x,
44
+ originalFrom: x.from - shift.x,
45
+ originalTo: x.to - shift.x,
46
+ },
47
+ y: {
48
+ ...y,
49
+ originalFrom: y.from - shift.y,
50
+ originalTo: y.to - shift.y,
51
+ },
52
+ };
53
+ }
54
+ else {
55
+ return {
56
+ x: {
57
+ ...x,
58
+ from: (x?.originalFrom || 0) + shift.x,
59
+ to: (x?.originalTo || 0) + shift.x,
60
+ },
61
+ y: {
62
+ ...y,
63
+ from: (y?.originalFrom || 0) + shift.y,
64
+ to: (y?.originalTo || 0) + shift.y,
65
+ },
66
+ };
67
+ }
68
+ }
69
+ function getPeak(peak, shiftTarget, shift) {
70
+ const { x, y, originalX = 0, originalY = 0 } = peak;
71
+ if (shiftTarget === 'origin') {
72
+ return {
73
+ ...peak,
74
+ originalX: x - shift.x,
75
+ originalY: y - shift.y,
76
+ };
77
+ }
78
+ else {
79
+ return {
80
+ ...peak,
81
+ x: originalX + shift.x,
82
+ y: originalY + shift.y,
83
+ };
84
+ }
85
+ }
38
86
  function mapZones(zones, datum, options = {}) {
39
87
  const { checkIsExisting = true, shiftTarget = 'origin' } = options;
40
88
  const shift = (0, getShift_1.getShift)(datum);
@@ -44,12 +92,24 @@ function mapZones(zones, datum, options = {}) {
44
92
  _zones = zones.filter((zone) => !(0, isZoneExists_1.isZoneExists)(zone, datum, error));
45
93
  }
46
94
  return _zones.map((zone) => {
47
- const x = zone.x || { from: 0, to: 0 };
48
- const y = zone.y || { from: 0, to: 0 };
95
+ zone.x = zone.x || { from: 0, to: 0 };
96
+ zone.y = zone.y || { from: 0, to: 0 };
49
97
  const signals = zone.signals.map((signal) => {
50
98
  const { id, kind } = signal;
99
+ let peaks;
100
+ if (signal?.peaks) {
101
+ peaks = (signal?.peaks || []).map((peak) => {
102
+ const peakDelta = getPeak(peak, shiftTarget, shift);
103
+ return {
104
+ ...peak,
105
+ ...peakDelta,
106
+ id: peak?.id || (0, uuid_1.v4)(),
107
+ };
108
+ });
109
+ }
51
110
  return {
52
111
  ...getSignal(signal, shiftTarget, shift),
112
+ peaks,
53
113
  id: id || (0, uuid_1.v4)(),
54
114
  kind: kind || 'signal',
55
115
  };
@@ -57,8 +117,7 @@ function mapZones(zones, datum, options = {}) {
57
117
  return {
58
118
  ...zone,
59
119
  id: zone.id || (0, uuid_1.v4)(),
60
- x: { from: x.from, to: x.to },
61
- y: { from: y.from, to: y.to },
120
+ ...getZoneAxis(zone, shiftTarget, shift),
62
121
  signals,
63
122
  kind: zone.kind || SignalsKinds_1.DatumKind.signal,
64
123
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mapZones.js","sourceRoot":"","sources":["../../../../src/datum/data2d/utils/mapZones.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAElC,kEAA4D;AAM5D,uEAAoE;AACpE,yCAA+C;AAC/C,iDAA8C;AAE9C,SAAS,SAAS,CAAC,MAAgB,EAAE,WAAwB,EAAE,KAAc;IAC3E,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAExB,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,GAAG,MAAM;YACT,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,WAAW,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;aAC/B;YACD,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,WAAW,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;aAC/B;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,GAAG,MAAM;YACT,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,KAAK,EAAE,CAAC,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC;aAC/B;YACD,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,KAAK,EAAE,CAAC,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC;aAC/B;SACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,QAAQ,CACtB,KAAa,EACb,KAAc,EACd,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,KAAK,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE7C,IAAI,MAAM,GAAW,KAAK,CAAC;IAE3B,IAAI,eAAe,EAAE;QACnB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAA,2BAAY,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;KACpE;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE;QAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QACvC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1C,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YAC5B,OAAO;gBACL,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC;gBACxC,EAAE,EAAE,EAAE,IAAI,IAAA,SAAE,GAAE;gBACd,IAAI,EAAE,IAAI,IAAI,QAAQ;aACvB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,IAAI;YACP,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,IAAA,SAAE,GAAE;YACnB,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YAC7B,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YAC7B,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,wBAAS,CAAC,MAAM;SACpC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AArCD,4BAqCC"}
1
+ {"version":3,"file":"mapZones.js","sourceRoot":"","sources":["../../../../src/datum/data2d/utils/mapZones.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -51,6 +51,7 @@ export * from './datum/data1d/utils/getShiftX';
51
51
  export * from './datum/data1d/utils/getSpectrumErrorValue';
52
52
  export * from './datum/data1d/utils/mapPeaks';
53
53
  export * from './datum/data1d/utils/mapRanges';
54
+ export * from './datum/data2d/utils/mapZones';
54
55
  export * from './datum/data1d/utils/mapIntegrals';
55
56
  export * from './datum/data1d/utils/updateRanges';
56
57
  export * from './datum/data1d/utils/checkIntegralKind';
package/lib/index.js CHANGED
@@ -80,6 +80,7 @@ __exportStar(require("./datum/data1d/utils/getShiftX"), exports);
80
80
  __exportStar(require("./datum/data1d/utils/getSpectrumErrorValue"), exports);
81
81
  __exportStar(require("./datum/data1d/utils/mapPeaks"), exports);
82
82
  __exportStar(require("./datum/data1d/utils/mapRanges"), exports);
83
+ __exportStar(require("./datum/data2d/utils/mapZones"), exports);
83
84
  __exportStar(require("./datum/data1d/utils/mapIntegrals"), exports);
84
85
  __exportStar(require("./datum/data1d/utils/updateRanges"), exports);
85
86
  __exportStar(require("./datum/data1d/utils/checkIntegralKind"), exports);
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,2DAAyC;AACzC,+DAA6C;AAE7C,gEAA8C;AAC9C,oDAAkC;AAClC,mDAAiC;AAEjC,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAE5C,uDAAqC;AACrC,sDAAoC;AAEpC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,yDAAuC;AACvC,kEAAgD;AAChD,+DAA6C;AAC7C,qEAAmD;AAEnD,uDAAqC;AACrC,8DAA4C;AAC5C,qEAAmD;AACnD,uEAAqD;AAErD,wDAAsC;AACtC,8DAA4C;AAC5C,2DAAyC;AACzC,+DAA6C;AAE7C,0DAAwC;AACxC,2DAAyC;AACzC,2DAAyC;AAEzC,4DAA0C;AAC1C,8DAA4C;AAC5C,wDAAsC;AACtC,4DAA0C;AAE1C,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAE7C,6DAA2C;AAC3C,6DAA2C;AAE3C,4DAA0C;AAE1C,mEAAiD;AAEjD,+DAA6C;AAC7C,+DAA6C;AAC7C,gEAA8C;AAC9C,mEAAiD;AACjD,oEAAkD;AAElD,kDAAgC;AAChC,yEAAyD;AACzD,iEAA+C;AAC/C,6EAA2D;AAC3D,gEAA8C;AAC9C,iEAA+C;AAC/C,oEAAkD;AAClD,oEAAkD;AAClD,yEAAuD;AACvD,kFAAgE;AAChE,qFAAmE;AACnE,sFAAsE"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,2DAAyC;AACzC,+DAA6C;AAE7C,gEAA8C;AAC9C,oDAAkC;AAClC,mDAAiC;AAEjC,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAE5C,uDAAqC;AACrC,sDAAoC;AAEpC,4DAA0C;AAC1C,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,yDAAuC;AACvC,kEAAgD;AAChD,+DAA6C;AAC7C,qEAAmD;AAEnD,uDAAqC;AACrC,8DAA4C;AAC5C,qEAAmD;AACnD,uEAAqD;AAErD,wDAAsC;AACtC,8DAA4C;AAC5C,2DAAyC;AACzC,+DAA6C;AAE7C,0DAAwC;AACxC,2DAAyC;AACzC,2DAAyC;AAEzC,4DAA0C;AAC1C,8DAA4C;AAC5C,wDAAsC;AACtC,4DAA0C;AAE1C,0DAAwC;AACxC,+DAA6C;AAC7C,+DAA6C;AAE7C,6DAA2C;AAC3C,6DAA2C;AAE3C,4DAA0C;AAE1C,mEAAiD;AAEjD,+DAA6C;AAC7C,+DAA6C;AAC7C,gEAA8C;AAC9C,mEAAiD;AACjD,oEAAkD;AAElD,kDAAgC;AAChC,yEAAyD;AACzD,iEAA+C;AAC/C,6EAA2D;AAC3D,gEAA8C;AAC9C,iEAA+C;AAC/C,gEAA8C;AAC9C,oEAAkD;AAClD,oEAAkD;AAClD,yEAAuD;AACvD,kFAAgE;AAChE,qFAAmE;AACnE,sFAAsE"}
@@ -4,4 +4,5 @@ export interface NMRPeak1D extends PeakXYWidth {
4
4
  id?: string;
5
5
  kind?: string;
6
6
  shape?: Shape1D;
7
+ originalX?: number;
7
8
  }
@@ -1,7 +1,7 @@
1
1
  export interface Integral {
2
2
  id: string;
3
- originFrom: number;
4
- originTo: number;
3
+ originalFrom: number;
4
+ originalTo: number;
5
5
  from: number;
6
6
  to: number;
7
7
  absolute: number;
@@ -3,9 +3,9 @@ export interface Peak2D extends BasePeak {
3
3
  x: number;
4
4
  y: number;
5
5
  z: number;
6
- originX?: number;
7
- originY?: number;
8
- originZ?: number;
6
+ originalX?: number;
7
+ originalY?: number;
8
+ originalZ?: number;
9
9
  width?: number | {
10
10
  x: number;
11
11
  y: number;
@@ -7,8 +7,8 @@ export interface Ranges {
7
7
  }
8
8
  export interface Range extends Omit<NMRRange, 'signals' | 'id'> {
9
9
  id: string;
10
- originFrom?: number;
11
- originTo?: number;
10
+ originalFrom?: number;
11
+ originalTo?: number;
12
12
  absolute: number;
13
13
  signals: Signal1D[];
14
14
  integration: number;
@@ -1,6 +1,6 @@
1
1
  import { NMRSignal1D } from '../../signals/NMRSignal1D';
2
2
  type ObjectKeys = 'id' | 'multiplicity' | 'js';
3
3
  export interface Signal1D extends Required<Pick<NMRSignal1D, ObjectKeys>>, Omit<NMRSignal1D, ObjectKeys> {
4
- originDelta?: number;
4
+ originalDelta?: number;
5
5
  }
6
6
  export {};
@@ -5,7 +5,7 @@ interface SignalAxis {
5
5
  delta: number;
6
6
  nbAtoms?: number;
7
7
  diaIDs?: string[];
8
- originDelta: number;
8
+ originalDelta: number;
9
9
  }
10
10
  export interface Signal2D extends Signal {
11
11
  sign?: number;
@@ -3,6 +3,8 @@ import { Signal2D } from '../Signals/Signal2D';
3
3
  interface ZoneAxis extends FromTo {
4
4
  nbAtoms?: number;
5
5
  diaIDs?: string[];
6
+ originalFrom?: number;
7
+ originalTo?: number;
6
8
  }
7
9
  export interface Zone {
8
10
  id: string;
@@ -13,7 +13,7 @@ function getSum(values, key, check = null) {
13
13
  for (const current of values) {
14
14
  if (check?.(current)) {
15
15
  const value = current[key];
16
- if (!value || isNaN(value))
16
+ if (!value || typeof value !== 'number')
17
17
  continue;
18
18
  sum += Math.abs(value);
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,SAAgB,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;gBAAE,SAAS;YACrC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,wBAcC"}
1
+ {"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,SAAgB,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,SAAS;YAClD,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,wBAcC"}
@@ -2,21 +2,21 @@ import { v4 } from '@lukeed/uuid';
2
2
  import { xyIntegration } from 'ml-spectra-processing';
3
3
  import { getShiftX } from './getShiftX';
4
4
  function getRange(integral, shiftTarget, shift) {
5
- const { originFrom, originTo, from, to } = integral;
5
+ const { originalFrom, originalTo, from, to } = integral;
6
6
  if (shiftTarget === 'origin') {
7
7
  return {
8
- originFrom: from - shift,
9
- originTo: to - shift,
8
+ originalFrom: from - shift,
9
+ originalTo: to - shift,
10
10
  from,
11
11
  to,
12
12
  };
13
13
  }
14
14
  else {
15
15
  return {
16
- originFrom,
17
- originTo,
18
- from: originFrom + shift,
19
- to: originTo + shift,
16
+ originalFrom,
17
+ originalTo,
18
+ from: originalFrom + shift,
19
+ to: originalTo + shift,
20
20
  };
21
21
  }
22
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mapIntegrals.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapIntegrals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,SAAS,QAAQ,CAAC,QAAkB,EAAE,WAAwB,EAAE,KAAa;IAC3E,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;IACpD,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,UAAU,EAAE,IAAI,GAAG,KAAK;YACxB,QAAQ,EAAE,EAAE,GAAG,KAAK;YACpB,IAAI;YACJ,EAAE;SACH,CAAC;KACH;SAAM;QACL,OAAO;YACL,UAAU;YACV,QAAQ;YACR,IAAI,EAAE,UAAU,GAAG,KAAK;YACxB,EAAE,EAAE,QAAQ,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,SAAqB,EACrB,QAAiB,EACjB,cAA2B,QAAQ;IAEnC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,aAAa,CAC5B,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EACZ,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CACxE,CAAC;QAEF,OAAO;YACL,GAAG,QAAQ;YACX,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE;YACvB,GAAG,gBAAgB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"mapIntegrals.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapIntegrals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,SAAS,QAAQ,CAAC,QAAkB,EAAE,WAAwB,EAAE,KAAa;IAC3E,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;IACxD,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,YAAY,EAAE,IAAI,GAAG,KAAK;YAC1B,UAAU,EAAE,EAAE,GAAG,KAAK;YACtB,IAAI;YACJ,EAAE;SACH,CAAC;KACH;SAAM;QACL,OAAO;YACL,YAAY;YACZ,UAAU;YACV,IAAI,EAAE,YAAY,GAAG,KAAK;YAC1B,EAAE,EAAE,UAAU,GAAG,KAAK;SACvB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,SAAqB,EACrB,QAAiB,EACjB,cAA2B,QAAQ;IAEnC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,aAAa,CAC5B,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EACZ,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CACxE,CAAC;QAEF,OAAO;YACL,GAAG,QAAQ;YACX,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE;YACvB,GAAG,gBAAgB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -10,7 +10,7 @@ function isExists(peak, spectrum, error) {
10
10
  }
11
11
  return false;
12
12
  }
13
- function getPeakDelta(peak, shiftTarget, shift) {
13
+ export function getPeakDelta(peak, shiftTarget, shift) {
14
14
  const { originalX = 0, x } = peak;
15
15
  if (shiftTarget === 'origin') {
16
16
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"mapPeaks.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapPeaks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAMlC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAiB,EAAE,KAAa;IAC9D,sCAAsC;IACtC,KAAK,MAAM,EAAE,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,IAAY,EAAE,WAAwB,EAAE,KAAa;IACzE,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAClC,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,SAAS,EAAE,CAAC,GAAG,KAAK;YACpB,CAAC;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,SAAS;YACT,CAAC,EAAE,SAAS,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,KAAe,EACf,QAAiB,EACjB,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1D,IACE,CAAC,eAAe;YAChB,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,EACrD;YACA,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,IAAI;gBACP,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE;gBACpB,GAAG,SAAS;aACb,CAAC,CAAC;SACJ;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"mapPeaks.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapPeaks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAMlC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAiB,EAAE,KAAa;IAC9D,sCAAsC;IACtC,KAAK,MAAM,EAAE,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,IAAwB,EACxB,WAAwB,EACxB,KAAa;IAEb,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAClC,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,SAAS,EAAE,CAAC,GAAG,KAAK;YACpB,CAAC;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,SAAS;YACT,CAAC,EAAE,SAAS,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,KAAe,EACf,QAAiB,EACjB,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1D,IACE,CAAC,eAAe;YAChB,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,EACrD;YACA,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,IAAI;gBACP,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE;gBACpB,GAAG,SAAS;aACb,CAAC,CAAC;SACJ;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}