nmr-processing 3.3.0 → 3.3.4

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 (168) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/lib/databases/DatabaseNMREntry.d.ts +1 -1
  3. package/lib/index.d.ts +9 -0
  4. package/lib/peaks/peaksToRanges.d.ts +1 -1
  5. package/lib/peaks/peaksToRanges.js.map +1 -1
  6. package/lib/peaks/util/determineRealTop.d.ts +1 -1
  7. package/lib/peaks/util/jAnalyzer.d.ts +2 -2
  8. package/lib/prediction/predictCOSY.d.ts +3 -3
  9. package/lib/prediction/predictCarbon.d.ts +1 -1
  10. package/lib/prediction/predictCarbon.js +5 -5
  11. package/lib/prediction/predictCarbon.js.map +1 -1
  12. package/lib/prediction/predictHMBC.d.ts +3 -3
  13. package/lib/prediction/predictHSQC.d.ts +3 -3
  14. package/lib/prediction/predictProton.js +2 -2
  15. package/lib/prediction/predictProton.js.map +1 -1
  16. package/lib/prediction/utils/getFilteredIDiaIDs.d.ts +1 -1
  17. package/lib/prediction/utils/predict2D.js +6 -6
  18. package/lib/prediction/utils/predict2D.js.map +1 -1
  19. package/lib/prediction/utils/queryByHOSE.d.ts +1 -1
  20. package/lib/prediction/utils/queryByHOSE.js +1 -1
  21. package/lib/prediction/utils/queryByHOSE.js.map +1 -1
  22. package/lib/ranges/rangesToXY.d.ts +2 -2
  23. package/lib/signal/signalJoinCouplings.d.ts +1 -1
  24. package/lib/signal/signalJoinCouplings.js +5 -5
  25. package/lib/signal/signalJoinCouplings.js.map +1 -1
  26. package/lib/signals/hackSignalsToXY.js +7 -7
  27. package/lib/signals/hackSignalsToXY.js.map +1 -1
  28. package/lib/signals/signals2DToZ.js.map +1 -1
  29. package/lib/signals/signalsJoin.js +1 -1
  30. package/lib/signals/signalsJoin.js.map +1 -1
  31. package/lib/signals/signalsToXY.d.ts +2 -2
  32. package/lib/signals/signalsToXY.js +4 -4
  33. package/lib/signals/signalsToXY.js.map +1 -1
  34. package/lib/signals/simulation/signalsToSpinSystem.js +8 -8
  35. package/lib/signals/simulation/signalsToSpinSystem.js.map +1 -1
  36. package/lib/signals/simulation/simulate1D.d.ts +3 -3
  37. package/lib/types/MPFPeak.d.ts +9 -0
  38. package/lib/types/MPFPeak.js +3 -0
  39. package/lib/types/MPFPeak.js.map +1 -0
  40. package/lib/types/MakeMandatory.d.ts +3 -0
  41. package/lib/types/MakeMandatory.js +3 -0
  42. package/lib/types/MakeMandatory.js.map +1 -0
  43. package/lib/types/NMRPeak1D.d.ts +11 -0
  44. package/lib/types/NMRPeak1D.js +3 -0
  45. package/lib/types/NMRPeak1D.js.map +1 -0
  46. package/lib/types/NMRRange.d.ts +11 -0
  47. package/lib/types/NMRRange.js +3 -0
  48. package/lib/types/NMRRange.js.map +1 -0
  49. package/lib/types/NMRSignal1D.d.ts +21 -0
  50. package/lib/types/NMRSignal1D.js +3 -0
  51. package/lib/types/NMRSignal1D.js.map +1 -0
  52. package/lib/types/NMRSignal2D.d.ts +19 -0
  53. package/lib/types/NMRSignal2D.js +3 -0
  54. package/lib/types/NMRSignal2D.js.map +1 -0
  55. package/lib/types/NMRZone.d.ts +11 -0
  56. package/lib/types/NMRZone.js +3 -0
  57. package/lib/types/NMRZone.js.map +1 -0
  58. package/lib/types/XYNumberArray.d.ts +4 -0
  59. package/lib/types/XYNumberArray.js +3 -0
  60. package/lib/types/XYNumberArray.js.map +1 -0
  61. package/lib/types/dataStructure.d.ts +4 -0
  62. package/lib/types/dataStructure.js +3 -0
  63. package/lib/types/dataStructure.js.map +1 -0
  64. package/lib/types/jcoupling.d.ts +8 -0
  65. package/lib/types/jcoupling.js +3 -0
  66. package/lib/types/jcoupling.js.map +1 -0
  67. package/lib/types/nmrAssigment.d.ts +28 -0
  68. package/lib/types/nmrAssigment.js +3 -0
  69. package/lib/types/nmrAssigment.js.map +1 -0
  70. package/lib/types/prediction1D.d.ts +12 -0
  71. package/lib/types/prediction1D.js +3 -0
  72. package/lib/types/prediction1D.js.map +1 -0
  73. package/{src → lib}/types/prediction2D.d.ts +0 -0
  74. package/lib/types/prediction2D.js +2 -0
  75. package/lib/types/prediction2D.js.map +1 -0
  76. package/lib/types/spinSystem.d.ts +8 -0
  77. package/lib/types/spinSystem.js +3 -0
  78. package/lib/types/spinSystem.js.map +1 -0
  79. package/lib/xy/xyAutoRangesPicking.d.ts +1 -1
  80. package/lib-esm/peaks/peaksToRanges.js.map +1 -1
  81. package/lib-esm/prediction/predictCarbon.js +5 -5
  82. package/lib-esm/prediction/predictCarbon.js.map +1 -1
  83. package/lib-esm/prediction/predictProton.js +2 -2
  84. package/lib-esm/prediction/predictProton.js.map +1 -1
  85. package/lib-esm/prediction/utils/predict2D.js +6 -6
  86. package/lib-esm/prediction/utils/predict2D.js.map +1 -1
  87. package/lib-esm/prediction/utils/queryByHOSE.js +1 -1
  88. package/lib-esm/prediction/utils/queryByHOSE.js.map +1 -1
  89. package/lib-esm/signal/signalJoinCouplings.js +5 -5
  90. package/lib-esm/signal/signalJoinCouplings.js.map +1 -1
  91. package/lib-esm/signals/hackSignalsToXY.js +7 -7
  92. package/lib-esm/signals/hackSignalsToXY.js.map +1 -1
  93. package/lib-esm/signals/signals2DToZ.js.map +1 -1
  94. package/lib-esm/signals/signalsJoin.js +1 -1
  95. package/lib-esm/signals/signalsJoin.js.map +1 -1
  96. package/lib-esm/signals/signalsToXY.js +4 -4
  97. package/lib-esm/signals/signalsToXY.js.map +1 -1
  98. package/lib-esm/signals/simulation/signalsToSpinSystem.js +8 -8
  99. package/lib-esm/signals/simulation/signalsToSpinSystem.js.map +1 -1
  100. package/lib-esm/types/MPFPeak.js +2 -0
  101. package/lib-esm/types/MPFPeak.js.map +1 -0
  102. package/lib-esm/types/MakeMandatory.js +2 -0
  103. package/lib-esm/types/MakeMandatory.js.map +1 -0
  104. package/lib-esm/types/NMRPeak1D.js +2 -0
  105. package/lib-esm/types/NMRPeak1D.js.map +1 -0
  106. package/lib-esm/types/NMRRange.js +2 -0
  107. package/lib-esm/types/NMRRange.js.map +1 -0
  108. package/lib-esm/types/NMRSignal1D.js +2 -0
  109. package/lib-esm/types/NMRSignal1D.js.map +1 -0
  110. package/lib-esm/types/NMRSignal2D.js +2 -0
  111. package/lib-esm/types/NMRSignal2D.js.map +1 -0
  112. package/lib-esm/types/NMRZone.js +2 -0
  113. package/lib-esm/types/NMRZone.js.map +1 -0
  114. package/lib-esm/types/XYNumberArray.js +2 -0
  115. package/lib-esm/types/XYNumberArray.js.map +1 -0
  116. package/lib-esm/types/dataStructure.js +2 -0
  117. package/lib-esm/types/dataStructure.js.map +1 -0
  118. package/lib-esm/types/jcoupling.js +2 -0
  119. package/lib-esm/types/jcoupling.js.map +1 -0
  120. package/lib-esm/types/nmrAssigment.js +2 -0
  121. package/lib-esm/types/nmrAssigment.js.map +1 -0
  122. package/lib-esm/types/prediction1D.js +2 -0
  123. package/lib-esm/types/prediction1D.js.map +1 -0
  124. package/lib-esm/types/prediction2D.js +2 -0
  125. package/lib-esm/types/prediction2D.js.map +1 -0
  126. package/lib-esm/types/spinSystem.js +2 -0
  127. package/lib-esm/types/spinSystem.js.map +1 -0
  128. package/package.json +5 -6
  129. package/src/databases/DatabaseNMREntry.ts +1 -1
  130. package/src/index.ts +13 -0
  131. package/src/peaks/peaksToRanges.ts +3 -4
  132. package/src/peaks/util/determineRealTop.ts +1 -1
  133. package/src/peaks/util/jAnalyzer.ts +2 -2
  134. package/src/prediction/predictCOSY.ts +1 -1
  135. package/src/prediction/predictCarbon.ts +8 -8
  136. package/src/prediction/predictHMBC.ts +1 -1
  137. package/src/prediction/predictHSQC.ts +1 -1
  138. package/src/prediction/predictProton.ts +2 -2
  139. package/src/prediction/utils/predict2D.ts +12 -10
  140. package/src/prediction/utils/queryByHOSE.ts +2 -2
  141. package/src/ranges/rangesToACS.ts +1 -1
  142. package/src/ranges/rangesToXY.ts +2 -2
  143. package/src/signal/signalJoinCouplings.ts +6 -6
  144. package/src/signals/hackSignalsToXY.ts +8 -8
  145. package/src/signals/signals2DToZ.ts +0 -1
  146. package/src/signals/signalsJoin.ts +1 -1
  147. package/src/signals/signalsToRanges.ts +1 -1
  148. package/src/signals/signalsToXY.ts +7 -7
  149. package/src/signals/simulation/signalsToSpinSystem.ts +10 -10
  150. package/src/signals/simulation/simulate1D.ts +3 -3
  151. package/src/types/{MPFPeak.d.ts → MPFPeak.ts} +0 -0
  152. package/src/types/{MakeMandatory.d.ts → MakeMandatory.ts} +0 -0
  153. package/src/types/{NMRPeak1D.d.ts → NMRPeak1D.ts} +0 -0
  154. package/src/types/{NMRRange.d.ts → NMRRange.ts} +0 -0
  155. package/src/types/{NMRSignal1D.d.ts → NMRSignal1D.ts} +4 -4
  156. package/src/types/{NMRSignal2D.d.ts → NMRSignal2D.ts} +2 -1
  157. package/src/types/{NMRZone.d.ts → NMRZone.ts} +1 -1
  158. package/src/types/{XYNumberArray.d.ts → XYNumberArray.ts} +0 -0
  159. package/src/types/{dataStructure.d.ts → dataStructure.ts} +0 -0
  160. package/src/types/{jcoupling.d.ts → jcoupling.ts} +1 -1
  161. package/src/types/{nmrAssigment.d.ts → nmrAssigment.ts} +1 -1
  162. package/src/types/openchemlib-utils/{index.d.ts → index..d.ts} +0 -0
  163. package/src/types/{prediction1D.d.ts → prediction1D.ts} +0 -0
  164. package/src/types/prediction2D.ts +0 -0
  165. package/src/types/{spinSystem.d.ts → spinSystem.ts} +0 -0
  166. package/src/xyz/xyzAutoPeaksPicking.ts +1 -1
  167. package/src/xyz/xyzJResAnalyzer.ts +2 -2
  168. package/src/types/jest.d.ts +0 -15
@@ -43,9 +43,9 @@ function groupJCouplings(signal, comparator, tolerance) {
43
43
  signal.js = [];
44
44
  for (let group of groups) {
45
45
  let coupling = sum(group.map((group) => group.coupling)) / group.length;
46
- let atomIDs = distinctValues(group
47
- .filter((group) => group.atomIDs)
48
- .map((group) => group.atomIDs)
46
+ let atoms = distinctValues(group
47
+ .filter((group) => group.atoms)
48
+ .map((group) => group.atoms)
49
49
  .flat());
50
50
  let assignment = distinctValues(group
51
51
  .filter((group) => group.assignment)
@@ -69,8 +69,8 @@ function groupJCouplings(signal, comparator, tolerance) {
69
69
  newJ.distance = distances[0];
70
70
  if (assignment.length > 0)
71
71
  newJ.assignment = assignment;
72
- if (atomIDs.length > 0)
73
- newJ.atomIDs = atomIDs;
72
+ if (atoms.length > 0)
73
+ newJ.atoms = atoms;
74
74
  signal.js.push(newJ);
75
75
  }
76
76
  return signal;
@@ -1 +1 @@
1
- {"version":3,"file":"signalJoinCouplings.js","sourceRoot":"","sources":["../../src/signal/signalJoinCouplings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signalJoinCouplings.js","sourceRoot":"","sources":["../../src/signal/signalJoinCouplings.ts"],"names":[],"mappings":"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"}
@@ -7,12 +7,12 @@ import { signalsToXY } from './signalsToXY';
7
7
  export function hackSignalsToXY(signals, options = {}) {
8
8
  let newSignals = JSON.parse(JSON.stringify(signals));
9
9
  signals.forEach((signal, s) => {
10
- const { js: jCouplings = [], atomIDs: signalAssignment = [s] } = signal;
10
+ const { js: jCouplings = [], atoms: signalAssignment = [s] } = signal;
11
11
  let { newCouplings, tempSignals } = checkCouplings(jCouplings, newSignals, signalAssignment);
12
12
  if (tempSignals.length > 0)
13
13
  newSignals.push(...tempSignals);
14
14
  newSignals[s].js = newCouplings;
15
- newSignals[s].atomIDs = signalAssignment;
15
+ newSignals[s].atoms = signalAssignment;
16
16
  });
17
17
  return signalsToXY(newSignals, options);
18
18
  }
@@ -20,8 +20,8 @@ function checkCouplings(jCouplings, signals, signalAssignment) {
20
20
  let newSignalAssignment = signals.length - 1;
21
21
  let tempSignals = [];
22
22
  const newCouplings = jCouplings.reduce((newCouplings, jCoupling) => {
23
- const { atomIDs = [], multiplicity, coupling } = jCoupling;
24
- if (atomIDs.length === 0) {
23
+ const { atoms = [], multiplicity, coupling } = jCoupling;
24
+ if (atoms.length === 0) {
25
25
  if (coupling && multiplicity) {
26
26
  let tempCouplings = [];
27
27
  const nbLinks = couplingPatterns.indexOf(multiplicity);
@@ -29,7 +29,7 @@ function checkCouplings(jCouplings, signals, signalAssignment) {
29
29
  newSignalAssignment++;
30
30
  tempCouplings.push({
31
31
  coupling,
32
- atomIDs: [newSignalAssignment],
32
+ atoms: [newSignalAssignment],
33
33
  });
34
34
  tempSignals.push(formatSignal(coupling, [newSignalAssignment], signalAssignment));
35
35
  }
@@ -45,11 +45,11 @@ function checkCouplings(jCouplings, signals, signalAssignment) {
45
45
  function formatSignal(coupling, newSignalAssignment, signalAssignment) {
46
46
  return {
47
47
  delta: 100000,
48
- atomIDs: newSignalAssignment,
48
+ atoms: newSignalAssignment,
49
49
  js: [
50
50
  {
51
51
  coupling,
52
- atomIDs: signalAssignment,
52
+ atoms: signalAssignment,
53
53
  },
54
54
  ],
55
55
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hackSignalsToXY.js","sourceRoot":"","sources":["../../src/signals/hackSignalsToXY.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAIjE,OAAO,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAEhE;;;GAGG;AAEH,MAAM,UAAU,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,OAAO,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC;QAExE,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,OAAO,GAAG,gBAAgB,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;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,OAAO,GAAG,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QAC3D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,IAAI,QAAQ,IAAI,YAAY,EAAE;gBAC5B,IAAI,aAAa,GAAgB,EAAE,CAAC;gBACpC,MAAM,OAAO,GAAG,gBAAgB,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,OAAO,EAAE,CAAC,mBAAmB,CAAC;qBAC/B,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,OAAO,EAAE,mBAAmB;QAC5B,EAAE,EAAE;YACF;gBACE,QAAQ;gBACR,OAAO,EAAE,gBAAgB;aAC1B;SACF;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"hackSignalsToXY.js","sourceRoot":"","sources":["../../src/signals/hackSignalsToXY.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAIjE,OAAO,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAEhE;;;GAGG;AAEH,MAAM,UAAU,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,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;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,gBAAgB,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 +1 @@
1
- {"version":3,"file":"signals2DToZ.js","sourceRoot":"","sources":["../../src/signals/signals2DToZ.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAoCxD,MAAM,UAAU,YAAY,CAC1B,OAAsB,EACtB,UAA+B,EAAE;IAEjC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEnE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAC1B,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE;QAChB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACpB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACpB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACxB,CAAC;IAEF,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAE9B,OAAO,kBAAkB,CAAC,KAAK,EAAE;QAC/B,SAAS,EAAE;YACT,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;YAC1B,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC;YACtB,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC;SACnC;QACD,KAAK,EAAE;YACL,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,KAAwB;IAC9C,IAAI,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACxE,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"signals2DToZ.js","sourceRoot":"","sources":["../../src/signals/signals2DToZ.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAoCxD,MAAM,UAAU,YAAY,CAC1B,OAAsB,EACtB,UAA+B,EAAE;IAEjC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEnE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAC1B,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE;QAChB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACpB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACpB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACxB,CAAC;IAEF,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,kBAAkB,CAAC,KAAK,EAAE;QAC/B,SAAS,EAAE;YACT,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;YAC1B,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC;YACtB,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC;SACnC;QACD,KAAK,EAAE;YACL,KAAK;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,KAAwB;IAC9C,IAAI,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACxE,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -61,7 +61,7 @@ export function signalsJoin(signals, options = {}) {
61
61
  nbAtoms: sum(group.map((item) => item.nbAtoms || 0)),
62
62
  delta: mean(group.map((item) => item.delta)),
63
63
  diaIDs: group[0].diaIDs,
64
- atomIDs: group.map((item) => item.atomIDs || []).flat(),
64
+ atoms: group.map((item) => item.atoms || []).flat(),
65
65
  js,
66
66
  };
67
67
  const assignment = group
@@ -1 +1 @@
1
- {"version":3,"file":"signalsJoin.js","sourceRoot":"","sources":["../../src/signals/signalsJoin.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,eAAe,CAAC;AACjC,OAAO,GAAG,MAAM,cAAc,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAuBpE,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACnE,MAAM,0BAA0B,GAAG,CACjC,CAA0B,EAC1B,CAA0B,EAC1B,EAAE;IACF,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;IAChD,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;IAChD,OAAO,aAAa,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC;AACF,SAAS,iBAAiB,CACxB,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3D,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,EAAE,EAAE;YACjC,IAAI,CAAC,SAAS,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC9D,IAAI,CAAC,SAAS,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SACnE;KACF;AACH,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,OAAsB,EACtB,UAA8B,EAAE;IAEhC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;IAClD,0BAA0B;IAE1B,MAAM,WAAW,GAA8B,IAAI,CAAC,KAAK,CACvD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CACxB,CAAC;IAEF,MAAM,cAAc,GAAmD,EAAE,CAAC;IAE1E,KAAK,IAAI,MAAM,IAAI,WAAW,EAAE;QAC9B,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,EAAE,GAAG,GAAG,SAAS,IAAI,MAAM,CAAC,EAAE;aAC/B,GAAG,CACF,CAAC,CAA0B,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CACtE;aACA,IAAI,CAAC,aAAa,CAAC;aACnB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;YACvB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;SACzB;QACD,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACjC;IACD,sEAAsE;IACtE,IAAI,UAAU,GAA8B,EAAE,CAAC;IAC/C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9C,yDAAyD;QACzD,IAAI,EAAE,GAA8B,EAAE,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAChC,EAAE,CAAC,IAAI,CAAC;gBACN,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;aACzD,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,GAA4B;YACpC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACpD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;YACvB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;YACvD,EAAE;SACH,CAAC;QAEF,MAAM,UAAU,GAAG,KAAK;aACrB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;aAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;aACtB,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAE1D,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,UAAU,GAAG,UAAU;SACpB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,IAAI,SAAS,GAAG,mBAAmB,CAAC,MAAM,EAAE;YAC1C,SAAS;YACT,YAAY;SACb,CAA4B,CAAC;QAC9B,IAAI,SAAS,CAAC,EAAE,EAAE;YAChB,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,EAAE,CAAC,MAAM,CAC1C,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE;gBAC1B,OAAO,GAAG,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;YACpD,CAAC,EACD,EAAE,CACH,CAAC;SACH;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAErC,OAAO,UAAU,CAAC;AACpB,CAAC"}
1
+ {"version":3,"file":"signalsJoin.js","sourceRoot":"","sources":["../../src/signals/signalsJoin.ts"],"names":[],"mappings":"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"}
@@ -8,12 +8,12 @@ function checkForMandatory(signals) {
8
8
  if (!signal.js)
9
9
  throw new Error('There is not js');
10
10
  // if (!signal.diaID) throw new Error('There is not diaID');
11
- if (!signal.atomIDs)
12
- throw new Error('There is not atomIDs');
11
+ if (!signal.atoms)
12
+ throw new Error('There is not atoms');
13
13
  for (const j of signal.js) {
14
14
  // if (!j.diaID) throw new Error('There is not diaID');
15
- if (!j.atomIDs)
16
- throw new Error('There is not atomIDs');
15
+ if (!j.atoms)
16
+ throw new Error('There is not atoms');
17
17
  }
18
18
  }
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"signalsToXY.js","sourceRoot":"","sources":["../../src/signals/signalsToXY.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAO3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AA8C/D,SAAS,iBAAiB,CACxB,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,4DAA4D;QAC5D,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC7D,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,EAAE,EAAE;YACzB,uDAAuD;YACvD,IAAI,CAAC,CAAC,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzD;KACF;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,OAAsB,EACtB,UAA8B,EAAE;IAEhC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,IAAI,EACF,SAAS,GAAG,GAAG,EACf,KAAK,GAAG;QACN,IAAI,EAAE,UAAU;KACjB,EACD,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,SAAS,GAAG,CAAC,EACb,QAAQ,GAAG,EAAE,GAAG,IAAI,EACpB,QAAQ,GAAG,GAAG,EACd,cAAc,GAAG,CAAC,GACnB,GAAG,OAAO,CAAC;IAEZ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO;YACL,CAAC,EAAE,mBAAmB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACpD,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;SAC1C,CAAC;KACH;IAED,IAAI,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE9C,UAAU,CAAC,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE;QAChD,SAAS;QACT,cAAc;KACf,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,UAAU,CAAC,UAAU,EAAE;QACpC,SAAS;QACT,IAAI;QACJ,EAAE;QACF,QAAQ;QACR,SAAS;QACT,KAAK;KACN,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;KACrD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"signalsToXY.js","sourceRoot":"","sources":["../../src/signals/signalsToXY.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAO3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AA8C/D,SAAS,iBAAiB,CACxB,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,4DAA4D;QAC5D,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACzD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,EAAE,EAAE;YACzB,uDAAuD;YACvD,IAAI,CAAC,CAAC,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACrD;KACF;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,OAAsB,EACtB,UAA8B,EAAE;IAEhC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,IAAI,EACF,SAAS,GAAG,GAAG,EACf,KAAK,GAAG;QACN,IAAI,EAAE,UAAU;KACjB,EACD,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,SAAS,GAAG,CAAC,EACb,QAAQ,GAAG,EAAE,GAAG,IAAI,EACpB,QAAQ,GAAG,GAAG,EACd,cAAc,GAAG,CAAC,GACnB,GAAG,OAAO,CAAC;IAEZ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO;YACL,CAAC,EAAE,mBAAmB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACpD,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;SAC1C,CAAC;KACH;IAED,IAAI,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE9C,UAAU,CAAC,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE;QAChD,SAAS;QACT,cAAc;KACf,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,UAAU,CAAC,UAAU,EAAE;QACpC,SAAS;QACT,IAAI;QACJ,EAAE;QACF,QAAQ;QACR,SAAS;QACT,KAAK;KACN,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;KACrD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
@@ -4,11 +4,11 @@ function checkForMandatory(signals) {
4
4
  for (const signal of signals) {
5
5
  if (!signal.js)
6
6
  throw new Error('there is not js');
7
- if (!signal.atomIDs)
8
- throw new Error('there is not atomIDs');
7
+ if (!signal.atoms)
8
+ throw new Error('there is not atoms');
9
9
  for (const jcoupling of signal.js) {
10
- if (!jcoupling.atomIDs)
11
- throw new Error('there is not atomIDs');
10
+ if (!jcoupling.atoms)
11
+ throw new Error('there is not atoms');
12
12
  }
13
13
  }
14
14
  }
@@ -23,16 +23,16 @@ export function signalsToSpinSystem(signals) {
23
23
  for (let i = 0; i < nSpins; i++) {
24
24
  multiplicity[i] = 2;
25
25
  chemicalShifts[i] = signals[i].delta;
26
- const index = signals[i].atomIDs[0];
26
+ const index = signals[i].atoms[0];
27
27
  ids[index] = i;
28
28
  }
29
29
  //create the coupling matrix
30
30
  for (let i = 0; i < nSpins; i++) {
31
- let { atomIDs: signalAssignment, js: jCoupling } = signals[i];
31
+ let { atoms: signalAssignment, js: jCoupling } = signals[i];
32
32
  const fromIndex = signalAssignment[0];
33
33
  for (const jcoupling of jCoupling) {
34
- let { coupling, atomIDs } = jcoupling;
35
- const toIndex = atomIDs[0];
34
+ let { coupling, atoms } = jcoupling;
35
+ const toIndex = atoms[0];
36
36
  couplingConstants.set(ids[fromIndex], ids[toIndex], coupling);
37
37
  couplingConstants.set(ids[toIndex], ids[fromIndex], coupling);
38
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"signalsToSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/signalsToSpinSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,gBAAgB,MAAM,sBAAsB,CAAC;AAiBpD,SAAS,iBAAiB,CACxB,OAAsB;IAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC7D,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,EAAE,EAAE;YACjC,IAAI,CAAC,SAAS,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACjE;KACF;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAsB;IACxD,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,cAAc,GAAa,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,YAAY,GAAa,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,8BAA8B;IAC9B,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAChB;IACD,4BAA4B;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,MAAM,SAAS,IAAI,SAAS,EAAE;YACjC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;YACtC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC3B,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC9D,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;SAC/D;KACF;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAC9B,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,IAAI,CACvB,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAClD,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;gBACrC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3B;SACF;KACF;IAED,IAAI,QAAQ,GAAG,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE;QACxD,GAAG,EAAE,SAAS;KACf,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,iBAAiB;QACjB,cAAc;QACd,YAAY;QACZ,YAAY;KACb,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"signalsToSpinSystem.js","sourceRoot":"","sources":["../../../src/signals/simulation/signalsToSpinSystem.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=MPFPeak.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MPFPeak.js","sourceRoot":"","sources":["../../src/types/MPFPeak.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=MakeMandatory.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MakeMandatory.js","sourceRoot":"","sources":["../../src/types/MakeMandatory.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=NMRPeak1D.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NMRPeak1D.js","sourceRoot":"","sources":["../../src/types/NMRPeak1D.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=NMRRange.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NMRRange.js","sourceRoot":"","sources":["../../src/types/NMRRange.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=NMRSignal1D.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NMRSignal1D.js","sourceRoot":"","sources":["../../src/types/NMRSignal1D.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=NMRSignal2D.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NMRSignal2D.js","sourceRoot":"","sources":["../../src/types/NMRSignal2D.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=NMRZone.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NMRZone.js","sourceRoot":"","sources":["../../src/types/NMRZone.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=XYNumberArray.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"XYNumberArray.js","sourceRoot":"","sources":["../../src/types/XYNumberArray.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=dataStructure.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dataStructure.js","sourceRoot":"","sources":["../../src/types/dataStructure.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=jcoupling.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jcoupling.js","sourceRoot":"","sources":["../../src/types/jcoupling.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=nmrAssigment.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nmrAssigment.js","sourceRoot":"","sources":["../../src/types/nmrAssigment.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=prediction1D.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prediction1D.js","sourceRoot":"","sources":["../../src/types/prediction1D.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ //# sourceMappingURL=prediction2D.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prediction2D.js","sourceRoot":"","sources":["../../src/types/prediction2D.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=spinSystem.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"spinSystem.js","sourceRoot":"","sources":["../../src/types/spinSystem.ts"],"names":[],"mappings":""}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nmr-processing",
3
- "version": "3.3.0",
3
+ "version": "3.3.4",
4
4
  "description": "Pure functions allowing to process NMR spectra.",
5
5
  "main": "./lib/index.js",
6
6
  "module": "./lib-esm/index.js",
@@ -9,7 +9,6 @@
9
9
  "author": "Luc Patiny",
10
10
  "license": "MIT",
11
11
  "files": [
12
- "types",
13
12
  "src",
14
13
  "lib",
15
14
  "lib-esm"
@@ -50,11 +49,11 @@
50
49
  "@types/jest": "^27.0.2",
51
50
  "cheminfo-build": "^1.1.11",
52
51
  "cheminfo-types": "^0.6.0",
53
- "eslint": "^7.32.0",
54
- "eslint-config-cheminfo-typescript": "^8.0.9",
52
+ "eslint": "^8.0.1",
53
+ "eslint-config-cheminfo-typescript": "^10.1.1",
55
54
  "esm": "^3.2.25",
56
55
  "jest": "^27.2.4",
57
- "jest-matcher-deep-close-to": "^3.0.0",
56
+ "jest-matcher-deep-close-to": "^3.0.2",
58
57
  "md5": "^2.3.0",
59
58
  "ml-array-median": "^1.1.5",
60
59
  "nmr-xy-testdata": "^0.2.1",
@@ -86,6 +85,6 @@
86
85
  "ml-spectra-processing": "^6.8.0",
87
86
  "ml-tree-set": "^0.1.1",
88
87
  "openchemlib-utils": "^1.5.1",
89
- "spectrum-generator": "^5.4.0"
88
+ "spectrum-generator": "^5.4.1"
90
89
  }
91
90
  }
@@ -1,4 +1,4 @@
1
- import { NMRRange } from '../types/NMRRange.d';
1
+ import { NMRRange } from '../types/NMRRange';
2
2
 
3
3
  export interface DatabaseNMREntry {
4
4
  smiles?: string;
package/src/index.ts CHANGED
@@ -36,3 +36,16 @@ export * from './xyz/xyzJResAnalyzer';
36
36
  export * from './databases/getDatabase';
37
37
  export * from './databases/carbonImpurities';
38
38
  export * from './databases/protonImpurities';
39
+
40
+ export type { NMRSignal1D } from './types/NMRSignal1D';
41
+ export type { NMRSignal2D } from './types/NMRSignal2D';
42
+ export type { NMRRange } from './types/NMRRange';
43
+ export type { NMRZone } from './types/NMRZone';
44
+ export type { XYNumberArray } from './types/XYNumberArray';
45
+ export type { NMRPeak1D } from './types/NMRPeak1D';
46
+ export type { Prediction1D } from './types/prediction1D';
47
+ export type { Jcoupling } from './types/jcoupling';
48
+ export type {
49
+ DataBaseLevelStructure,
50
+ DataBaseStructure,
51
+ } from './types/dataStructure';
@@ -1,9 +1,8 @@
1
1
  import type { DataXY } from 'cheminfo-types';
2
- import type { GSDPeak } from 'ml-gsd';
3
2
  import { xyIntegration } from 'ml-spectra-processing';
4
3
 
5
- import { MakeMandatory } from '../types/MakeMandatory';
6
- import { NMRPeak1D } from '../types/NMRPeak1D';
4
+ import type { MakeMandatory } from '../types/MakeMandatory';
5
+ import type { NMRPeak1D } from '../types/NMRPeak1D';
7
6
  import type { NMRRange } from '../types/NMRRange';
8
7
  import type { NMRSignal1D } from '../types/NMRSignal1D';
9
8
 
@@ -251,7 +250,7 @@ export function peaksToRanges(
251
250
  ...peak,
252
251
  };
253
252
  delete newResult.intensity;
254
- return newResult as GSDPeak;
253
+ return newResult as NMRPeak1D;
255
254
  });
256
255
  }
257
256
  if (signal.nmrJs) {
@@ -1,7 +1,7 @@
1
1
  import LM from 'ml-levenberg-marquardt';
2
2
  import { gaussian2D } from 'ml-peak-shape-generator';
3
3
 
4
- import { MPFPeak } from '../../types/MPFPeak';
4
+ import type { MPFPeak } from '../../types/MPFPeak';
5
5
 
6
6
  const { fct: gaussian2DFct } = gaussian2D;
7
7
 
@@ -1,5 +1,5 @@
1
- import { MakeMandatory } from '../../types/MakeMandatory';
2
- import { NMRPeak1D } from '../../types/NMRPeak1D';
1
+ import type { MakeMandatory } from '../../types/MakeMandatory';
2
+ import type { NMRPeak1D } from '../../types/NMRPeak1D';
3
3
 
4
4
  /*
5
5
  * This library implements the J analyser described by Cobas et al in the paper:
@@ -1,6 +1,6 @@
1
1
  import { Molecule } from 'openchemlib';
2
2
 
3
- import { Prediction1D } from '../types/prediction1D';
3
+ import type { Prediction1D } from '../types/prediction1D';
4
4
 
5
5
  import { predictProton, PredictProtonOptions } from './predictProton';
6
6
  import { predict2D, Predictor } from './utils/predict2D';
@@ -2,10 +2,10 @@ import fetch from 'cross-fetch';
2
2
  import type { Molecule } from 'openchemlib';
3
3
 
4
4
  import { signalsToRanges } from '../signals/signalsToRanges';
5
- import { MakeMandatory } from '../types/MakeMandatory';
6
- import { NMRSignal1D } from '../types/NMRSignal1D';
5
+ import type { MakeMandatory } from '../types/MakeMandatory';
6
+ import type { NMRSignal1D } from '../types/NMRSignal1D';
7
7
  import type { DataBaseStructure } from '../types/dataStructure';
8
- import { Prediction1D } from '../types/prediction1D';
8
+ import type { Prediction1D } from '../types/prediction1D';
9
9
 
10
10
  import { fetchPrediction } from './utils/fetchPrediction';
11
11
  import { flatGroupedDiaIDs } from './utils/flatGroupedDiaIDs';
@@ -52,12 +52,12 @@ export type PredictCarbon = typeof predictCarbon;
52
52
 
53
53
  type Signal1DFromPrediction = MakeMandatory<
54
54
  NMRSignal1D,
55
- 'nbAtoms' | 'atomIDs' | 'diaIDs'
55
+ 'nbAtoms' | 'atoms' | 'diaIDs'
56
56
  >;
57
57
  function checkFromPrediction(
58
58
  signal: NMRSignal1D,
59
59
  ): asserts signal is Signal1DFromPrediction {
60
- if (!signal.atomIDs) throw new Error('There is not atomIDs');
60
+ if (!signal.atoms) throw new Error('There is not atoms');
61
61
  if (!signal.diaIDs) throw new Error('There is not diaIDs');
62
62
  if (!signal.nbAtoms) throw new Error('There is not nbAtoms');
63
63
  }
@@ -115,10 +115,10 @@ export async function predictCarbon(
115
115
  function formatSignals(predictions: Prediction[]) {
116
116
  let signals = [];
117
117
  for (const prediction of predictions) {
118
- const { atomIDs, nbAtoms, delta, diaIDs, statistic } = prediction;
118
+ const { atoms, nbAtoms, delta, diaIDs, statistic } = prediction;
119
119
  const signal = {
120
120
  delta: delta || NaN,
121
- atomIDs,
121
+ atoms,
122
122
  diaIDs: diaIDs,
123
123
  multiplicity: 's',
124
124
  nbAtoms,
@@ -141,7 +141,7 @@ function joinSignalByDiaID(signals: NMRSignal1D[]) {
141
141
  ) as Signal1DFromPrediction;
142
142
  } else {
143
143
  joinedSignals[diaID].nbAtoms += signal.nbAtoms;
144
- joinedSignals[diaID].atomIDs.push(...signal.atomIDs);
144
+ joinedSignals[diaID].atoms.push(...signal.atoms);
145
145
  }
146
146
  }
147
147
  return Object.values(joinedSignals);
@@ -1,6 +1,6 @@
1
1
  import { Molecule } from 'openchemlib';
2
2
 
3
- import { Prediction1D } from '../types/prediction1D';
3
+ import type { Prediction1D } from '../types/prediction1D';
4
4
 
5
5
  import { predictCarbon } from './predictCarbon';
6
6
  import type { PredictCarbonOptions } from './predictCarbon';
@@ -1,6 +1,6 @@
1
1
  import { Molecule } from 'openchemlib';
2
2
 
3
- import { Prediction1D } from '../types/prediction1D';
3
+ import type { Prediction1D } from '../types/prediction1D';
4
4
 
5
5
  import { predictCarbon, PredictCarbonOptions } from './predictCarbon';
6
6
  import { predictProton, PredictProtonOptions } from './predictProton';
@@ -85,7 +85,7 @@ function protonParser(
85
85
  let couplings = fields.slice(4);
86
86
  let atom = Number(fields[0]) - 1;
87
87
  let signal: NMRSignal1D = {
88
- atomIDs: [atom],
88
+ atoms: [atom],
89
89
  diaIDs: [diaIDs[atom]],
90
90
  nbAtoms: 1,
91
91
  delta: Number(fields[2]),
@@ -99,7 +99,7 @@ function protonParser(
99
99
  let linked = Number(couplings[i]) - 1;
100
100
  signal.js.push({
101
101
  coupling: Number(couplings[i + 2]),
102
- atomIDs: [linked],
102
+ atoms: [linked],
103
103
  diaIDs: [diaIDs[linked]],
104
104
  multiplicity: 'd',
105
105
  distance: distanceMatrix[atom][linked],
@@ -110,8 +110,9 @@ type PredictHMBCOptionsWithFromTo = MakeMandatory<
110
110
  function checkFromTo(
111
111
  options: Predict2DOptions,
112
112
  ): asserts options is PredictHMBCOptionsWithFromTo {
113
- if (!options.from || !options.to)
114
- {throw new Error('options from and to are mandatory');}
113
+ if (!options.from || !options.to) {
114
+ throw new Error('options from and to are mandatory');
115
+ }
115
116
  }
116
117
 
117
118
  interface Signal1DByDiaID {
@@ -174,8 +175,9 @@ export async function predict2D(
174
175
  predictions,
175
176
  );
176
177
 
177
- if (!xPrediction || !yPrediction)
178
- {throw new Error('predictions are not availaible');}
178
+ if (!xPrediction || !yPrediction) {
179
+ throw new Error('predictions are not availaible');
180
+ }
179
181
 
180
182
  const spectra: { [key: string]: Prediction1D } = {
181
183
  x: xPrediction,
@@ -222,7 +224,7 @@ export async function predict2D(
222
224
  peak[axis] = signalsByDiaID[axis][diaID].delta;
223
225
  signal[axis].delta = signalsByDiaID[axis][diaID].delta;
224
226
  signal[axis].diaIDs = [diaID];
225
- signal[axis].atoms = signalsByDiaID[axis][diaID].atomIDs;
227
+ signal[axis].atoms = signalsByDiaID[axis][diaID].atoms;
226
228
  }
227
229
 
228
230
  signal.peaks = [peak];
@@ -251,11 +253,11 @@ export async function predict2D(
251
253
  function splitSignals(joinedSignals: NMRSignal2D[]) {
252
254
  let signals = [];
253
255
  for (const signal of joinedSignals) {
254
- for (const xAtom of signal.x.atomIDs || []) {
255
- for (const yAtom of signal.y.atomIDs || []) {
256
+ for (const xAtom of signal.x.atoms || []) {
257
+ for (const yAtom of signal.y.atoms || []) {
256
258
  let newSignal = JSON.parse(JSON.stringify(signal));
257
- newSignal.x.atomIDs = [xAtom];
258
- newSignal.y.atomIDs = [yAtom];
259
+ newSignal.x.atoms = [xAtom];
260
+ newSignal.y.atoms = [yAtom];
259
261
  signals.push(newSignal);
260
262
  }
261
263
  }
@@ -286,7 +288,7 @@ function addSelftCorrelation(
286
288
  peak[axis] = signalsByDiaID[axis][diaID].delta;
287
289
  signal[axis].delta = signalsByDiaID[axis][diaID].delta;
288
290
  signal[axis].diaIDs = [diaID];
289
- signal[axis].atoms = signalsByDiaID[axis][diaID].atomIDs;
291
+ signal[axis].atoms = signalsByDiaID[axis][diaID].atoms;
290
292
  }
291
293
 
292
294
  signal.peaks = [peak];
@@ -5,7 +5,7 @@ import type { GroupedDiaIDsWithHose } from './getFilteredIDiaIDs';
5
5
  export interface Prediction {
6
6
  diaIDs: string[];
7
7
  delta: number | null;
8
- atomIDs: number[];
8
+ atoms: number[];
9
9
  nbAtoms: number;
10
10
  level: number | null;
11
11
  statistic?: {
@@ -38,7 +38,7 @@ export function queryByHose(
38
38
  let atom = {
39
39
  diaIDs: [element.oclID],
40
40
  delta: res ? res[0]: null,
41
- atomIDs: [atomNumber],
41
+ atoms: [atomNumber],
42
42
  nbAtoms: 1,
43
43
  level: level,
44
44
  statistic: