nmr-processing 7.4.2 → 8.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.
Files changed (97) hide show
  1. package/lib/assignment/getAssignments.d.ts +6 -8
  2. package/lib/assignment/getAssignments.js +1 -1
  3. package/lib/assignment/getAssignments.js.map +1 -1
  4. package/lib/assignment/utils/getAssignment/buildAssignments.js +5 -0
  5. package/lib/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
  6. package/lib/assignment/utils/getAssignment/checkIDs.js +5 -9
  7. package/lib/assignment/utils/getAssignment/checkIDs.js.map +1 -1
  8. package/lib/assignment/utils/getAssignment/formatData.js +30 -3
  9. package/lib/assignment/utils/getAssignment/formatData.js.map +1 -1
  10. package/lib/assignment/utils/getAssignment/partialScore.js +1 -1
  11. package/lib/assignment/utils/getAssignment/partialScore.js.map +1 -1
  12. package/lib/databases/getDatabase.d.ts +6 -1
  13. package/lib/databases/getDatabase.js +13 -3
  14. package/lib/databases/getDatabase.js.map +1 -1
  15. package/lib/index.d.ts +2 -2
  16. package/lib/index.js +1 -1
  17. package/lib/index.js.map +1 -1
  18. package/lib/peaks/NMRPeak1D.d.ts +0 -1
  19. package/lib/peaks/solventSuppression.d.ts +3 -0
  20. package/lib/peaks/solventSuppression.js +147 -0
  21. package/lib/peaks/solventSuppression.js.map +1 -0
  22. package/lib/peaks/util/jAnalyzer.d.ts +1 -1
  23. package/lib/prediction/predictAllSpectra.d.ts +22 -4
  24. package/lib/prediction/predictAllSpectra.js +102 -16
  25. package/lib/prediction/predictAllSpectra.js.map +1 -1
  26. package/lib/ranges/rangesToXY.js +27 -3
  27. package/lib/ranges/rangesToXY.js.map +1 -1
  28. package/lib/signals/addDummySignals.d.ts +2 -0
  29. package/lib/signals/addDummySignals.js +56 -0
  30. package/lib/signals/addDummySignals.js.map +1 -0
  31. package/lib/signals/hackSignalsToXY.js +2 -48
  32. package/lib/signals/hackSignalsToXY.js.map +1 -1
  33. package/lib/signals/simulation/simulate1D.d.ts +1 -39
  34. package/lib/signals/simulation/simulate1D.js +13 -240
  35. package/lib/signals/simulation/simulate1D.js.map +1 -1
  36. package/lib/signals/simulation/simulateXYPeaks.d.ts +47 -0
  37. package/lib/signals/simulation/simulateXYPeaks.js +246 -0
  38. package/lib/signals/simulation/simulateXYPeaks.js.map +1 -0
  39. package/lib/utilities/getFrequency.d.ts +1 -1
  40. package/lib/utilities/getFrequency.js +4 -4
  41. package/lib/utilities/getFrequency.js.map +1 -1
  42. package/lib/xyz/NMRSignal2D.d.ts +3 -3
  43. package/lib-esm/assignment/getAssignments.js +1 -1
  44. package/lib-esm/assignment/getAssignments.js.map +1 -1
  45. package/lib-esm/assignment/utils/getAssignment/buildAssignments.js +5 -0
  46. package/lib-esm/assignment/utils/getAssignment/buildAssignments.js.map +1 -1
  47. package/lib-esm/assignment/utils/getAssignment/checkIDs.js +5 -9
  48. package/lib-esm/assignment/utils/getAssignment/checkIDs.js.map +1 -1
  49. package/lib-esm/assignment/utils/getAssignment/formatData.js +30 -3
  50. package/lib-esm/assignment/utils/getAssignment/formatData.js.map +1 -1
  51. package/lib-esm/assignment/utils/getAssignment/partialScore.js +1 -1
  52. package/lib-esm/assignment/utils/getAssignment/partialScore.js.map +1 -1
  53. package/lib-esm/databases/getDatabase.js +13 -3
  54. package/lib-esm/databases/getDatabase.js.map +1 -1
  55. package/lib-esm/index.js +1 -1
  56. package/lib-esm/index.js.map +1 -1
  57. package/lib-esm/peaks/solventSuppression.js +140 -0
  58. package/lib-esm/peaks/solventSuppression.js.map +1 -0
  59. package/lib-esm/prediction/predictAllSpectra.js +102 -16
  60. package/lib-esm/prediction/predictAllSpectra.js.map +1 -1
  61. package/lib-esm/ranges/rangesToXY.js +27 -3
  62. package/lib-esm/ranges/rangesToXY.js.map +1 -1
  63. package/lib-esm/signals/addDummySignals.js +52 -0
  64. package/lib-esm/signals/addDummySignals.js.map +1 -0
  65. package/lib-esm/signals/hackSignalsToXY.js +2 -48
  66. package/lib-esm/signals/hackSignalsToXY.js.map +1 -1
  67. package/lib-esm/signals/simulation/simulate1D.js +14 -238
  68. package/lib-esm/signals/simulation/simulate1D.js.map +1 -1
  69. package/lib-esm/signals/simulation/simulateXYPeaks.js +239 -0
  70. package/lib-esm/signals/simulation/simulateXYPeaks.js.map +1 -0
  71. package/lib-esm/utilities/getFrequency.js +1 -1
  72. package/lib-esm/utilities/getFrequency.js.map +1 -1
  73. package/package.json +14 -12
  74. package/src/assignment/getAssignments.ts +8 -9
  75. package/src/assignment/utils/getAssignment/buildAssignments.ts +6 -0
  76. package/src/assignment/utils/getAssignment/checkIDs.ts +8 -8
  77. package/src/assignment/utils/getAssignment/formatData.ts +39 -3
  78. package/src/assignment/utils/getAssignment/partialScore.ts +2 -2
  79. package/src/databases/getDatabase.ts +19 -2
  80. package/src/index.ts +2 -2
  81. package/src/peaks/NMRPeak1D.ts +0 -1
  82. package/src/peaks/solventSuppression.ts +186 -0
  83. package/src/peaks/util/jAnalyzer.ts +1 -1
  84. package/src/prediction/predictAllSpectra.ts +151 -14
  85. package/src/ranges/rangesToXY.ts +33 -4
  86. package/src/signals/addDummySignals.ts +77 -0
  87. package/src/signals/hackSignalsToXY.ts +2 -72
  88. package/src/signals/simulation/simulate1D.ts +14 -319
  89. package/src/signals/simulation/simulateXYPeaks.ts +332 -0
  90. package/src/utilities/getFrequency.ts +1 -1
  91. package/src/xyz/NMRSignal2D.ts +3 -3
  92. package/lib/constants/gyromagneticRatio.d.ts +0 -6
  93. package/lib/constants/gyromagneticRatio.js +0 -26
  94. package/lib/constants/gyromagneticRatio.js.map +0 -1
  95. package/lib-esm/constants/gyromagneticRatio.js +0 -23
  96. package/lib-esm/constants/gyromagneticRatio.js.map +0 -1
  97. package/src/constants/gyromagneticRatio.ts +0 -49
@@ -1,40 +1,126 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.predictAllSpectra = void 0;
4
+ const signals2DToZ_1 = require("../signals/signals2DToZ");
4
5
  const signalsToXY_1 = require("../signals/signalsToXY");
6
+ const getFrequency_1 = require("../utilities/getFrequency");
5
7
  const predictAll_1 = require("./predictAll");
6
- /**
7
- * This function will generate an object compatible with NMR-ium
8
- *
9
- * @param molecule
10
- * @param options
11
- */
12
8
  async function predictAllSpectra(molecule, options = {}) {
13
- const predictions = await (0, predictAll_1.predictAll)(molecule, options.prediction);
9
+ const { simulation: simulationOptions = { oneD: {}, twoD: {} }, prediction: predictionOptions = {}, } = options;
10
+ const predictions = await (0, predictAll_1.predictAll)(molecule, predictionOptions);
14
11
  const spectra = [];
15
12
  const result = { spectra, molecules: [{ molfile: predictions.molfile }] };
16
- spectra.push(getProton(predictions.proton, options.simulation));
13
+ const oneDOptions = {
14
+ ...{
15
+ proton: { from: 0, to: 14 },
16
+ carbon: { from: 0, to: 200 },
17
+ nbPoints: 4098,
18
+ lineWidth: 0.03,
19
+ },
20
+ ...(simulationOptions.oneD || {}),
21
+ };
22
+ const twoDOptions = {
23
+ ...{
24
+ from: { x: oneDOptions.proton.from, y: oneDOptions.carbon.from },
25
+ to: { x: oneDOptions.proton.to, y: oneDOptions.carbon.to },
26
+ nbPoints: { x: 1024, y: 1024 },
27
+ },
28
+ ...(simulationOptions.twoD || {}),
29
+ };
30
+ for (const experiment in predictions) {
31
+ switch (experiment) {
32
+ case 'carbon':
33
+ case 'proton': {
34
+ spectra.push(get1DSpectrum(predictions[experiment], {
35
+ nbPoints: oneDOptions.nbPoints,
36
+ lineWidth: oneDOptions.lineWidth,
37
+ ...oneDOptions[experiment],
38
+ experiment,
39
+ frequency: simulationOptions.frequency,
40
+ }));
41
+ break;
42
+ }
43
+ case 'cosy':
44
+ case 'hsqc':
45
+ case 'hmbc': {
46
+ spectra.push(get2DSpectrum(predictions[experiment], {
47
+ ...twoDOptions,
48
+ experiment,
49
+ frequency: simulationOptions.frequency,
50
+ }));
51
+ break;
52
+ }
53
+ default:
54
+ break;
55
+ }
56
+ }
17
57
  return result;
18
58
  }
19
59
  exports.predictAllSpectra = predictAllSpectra;
20
- function getProton(prediction, options) {
21
- const { x, y } = (0, signalsToXY_1.signalsToXY)(prediction.signals, options);
60
+ function get2DSpectrum(prediction, options) {
61
+ const { signals, zones, nuclei } = prediction;
62
+ const { frequency: baseFrequency, experiment } = options;
63
+ const width = get2DWidth(nuclei);
64
+ const frequency = calculateFrequency(nuclei, baseFrequency);
65
+ const spectrumData = (0, signals2DToZ_1.signals2DToZ)(signals, {
66
+ ...options,
67
+ width,
68
+ factor: 3,
69
+ });
70
+ const spectrum = {
71
+ data: { ...spectrumData, noise: 0.01 },
72
+ info: {
73
+ nucleus: nuclei,
74
+ originFrequency: frequency,
75
+ baseFrequency: frequency,
76
+ pulseSequence: experiment,
77
+ experiment: '2d',
78
+ },
79
+ zones: { values: zones },
80
+ };
81
+ return spectrum;
82
+ }
83
+ function get2DWidth(nucleus) {
84
+ return nucleus[0] === nucleus[1] ? 0.02 : { x: 0.02, y: 0.2133 };
85
+ }
86
+ function get1DSpectrum(prediction, options) {
87
+ const { frequency = 400, experiment } = options;
88
+ const { signals, nucleus } = prediction;
89
+ const realFrequency = calculateFrequency(nucleus, frequency);
90
+ const { x, y } = (0, signalsToXY_1.signalsToXY)(signals, {
91
+ ...options,
92
+ frequency: realFrequency,
93
+ });
22
94
  const spectrum = {
23
- id: '',
24
95
  // todo Array.from is temporary for the developement
25
96
  data: { x: Array.from(x), re: Array.from(y), im: null },
26
97
  info: {
27
98
  nucleus: prediction.nucleus,
28
99
  dimension: 1,
29
- originFrequency: 400,
30
- baseFrequency: 400,
100
+ originFrequency: realFrequency,
101
+ baseFrequency: realFrequency,
31
102
  pulseSequence: 'prediction',
32
- experiment: 'proton',
103
+ experiment,
33
104
  isFt: true,
34
105
  },
35
- // todo: currently we disable the ranges because there is no ID
36
- //ranges: { values: prediction.ranges },
106
+ ranges: { values: prediction.ranges },
37
107
  };
38
108
  return spectrum;
39
109
  }
110
+ function calculateFrequency(nucleus, frequency) {
111
+ if (typeof nucleus === 'string') {
112
+ return (0, getFrequency_1.getFrequency)(nucleus, { nucleus: '1H', frequency });
113
+ }
114
+ else {
115
+ if (nucleus[0] === nucleus[1]) {
116
+ return `${frequency},${frequency}`;
117
+ }
118
+ else {
119
+ return `${frequency},${(0, getFrequency_1.getFrequency)(nucleus[1], {
120
+ nucleus: nucleus[0],
121
+ frequency,
122
+ })}`;
123
+ }
124
+ }
125
+ }
40
126
  //# sourceMappingURL=predictAllSpectra.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"predictAllSpectra.js","sourceRoot":"","sources":["../../src/prediction/predictAllSpectra.ts"],"names":[],"mappings":";;;AAEA,wDAAyE;AAEzE,6CAA6D;AAC7D;;;;;GAKG;AAEI,KAAK,UAAU,iBAAiB,CACrC,QAAkB,EAClB,UAGI,EAAE;IAEN,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAU,EAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACnE,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;IAC1E,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhE,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,8CAaC;AAED,SAAS,SAAS,CAAC,UAAe,EAAE,OAA4B;IAC9D,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAA,yBAAW,EAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG;QACf,EAAE,EAAE,EAAE;QACN,oDAAoD;QACpD,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;QACvD,IAAI,EAAE;YACJ,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE,GAAG;YACpB,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,YAAY;YAC3B,UAAU,EAAE,QAAQ;YACpB,IAAI,EAAE,IAAI;SACX;QACD,+DAA+D;QAC/D,wCAAwC;KACzC,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"predictAllSpectra.js","sourceRoot":"","sources":["../../src/prediction/predictAllSpectra.ts"],"names":[],"mappings":"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"}
@@ -13,17 +13,26 @@ function checkForSignals(ranges) {
13
13
  throw new Error('range has not signals');
14
14
  }
15
15
  }
16
+ const defaultFromTo = (nucleus = '') => {
17
+ switch (nucleus.toUpperCase()) {
18
+ case '13C':
19
+ return { from: -5, to: 206 };
20
+ default:
21
+ return { from: -0.5, to: 10.5 };
22
+ }
23
+ };
16
24
  function rangesToXY(ranges, options = {}) {
17
25
  checkForSignals(ranges);
18
- let { frequency = 400, lineWidth = 1, from = 0, to = 10, nbPoints = 16 * 1024, shape = { kind: 'gaussian' }, } = options;
26
+ let { frequency = 400, lineWidth = 1, nbPoints = 16 * 1024, shape = { kind: 'gaussian' }, } = options;
19
27
  const addSpectrum = (a, b) => {
20
28
  for (let i = 0; i < nbPoints; i++) {
21
29
  a[i] += b[i];
22
30
  }
23
31
  };
32
+ const { from, to } = getFromTo(ranges, options);
24
33
  const spectrumOptions = {
25
- from,
26
34
  to,
35
+ from,
27
36
  nbPoints,
28
37
  shape,
29
38
  lineWidth,
@@ -84,7 +93,7 @@ function broadPeakOrMultipletSpectrum(signals, options = {}) {
84
93
  return spectrumGenerator.getSpectrum();
85
94
  }
86
95
  function peaksOfMultiplet(delta, options) {
87
- const { frequency, lineWidth, intensities = [1, 2, 5, 4, 5, 3, 4, 2, 1], } = options;
96
+ const { frequency, lineWidth, intensities = [1, 2, 5, 4, 5, 7, 5, 4, 5, 2, 1], } = options;
88
97
  const lineWidthPpm = lineWidth / frequency;
89
98
  const spaceBetweenPeaks = lineWidthPpm * 1.5;
90
99
  const peaks = [];
@@ -111,4 +120,19 @@ function normalizeSpectrum(spectrum, signals, options = {}) {
111
120
  }
112
121
  }
113
122
  }
123
+ function getFromTo(ranges, options) {
124
+ const { from: defaultFrom, to: defaultTo } = defaultFromTo(options.nucleus);
125
+ let rangesFrom = Number.MAX_SAFE_INTEGER;
126
+ let rangesTo = Number.MIN_SAFE_INTEGER;
127
+ for (const range of ranges) {
128
+ for (const signal of range.signals || []) {
129
+ if (rangesFrom > signal.delta)
130
+ rangesFrom = signal.delta;
131
+ if (rangesTo < signal.delta)
132
+ rangesTo = signal.delta;
133
+ }
134
+ }
135
+ const { from = Math.min(rangesFrom - 0.5, defaultFrom), to = Math.max(rangesTo + 0.5, defaultTo), } = options;
136
+ return { from, to };
137
+ }
114
138
  //# sourceMappingURL=rangesToXY.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"rangesToXY.js","sourceRoot":"","sources":["../../src/ranges/rangesToXY.ts"],"names":[],"mappings":";;;;;;AACA,wFAA2D;AAE3D,2DAAuD;AAGvD,gEAA6D;AAsC7D,SAAS,eAAe,CACtB,MAAkB;IAElB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;QACxB,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;KAC9D;AACH,CAAC;AACD,SAAgB,UAAU,CAAC,MAAkB,EAAE,UAAe,EAAE;IAC9D,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,IAAI,EACF,SAAS,GAAG,GAAG,EACf,SAAS,GAAG,CAAC,EACb,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,QAAQ,GAAG,EAAE,GAAG,IAAI,EACpB,KAAK,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,GAC7B,GAAG,OAAO,CAAC;IAEZ,MAAM,WAAW,GAAG,CAAC,CAAc,EAAE,CAAc,EAAE,EAAE;QACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YACjC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACd;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG;QACtB,IAAI;QACJ,EAAE;QACF,QAAQ;QACR,KAAK;QACL,SAAS;QACT,SAAS;KACV,CAAC;IAEF,IAAI,QAAQ,GAAgB,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IACvD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;QAC5C,MAAM,EAAE,YAAY,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;QACrD,IAAI,eAAe,KAAK,GAAG,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC;gBACtB,YAAY,EAAE,GAAG;aAClB,CAAC,CAAC;SACJ;QACD,IAAI,aAAa,GAAgB,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;YAChC,IAAI,cAAc,GAChB,YAAY,KAAK,GAAG,IAAI,YAAY,KAAK,GAAG,IAAI,YAAY,KAAK,MAAM;gBACrE,CAAC,CAAC,4BAA4B,CAAC,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;gBAC3D,CAAC,CAAC,IAAA,iCAAe,EAAC,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;YACnD,iBAAiB,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5C,WAAW,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;SAC5C;QACD,IAAI,KAAK,CAAC,WAAW,EAAE;YACrB,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;SAC5D;QACD,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;KACtC;IAED,OAAO;QACL,CAAC,EAAE,IAAA,kCAAmB,EAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QACpD,CAAC,EAAE,QAAQ;KACZ,CAAC;AACJ,CAAC;AAzDD,gCAyDC;AAED,SAAS,4BAA4B,CACnC,OAAsB,EACtB,UAAe,EAAE;IAEjB,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACzC,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,OAAO,CAAC,CAAC;IAEzD,MAAM,UAAU,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;IAC/C,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;QAC1B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;QACxD,IAAI,YAAY,KAAK,GAAG,IAAI,YAAY,KAAK,MAAM,EAAE;YACnD,iBAAiB,CAAC,OAAO,CAAC;gBACxB,CAAC,EAAE,KAAK;gBACR,CAAC,EAAE,WAAW;gBACd,KAAK,EAAE,UAAU;aAClB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,EAAE;gBACpC,SAAS;gBACT,SAAS;aACV,CAAC,CAAC;YACH,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACnC;KACF;IACD,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa,EAAE,OAAY;IACnD,MAAM,EACJ,SAAS,EACT,SAAS,EACT,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAC1C,GAAG,OAAO,CAAC;IAEZ,MAAM,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;IAC3C,MAAM,iBAAiB,GAAG,YAAY,GAAG,GAAG,CAAC;IAE7C,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,iBAAiB,GACrB,KAAK,GAAG,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,KAAK,CAAC,IAAI,CAAC;YACT,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,CAAC;YAC5C,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;YACjB,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;KACJ;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAqB,EACrB,OAAsB,EACtB,UAAe,EAAE;IAEjB,MAAM,EACJ,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,EAAE,WAAW,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;QACnC,OAAO,GAAG,GAAG,WAAW,CAAC;IAC3B,CAAC,EAAE,CAAC,CAAC,GACN,GAAG,OAAO,CAAC;IACZ,MAAM,GAAG,GAAI,QAAyB,CAAC,MAAM,CAC3C,CAAC,GAAW,EAAE,OAAe,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,EAC/C,CAAC,CACF,CAAC;IAEF,IAAI,GAAG,KAAK,CAAC,EAAE;QACb,MAAM,KAAK,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;SACtB;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"rangesToXY.js","sourceRoot":"","sources":["../../src/ranges/rangesToXY.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { NMRSignal1D } from './NMRSignal1D';
2
+ export declare function addDummySignals(signals: NMRSignal1D[]): NMRSignal1D[];
@@ -0,0 +1,56 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.addDummySignals = void 0;
4
+ const couplingPatterns_1 = require("../constants/couplingPatterns");
5
+ function addDummySignals(signals) {
6
+ let newSignals = JSON.parse(JSON.stringify(signals));
7
+ signals.forEach((signal, s) => {
8
+ const { js: jCouplings = [], atoms: signalAssignment = [s] } = signal;
9
+ let { newCouplings, tempSignals } = checkCouplings(jCouplings, newSignals, signalAssignment);
10
+ if (tempSignals.length > 0)
11
+ newSignals.push(...tempSignals);
12
+ newSignals[s].js = newCouplings;
13
+ newSignals[s].atoms = signalAssignment;
14
+ });
15
+ return newSignals.sort((a, b) => a.delta - b.delta);
16
+ }
17
+ exports.addDummySignals = addDummySignals;
18
+ function checkCouplings(jCouplings, signals, signalAssignment) {
19
+ let newSignalAssignment = signals.length - 1;
20
+ let tempSignals = [];
21
+ const newCouplings = jCouplings.reduce((newCouplings, jCoupling) => {
22
+ const { atoms = [], multiplicity, coupling } = jCoupling;
23
+ if (atoms.length === 0) {
24
+ if (coupling && multiplicity) {
25
+ let tempCouplings = [];
26
+ const nbLinks = couplingPatterns_1.couplingPatterns.indexOf(multiplicity);
27
+ for (let i = 0; i < nbLinks; i++) {
28
+ newSignalAssignment++;
29
+ tempCouplings.push({
30
+ coupling,
31
+ atoms: [newSignalAssignment],
32
+ });
33
+ tempSignals.push(formatSignal(coupling, [newSignalAssignment], signalAssignment));
34
+ }
35
+ }
36
+ else {
37
+ newCouplings.push(jCoupling);
38
+ }
39
+ }
40
+ return newCouplings;
41
+ }, []);
42
+ return { newCouplings, tempSignals };
43
+ }
44
+ function formatSignal(coupling, newSignalAssignment, signalAssignment) {
45
+ return {
46
+ delta: 100000,
47
+ atoms: newSignalAssignment,
48
+ js: [
49
+ {
50
+ coupling,
51
+ atoms: signalAssignment,
52
+ },
53
+ ],
54
+ };
55
+ }
56
+ //# sourceMappingURL=addDummySignals.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"addDummySignals.js","sourceRoot":"","sources":["../../src/signals/addDummySignals.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AAKjE,SAAgB,eAAe,CAAC,OAAsB;IACpD,IAAI,UAAU,GAAkB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAEpE,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5B,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC;QAEtE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAChD,UAAU,EACV,UAAU,EACV,gBAAgB,CACjB,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;YAAE,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QAE5D,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,YAAY,CAAC;QAChC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,gBAAgB,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AAnBD,0CAmBC;AAED,SAAS,cAAc,CACrB,UAAuB,EACvB,OAAsB,EACtB,gBAA0B;IAE1B,IAAI,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7C,IAAI,WAAW,GAAkB,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CACpC,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE;QAC1B,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,IAAI,QAAQ,IAAI,YAAY,EAAE;gBAC5B,IAAI,aAAa,GAAgB,EAAE,CAAC;gBACpC,MAAM,OAAO,GAAG,mCAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;oBAChC,mBAAmB,EAAE,CAAC;oBACtB,aAAa,CAAC,IAAI,CAAC;wBACjB,QAAQ;wBACR,KAAK,EAAE,CAAC,mBAAmB,CAAC;qBAC7B,CAAC,CAAC;oBACH,WAAW,CAAC,IAAI,CACd,YAAY,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,EAAE,gBAAgB,CAAC,CAChE,CAAC;iBACH;aACF;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,YAAY,CAAC;IACtB,CAAC,EACD,EAAE,CACH,CAAC;IACF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,YAAY,CACnB,QAAgB,EAChB,mBAA6B,EAC7B,gBAA0B;IAE1B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,mBAAmB;QAC1B,EAAE,EAAE;YACF;gBACE,QAAQ;gBACR,KAAK,EAAE,gBAAgB;aACxB;SACF;KACF,CAAC;AACJ,CAAC"}
@@ -1,61 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.hackSignalsToXY = void 0;
4
- const couplingPatterns_1 = require("../constants/couplingPatterns");
4
+ const addDummySignals_1 = require("./addDummySignals");
5
5
  const signalsToXY_1 = require("./signalsToXY");
6
6
  /**
7
7
  * Create the xy object from an array of 1D signals.
8
8
  * @param signals Array of signals with assigned or unassigned couplings.
9
9
  */
10
10
  function hackSignalsToXY(signals, options = {}) {
11
- let newSignals = JSON.parse(JSON.stringify(signals));
12
- signals.forEach((signal, s) => {
13
- const { js: jCouplings = [], atoms: signalAssignment = [s] } = signal;
14
- let { newCouplings, tempSignals } = checkCouplings(jCouplings, newSignals, signalAssignment);
15
- if (tempSignals.length > 0)
16
- newSignals.push(...tempSignals);
17
- newSignals[s].js = newCouplings;
18
- newSignals[s].atoms = signalAssignment;
19
- });
11
+ let newSignals = (0, addDummySignals_1.addDummySignals)(signals);
20
12
  return (0, signalsToXY_1.signalsToXY)(newSignals, options);
21
13
  }
22
14
  exports.hackSignalsToXY = hackSignalsToXY;
23
- function checkCouplings(jCouplings, signals, signalAssignment) {
24
- let newSignalAssignment = signals.length - 1;
25
- let tempSignals = [];
26
- const newCouplings = jCouplings.reduce((newCouplings, jCoupling) => {
27
- const { atoms = [], multiplicity, coupling } = jCoupling;
28
- if (atoms.length === 0) {
29
- if (coupling && multiplicity) {
30
- let tempCouplings = [];
31
- const nbLinks = couplingPatterns_1.couplingPatterns.indexOf(multiplicity);
32
- for (let i = 0; i < nbLinks; i++) {
33
- newSignalAssignment++;
34
- tempCouplings.push({
35
- coupling,
36
- atoms: [newSignalAssignment],
37
- });
38
- tempSignals.push(formatSignal(coupling, [newSignalAssignment], signalAssignment));
39
- }
40
- }
41
- else {
42
- newCouplings.push(jCoupling);
43
- }
44
- }
45
- return newCouplings;
46
- }, []);
47
- return { newCouplings, tempSignals };
48
- }
49
- function formatSignal(coupling, newSignalAssignment, signalAssignment) {
50
- return {
51
- delta: 100000,
52
- atoms: newSignalAssignment,
53
- js: [
54
- {
55
- coupling,
56
- atoms: signalAssignment,
57
- },
58
- ],
59
- };
60
- }
61
15
  //# sourceMappingURL=hackSignalsToXY.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hackSignalsToXY.js","sourceRoot":"","sources":["../../src/signals/hackSignalsToXY.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AAIjE,+CAAgE;AAEhE;;;GAGG;AAEH,SAAgB,eAAe,CAC7B,OAAsB,EACtB,UAA8B,EAAE;IAEhC,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAErD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5B,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC;QAEtE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAChD,UAAU,EACV,UAAU,EACV,gBAAgB,CACjB,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;YAAE,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QAE5D,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,YAAY,CAAC;QAChC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,gBAAgB,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,yBAAW,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;AAtBD,0CAsBC;AAED,SAAS,cAAc,CACrB,UAAuB,EACvB,OAAsB,EACtB,gBAA0B;IAE1B,IAAI,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7C,IAAI,WAAW,GAAkB,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CACpC,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE;QAC1B,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,IAAI,QAAQ,IAAI,YAAY,EAAE;gBAC5B,IAAI,aAAa,GAAgB,EAAE,CAAC;gBACpC,MAAM,OAAO,GAAG,mCAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;oBAChC,mBAAmB,EAAE,CAAC;oBACtB,aAAa,CAAC,IAAI,CAAC;wBACjB,QAAQ;wBACR,KAAK,EAAE,CAAC,mBAAmB,CAAC;qBAC7B,CAAC,CAAC;oBACH,WAAW,CAAC,IAAI,CACd,YAAY,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,EAAE,gBAAgB,CAAC,CAChE,CAAC;iBACH;aACF;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,YAAY,CAAC;IACtB,CAAC,EACD,EAAE,CACH,CAAC;IACF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,YAAY,CACnB,QAAgB,EAChB,mBAA6B,EAC7B,gBAA0B;IAE1B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,mBAAmB;QAC1B,EAAE,EAAE;YACF;gBACE,QAAQ;gBACR,KAAK,EAAE,gBAAgB;aACxB;SACF;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"hackSignalsToXY.js","sourceRoot":"","sources":["../../src/signals/hackSignalsToXY.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,+CAAgE;AAEhE;;;GAGG;AAEH,SAAgB,eAAe,CAC7B,OAAsB,EACtB,UAA8B,EAAE;IAEhC,IAAI,UAAU,GAAG,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,IAAA,yBAAW,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;AAND,0CAMC"}
@@ -1,43 +1,6 @@
1
1
  import { DataXY } from 'cheminfo-types';
2
- import type { Shape1D } from 'ml-peak-shape-generator';
3
2
  import type { SpinSystem } from '../spinSystem';
4
- interface Simulate1DOptions {
5
- /**
6
- * The linewidth of the output spectrum, expresed in Hz.
7
- * @default 1
8
- */
9
- lineWidth?: number;
10
- /**
11
- * Maximum number of atoms on each cluster that can be considered to be simulated together. It affects the the quality and speed of the simulation.
12
- * @default 8
13
- */
14
- maxClusterSize?: number;
15
- /**
16
- * The frequency in Mhz of the fake spectrometer that records the spectrum.
17
- * @default 400
18
- */
19
- frequency?: number;
20
- /**
21
- * The low limit of the ordinate variable.
22
- * @default 0
23
- */
24
- from?: number;
25
- /**
26
- * The upper limit of the ordinate variable.
27
- * @default 10
28
- */
29
- to?: number;
30
- /**
31
- * Number of points of the output spectrum.
32
- * @default 16K
33
- */
34
- nbPoints?: number;
35
- /**
36
- * Shape options
37
- * @default {kind:'gaussian'}
38
- */
39
- shape?: Shape1D;
40
- }
3
+ import type { Simulate1DOptions } from './simulateXYPeaks';
41
4
  /**
42
5
  * This function simulates a one dimensional nmr spectrum. This function returns an array containing the relative intensities of the spectrum in the specified simulation window (from-to).
43
6
  */
@@ -46,4 +9,3 @@ export default function simulate1D(
46
9
  * The SpinSystem object to be simulated
47
10
  */
48
11
  spinSystem: SpinSystem, options?: Simulate1DOptions): DataXY;
49
- export {};