nmr-processing 8.0.0 → 8.3.0

package/lib/signals/simulation/simulate1D.js

@@ -1,14 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const binary_search_1 = __importDefault(require("binary-search"));
-const ml_matrix_1 = require("ml-matrix");
-const ml_sparse_matrix_1 = require("ml-sparse-matrix");
 const spectrum_generator_1 = require("spectrum-generator");
-const getPauliMatrix_1 = __importDefault(require("./getPauliMatrix"));
-const smallValue = 1e-2;
+const simulateXYPeaks_1 = require("./simulateXYPeaks");
 /**
  * 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).
  */
@@ -17,242 +10,22 @@ function simulate1D(
  * The SpinSystem object to be simulated
  */
 spinSystem, options = {}) {
-    let { lineWidth = 1, maxClusterSize = 8, frequency: frequencyMHz = 400, from = 0, to = 10, nbPoints = 1024, shape = {
+    let { lineWidth = 1, frequency: frequencyMHz = 400, from = 0, to = 10, nbPoints = 1024, shape = {
         kind: 'gaussian',
     }, } = options;
     let peakWidth = lineWidth / frequencyMHz;
-    let spectrumGenerator = new spectrum_generator_1.SpectrumGenerator({
-        from,
-        to,
-        nbPoints,
-        shape,
-        peakWidthFct: () => peakWidth,
+    const xyPeaks = (0, simulateXYPeaks_1.simulateXYPeaks)(spinSystem, options);
+    return (0, spectrum_generator_1.generateSpectrum)(xyPeaks, {
+        generator: {
+            from,
+            to,
+            nbPoints,
+        },
+        peakOptions: {
+            shape,
+            width: peakWidth,
+        },
     });
-    const chemicalShifts = spinSystem.chemicalShifts.slice();
-    for (let i = 0; i < chemicalShifts.length; i++) {
-        chemicalShifts[i] = chemicalShifts[i] * frequencyMHz;
-    }
-    const multiplicity = spinSystem.multiplicity;
-    for (const cluster of spinSystem.clusters) {
-        let clusterFake = cluster.map((cluster) => cluster < 0 ? -cluster - 1 : cluster);
-        let weight = 1;
-        let sumI = 0;
-        let frequencies = [];
-        let intensities = [];
-        if (cluster.length > maxClusterSize) {
-            // This is a single spin, but the cluster exceeds the maxClusterSize criteria
-            // we use the simple multiplicity algorithm
-            // Add the central peak. It will be split with every single J coupling.
-            let index = 0;
-            while (cluster[index++] < 0)
-                ;
-            index = cluster[index - 1];
-            frequencies.push(-chemicalShifts[index]);
-            for (let i = 0; i < cluster.length; i++) {
-                if (cluster[i] < 0) {
-                    let jc = spinSystem.couplingConstants.get(index, clusterFake[i]) / 2;
-                    let currentSize = frequencies.length;
-                    for (let j = 0; j < currentSize; j++) {
-                        frequencies.push(frequencies[j] + jc);
-                        frequencies[j] -= jc;
-                    }
-                }
-            }
-            frequencies.sort((a, b) => a - b);
-            sumI = frequencies.length;
-            weight = 1;
-            for (let i = 0; i < sumI; i++) {
-                intensities.push(1);
-            }
-        }
-        else {
-            const hamiltonian = getHamiltonian(chemicalShifts, spinSystem.couplingConstants, multiplicity, spinSystem.connectivity, clusterFake);
-            const hamSize = hamiltonian.rows;
-            // TODO: add support for sparse matrix in matrix types.
-            // @ts-expect-error sparse matrix not supported
-            const evd = new ml_matrix_1.EVD(hamiltonian);
-            const V = evd.eigenvectorMatrix;
-            const diagB = evd.realEigenvalues;
-            const assignmentMatrix = new ml_sparse_matrix_1.SparseMatrix(hamSize, hamSize);
-            const multLen = cluster.length;
-            weight = 0;
-            for (let n = 0; n < multLen; n++) {
-                const L = (0, getPauliMatrix_1.default)(multiplicity[clusterFake[n]]);
-                let temp = 1;
-                for (let j = 0; j < n; j++) {
-                    temp *= multiplicity[clusterFake[j]];
-                }
-                const A = ml_sparse_matrix_1.SparseMatrix.eye(temp);
-                temp = 1;
-                for (let j = n + 1; j < multLen; j++) {
-                    temp *= multiplicity[clusterFake[j]];
-                }
-                const B = ml_sparse_matrix_1.SparseMatrix.eye(temp);
-                const tempMat = A.kroneckerProduct(L.m).kroneckerProduct(B);
-                if (cluster[n] >= 0) {
-                    assignmentMatrix.add(tempMat.mul(cluster[n] + 1));
-                    weight++;
-                }
-                else {
-                    assignmentMatrix.add(tempMat.mul(cluster[n]));
-                }
-            }
-            let rhoip = ml_matrix_1.Matrix.zeros(hamSize, hamSize);
-            assignmentMatrix.forEachNonZero((i, j, v) => {
-                if (v > 0) {
-                    for (let k = 0; k < V.columns; k++) {
-                        let element = V.get(j, k);
-                        if (element !== 0) {
-                            rhoip.set(i, k, rhoip.get(i, k) + element);
-                        }
-                    }
-                }
-                return v;
-            });
-            let rhoip2 = rhoip.clone();
-            assignmentMatrix.forEachNonZero((i, j, v) => {
-                if (v < 0) {
-                    for (let k = 0; k < V.columns; k++) {
-                        let element = V.get(j, k);
-                        if (element !== 0) {
-                            rhoip2.set(i, k, rhoip2.get(i, k) + element);
-                        }
-                    }
-                }
-                return v;
-            });
-            const tV = V.transpose();
-            rhoip = tV.mmul(rhoip);
-            const sparseRhoip = new ml_sparse_matrix_1.SparseMatrix(rhoip.to2DArray(), {
-                threshold: smallValue,
-            });
-            triuTimesAbs(sparseRhoip, smallValue);
-            rhoip2 = tV.mmul(rhoip2);
-            const sparseRhoip2 = new ml_sparse_matrix_1.SparseMatrix(rhoip2.to2DArray(), {
-                threshold: smallValue,
-            });
-            sparseRhoip2.forEachNonZero((i, j, v) => {
-                return v;
-            });
-            triuTimesAbs(sparseRhoip2, smallValue);
-            sparseRhoip2.forEachNonZero((i, j, v) => {
-                let val = rhoip.get(i, j);
-                val = Math.min(Math.abs(val), Math.abs(v));
-                val *= val;
-                sumI += val;
-                let valFreq = diagB[i] - diagB[j];
-                let insertIn = (0, binary_search_1.default)(frequencies, valFreq, (a, b) => a - b);
-                if (insertIn < 0) {
-                    frequencies.splice(-1 - insertIn, 0, valFreq);
-                    intensities.splice(-1 - insertIn, 0, val);
-                }
-                else {
-                    intensities[insertIn] += val;
-                }
-            });
-        }
-        const numFreq = frequencies.length;
-        if (numFreq > 0) {
-            weight /= sumI;
-            const diff = lineWidth / 64;
-            let valFreq = frequencies[0];
-            let inte = intensities[0];
-            let count = 1;
-            for (let i = 1; i < numFreq; i++) {
-                if (Math.abs(frequencies[i] - valFreq / count) < diff) {
-                    inte += intensities[i];
-                    valFreq += frequencies[i];
-                    count++;
-                }
-                else {
-                    spectrumGenerator.addPeak({
-                        x: -valFreq / count / frequencyMHz,
-                        y: inte * weight,
-                    });
-                    valFreq = frequencies[i];
-                    inte = intensities[i];
-                    count = 1;
-                }
-            }
-            spectrumGenerator.addPeak({
-                x: -valFreq / count / frequencyMHz,
-                y: inte * weight,
-            });
-        }
-    }
-    return spectrumGenerator.getSpectrum();
 }
 exports.default = simulate1D;
-function triuTimesAbs(A, val) {
-    A.forEachNonZero((i, j, v) => {
-        if (i > j)
-            return 0;
-        if (Math.abs(v) <= val)
-            return 0;
-        return v;
-    });
-}
-/**
- * Create a hamiltonian matrix for the given spinsystem
- * @param {Array} chemicalShifts - An array containing the chemical shift in Hz
- * @param {Array} couplingConstants - An array containing the coupling constants in Hz
- * @param {Array} multiplicity - An array specifiying the multiplicities of each scalar coupling
- * @param {Array} conMatrix - A one step connectivity matrix for the given spin system
- * @param {Array} cluster - An binary array specifiying the spins to be considered for this hamiltonial
- * @return {object}
- */
-function getHamiltonian(chemicalShifts, couplingConstants, multiplicity, conMatrix, cluster) {
-    let hamSize = 1;
-    for (const element of cluster) {
-        hamSize *= multiplicity[element];
-    }
-    const clusterHam = new ml_sparse_matrix_1.SparseMatrix(hamSize, hamSize);
-    for (let pos = 0; pos < cluster.length; pos++) {
-        let n = cluster[pos];
-        const L = (0, getPauliMatrix_1.default)(multiplicity[n]);
-        let A1, B1;
-        let temp = 1;
-        for (let i = 0; i < pos; i++) {
-            temp *= multiplicity[cluster[i]];
-        }
-        A1 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
-        temp = 1;
-        for (let i = pos + 1; i < cluster.length; i++) {
-            temp *= multiplicity[cluster[i]];
-        }
-        B1 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
-        const alpha = chemicalShifts[n];
-        const kronProd = A1.kroneckerProduct(L.z).kroneckerProduct(B1);
-        clusterHam.add(kronProd.mul(alpha));
-        for (let pos2 = 0; pos2 < cluster.length; pos2++) {
-            const k = cluster[pos2];
-            if (conMatrix.get(n, k) === 1) {
-                const S = (0, getPauliMatrix_1.default)(multiplicity[k]);
-                let A2, B2;
-                let temp = 1;
-                for (let i = 0; i < pos2; i++) {
-                    temp *= multiplicity[cluster[i]];
-                }
-                A2 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
-                temp = 1;
-                for (let i = pos2 + 1; i < cluster.length; i++) {
-                    temp *= multiplicity[cluster[i]];
-                }
-                B2 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
-                const kron1 = A1.kroneckerProduct(L.x)
-                    .kroneckerProduct(B1)
-                    .mmul(A2.kroneckerProduct(S.x).kroneckerProduct(B2));
-                kron1.add(A1.kroneckerProduct(L.y)
-                    .kroneckerProduct(B1)
-                    .mul(-1)
-                    .mmul(A2.kroneckerProduct(S.y).kroneckerProduct(B2)));
-                kron1.add(A1.kroneckerProduct(L.z)
-                    .kroneckerProduct(B1)
-                    .mmul(A2.kroneckerProduct(S.z).kroneckerProduct(B2)));
-                clusterHam.add(kron1.mul(couplingConstants.get(n, k) / 2));
-            }
-        }
-    }
-    return clusterHam;
-}
 //# sourceMappingURL=simulate1D.js.map

package/lib/signals/simulation/simulate1D.js.map

@@ -1 +1 @@
-{"version":3,"file":"simulate1D.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulate1D.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"simulate1D.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulate1D.ts"],"names":[],"mappings":";;AACA,2DAAsD;AAKtD,uDAAoD;AAEpD;;GAEG;AAEH,SAAwB,UAAU;AAChC;;GAEG;AACH,UAAsB,EACtB,UAA6B,EAAE;IAE/B,IAAI,EACF,SAAS,GAAG,CAAC,EACb,SAAS,EAAE,YAAY,GAAG,GAAG,EAC7B,IAAI,GAAG,CAAC,EACR,EAAE,GAAG,EAAE,EACP,QAAQ,GAAG,IAAI,EACf,KAAK,GAAG;QACN,IAAI,EAAE,UAAU;KACjB,GACF,GAAG,OAAO,CAAC;IAEZ,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY,CAAC;IAEzC,MAAM,OAAO,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAErD,OAAO,IAAA,qCAAgB,EAAC,OAAO,EAAE;QAC/B,SAAS,EAAE;YACT,IAAI;YACJ,EAAE;YACF,QAAQ;SACT;QACD,WAAW,EAAE;YACX,KAAK;YACL,KAAK,EAAE,SAAS;SACjB;KACF,CAAC,CAAC;AACL,CAAC;AAjCD,6BAiCC"}

package/lib/signals/simulation/simulateXYPeaks.d.ts

@@ -0,0 +1,47 @@
+import type { Shape1D } from 'ml-peak-shape-generator';
+import type { SpinSystem } from '../spinSystem';
+export interface Simulate1DOptions {
+    /**
+     * The linewidth of the output spectrum, expresed in Hz.
+     * @default 1
+     */
+    lineWidth?: number;
+    /**
+     * 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.
+     * @default 8
+     */
+    maxClusterSize?: number;
+    /**
+     * The frequency in Mhz of the fake spectrometer that records the spectrum.
+     * @default 400
+     */
+    frequency?: number;
+    /**
+     * The low limit of the ordinate variable.
+     * @default 0
+     */
+    from?: number;
+    /**
+     * The upper limit of the ordinate variable.
+     * @default 10
+     */
+    to?: number;
+    /**
+     * Number of points of the output spectrum.
+     * @default 16K
+     */
+    nbPoints?: number;
+    /**
+     * Shape options
+     * @default {kind:'gaussian'}
+     */
+    shape?: Shape1D;
+}
+export declare function simulateXYPeaks(
+/**
+ * The SpinSystem object to be simulated
+ */
+spinSystem: SpinSystem, options?: Simulate1DOptions): {
+    x: number;
+    y: number;
+}[];

package/lib/signals/simulation/simulateXYPeaks.js

@@ -0,0 +1,246 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simulateXYPeaks = void 0;
+const binary_search_1 = __importDefault(require("binary-search"));
+const ml_matrix_1 = require("ml-matrix");
+const ml_sparse_matrix_1 = require("ml-sparse-matrix");
+const getPauliMatrix_1 = __importDefault(require("./getPauliMatrix"));
+const smallValue = 1e-2;
+function simulateXYPeaks(
+/**
+ * The SpinSystem object to be simulated
+ */
+spinSystem, options = {}) {
+    let { lineWidth = 1, maxClusterSize = 8, frequency: frequencyMHz = 400, } = options;
+    const chemicalShifts = spinSystem.chemicalShifts.slice();
+    for (let i = 0; i < chemicalShifts.length; i++) {
+        chemicalShifts[i] = chemicalShifts[i] * frequencyMHz;
+    }
+    const multiplicity = spinSystem.multiplicity;
+    const xyPeaks = [];
+    for (const cluster of spinSystem.clusters) {
+        let clusterFake = cluster.map((cluster) => cluster < 0 ? -cluster - 1 : cluster);
+        let weight = 1;
+        let sumI = 0;
+        let frequencies = [];
+        let intensities = [];
+        if (cluster.length > maxClusterSize) {
+            // This is a single spin, but the cluster exceeds the maxClusterSize criteria
+            // we use the simple multiplicity algorithm
+            // Add the central peak. It will be split with every single J coupling.
+            let index = 0;
+            while (cluster[index++] < 0)
+                ;
+            index = cluster[index - 1];
+            frequencies.push(-chemicalShifts[index]);
+            for (let i = 0; i < cluster.length; i++) {
+                if (cluster[i] < 0) {
+                    let jc = spinSystem.couplingConstants.get(index, clusterFake[i]) / 2;
+                    let currentSize = frequencies.length;
+                    for (let j = 0; j < currentSize; j++) {
+                        frequencies.push(frequencies[j] + jc);
+                        frequencies[j] -= jc;
+                    }
+                }
+            }
+            frequencies.sort((a, b) => a - b);
+            sumI = frequencies.length;
+            weight = 1;
+            for (let i = 0; i < sumI; i++) {
+                intensities.push(1);
+            }
+        }
+        else {
+            const hamiltonian = getHamiltonian(chemicalShifts, spinSystem.couplingConstants, multiplicity, spinSystem.connectivity, clusterFake);
+            const hamSize = hamiltonian.rows;
+            // TODO: add support for sparse matrix in matrix types.
+            // @ts-expect-error sparse matrix not supported
+            const evd = new ml_matrix_1.EVD(hamiltonian);
+            const V = evd.eigenvectorMatrix;
+            const diagB = evd.realEigenvalues;
+            const assignmentMatrix = new ml_sparse_matrix_1.SparseMatrix(hamSize, hamSize);
+            const multLen = cluster.length;
+            weight = 0;
+            for (let n = 0; n < multLen; n++) {
+                const L = (0, getPauliMatrix_1.default)(multiplicity[clusterFake[n]]);
+                let temp = 1;
+                for (let j = 0; j < n; j++) {
+                    temp *= multiplicity[clusterFake[j]];
+                }
+                const A = ml_sparse_matrix_1.SparseMatrix.eye(temp);
+                temp = 1;
+                for (let j = n + 1; j < multLen; j++) {
+                    temp *= multiplicity[clusterFake[j]];
+                }
+                const B = ml_sparse_matrix_1.SparseMatrix.eye(temp);
+                const tempMat = A.kroneckerProduct(L.m).kroneckerProduct(B);
+                if (cluster[n] >= 0) {
+                    assignmentMatrix.add(tempMat.mul(cluster[n] + 1));
+                    weight++;
+                }
+                else {
+                    assignmentMatrix.add(tempMat.mul(cluster[n]));
+                }
+            }
+            let rhoip = ml_matrix_1.Matrix.zeros(hamSize, hamSize);
+            assignmentMatrix.forEachNonZero((i, j, v) => {
+                if (v > 0) {
+                    for (let k = 0; k < V.columns; k++) {
+                        let element = V.get(j, k);
+                        if (element !== 0) {
+                            rhoip.set(i, k, rhoip.get(i, k) + element);
+                        }
+                    }
+                }
+                return v;
+            });
+            let rhoip2 = rhoip.clone();
+            assignmentMatrix.forEachNonZero((i, j, v) => {
+                if (v < 0) {
+                    for (let k = 0; k < V.columns; k++) {
+                        let element = V.get(j, k);
+                        if (element !== 0) {
+                            rhoip2.set(i, k, rhoip2.get(i, k) + element);
+                        }
+                    }
+                }
+                return v;
+            });
+            const tV = V.transpose();
+            rhoip = tV.mmul(rhoip);
+            const sparseRhoip = new ml_sparse_matrix_1.SparseMatrix(rhoip.to2DArray(), {
+                threshold: smallValue,
+            });
+            triuTimesAbs(sparseRhoip, smallValue);
+            rhoip2 = tV.mmul(rhoip2);
+            const sparseRhoip2 = new ml_sparse_matrix_1.SparseMatrix(rhoip2.to2DArray(), {
+                threshold: smallValue,
+            });
+            sparseRhoip2.forEachNonZero((i, j, v) => {
+                return v;
+            });
+            triuTimesAbs(sparseRhoip2, smallValue);
+            sparseRhoip2.forEachNonZero((i, j, v) => {
+                let val = rhoip.get(i, j);
+                val = Math.min(Math.abs(val), Math.abs(v));
+                val *= val;
+                sumI += val;
+                let valFreq = diagB[i] - diagB[j];
+                let insertIn = (0, binary_search_1.default)(frequencies, valFreq, (a, b) => a - b);
+                if (insertIn < 0) {
+                    frequencies.splice(-1 - insertIn, 0, valFreq);
+                    intensities.splice(-1 - insertIn, 0, val);
+                }
+                else {
+                    intensities[insertIn] += val;
+                }
+            });
+        }
+        const numFreq = frequencies.length;
+        if (numFreq > 0) {
+            weight /= sumI;
+            const diff = lineWidth / 64;
+            let valFreq = frequencies[0];
+            let inte = intensities[0];
+            let count = 1;
+            for (let i = 1; i < numFreq; i++) {
+                if (Math.abs(frequencies[i] - valFreq / count) < diff) {
+                    inte += intensities[i];
+                    valFreq += frequencies[i];
+                    count++;
+                }
+                else {
+                    xyPeaks.push({
+                        x: -valFreq / count / frequencyMHz,
+                        y: inte * weight,
+                    });
+                    valFreq = frequencies[i];
+                    inte = intensities[i];
+                    count = 1;
+                }
+            }
+            xyPeaks.push({
+                x: -valFreq / count / frequencyMHz,
+                y: inte * weight,
+            });
+        }
+    }
+    return xyPeaks;
+}
+exports.simulateXYPeaks = simulateXYPeaks;
+function triuTimesAbs(A, val) {
+    A.forEachNonZero((i, j, v) => {
+        if (i > j)
+            return 0;
+        if (Math.abs(v) <= val)
+            return 0;
+        return v;
+    });
+}
+/**
+ * Create a hamiltonian matrix for the given spinsystem
+ * @param {Array} chemicalShifts - An array containing the chemical shift in Hz
+ * @param {Array} couplingConstants - An array containing the coupling constants in Hz
+ * @param {Array} multiplicity - An array specifiying the multiplicities of each scalar coupling
+ * @param {Array} conMatrix - A one step connectivity matrix for the given spin system
+ * @param {Array} cluster - An binary array specifiying the spins to be considered for this hamiltonial
+ * @return {object}
+ */
+function getHamiltonian(chemicalShifts, couplingConstants, multiplicity, conMatrix, cluster) {
+    let hamSize = 1;
+    for (const element of cluster) {
+        hamSize *= multiplicity[element];
+    }
+    const clusterHam = new ml_sparse_matrix_1.SparseMatrix(hamSize, hamSize);
+    for (let pos = 0; pos < cluster.length; pos++) {
+        let n = cluster[pos];
+        const L = (0, getPauliMatrix_1.default)(multiplicity[n]);
+        let A1, B1;
+        let temp = 1;
+        for (let i = 0; i < pos; i++) {
+            temp *= multiplicity[cluster[i]];
+        }
+        A1 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
+        temp = 1;
+        for (let i = pos + 1; i < cluster.length; i++) {
+            temp *= multiplicity[cluster[i]];
+        }
+        B1 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
+        const alpha = chemicalShifts[n];
+        const kronProd = A1.kroneckerProduct(L.z).kroneckerProduct(B1);
+        clusterHam.add(kronProd.mul(alpha));
+        for (let pos2 = 0; pos2 < cluster.length; pos2++) {
+            const k = cluster[pos2];
+            if (conMatrix.get(n, k) === 1) {
+                const S = (0, getPauliMatrix_1.default)(multiplicity[k]);
+                let A2, B2;
+                let temp = 1;
+                for (let i = 0; i < pos2; i++) {
+                    temp *= multiplicity[cluster[i]];
+                }
+                A2 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
+                temp = 1;
+                for (let i = pos2 + 1; i < cluster.length; i++) {
+                    temp *= multiplicity[cluster[i]];
+                }
+                B2 = ml_sparse_matrix_1.SparseMatrix.eye(temp);
+                const kron1 = A1.kroneckerProduct(L.x)
+                    .kroneckerProduct(B1)
+                    .mmul(A2.kroneckerProduct(S.x).kroneckerProduct(B2));
+                kron1.add(A1.kroneckerProduct(L.y)
+                    .kroneckerProduct(B1)
+                    .mul(-1)
+                    .mmul(A2.kroneckerProduct(S.y).kroneckerProduct(B2)));
+                kron1.add(A1.kroneckerProduct(L.z)
+                    .kroneckerProduct(B1)
+                    .mmul(A2.kroneckerProduct(S.z).kroneckerProduct(B2)));
+                clusterHam.add(kron1.mul(couplingConstants.get(n, k) / 2));
+            }
+        }
+    }
+    return clusterHam;
+}
+//# sourceMappingURL=simulateXYPeaks.js.map

package/lib/signals/simulation/simulateXYPeaks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simulateXYPeaks.js","sourceRoot":"","sources":["../../../src/signals/simulation/simulateXYPeaks.ts"],"names":[],"mappings":"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"}

package/lib/signals/simulation/splitSpinSystem.js

@@ -56,20 +56,18 @@ function splitCluster(cluster, clusterList, options) {
                 if (count <= maxClusterSize) {
                     clusterList.push(members);
                 }
+                else if (child.index < 0) {
+                    splitCluster(child, clusterList, {
+                        maxClusterSize,
+                        force: true,
+                        nSpins,
+                        connectivity,
+                    });
+                }
                 else {
-                    if (child.index < 0) {
-                        splitCluster(child, clusterList, {
-                            maxClusterSize,
-                            force: true,
-                            nSpins,
-                            connectivity,
-                        });
-                    }
-                    else {
-                        // We have to threat this spin alone and use the resurrection algorithm instead of the simulation
-                        members[child.index] = 2;
-                        clusterList.push(members);
-                    }
+                    // We have to threat this spin alone and use the resurrection algorithm instead of the simulation
+                    members[child.index] = 2;
+                    clusterList.push(members);
                 }
             }
             else {