seqeyes-python 0.3.14__tar.gz → 0.3.15__tar.gz

{seqeyes_python-0.3.14 → seqeyes_python-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: seqeyes-python
-Version: 0.3.14
+Version: 0.3.15
 Summary: Interactive Pulseq MRI sequence viewer for Jupyter — lightweight, beautiful, replaces seq.plot() in pypulseq.
 Project-URL: Homepage, https://github.com/bughht/seqeyes_plugin
 Project-URL: Repository, https://github.com/bughht/seqeyes_plugin

{seqeyes_python-0.3.14 → seqeyes_python-0.3.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "seqeyes-python"
-version = "0.3.14"
+version = "0.3.15"
 description = "Interactive Pulseq MRI sequence viewer for Jupyter — lightweight, beautiful, replaces seq.plot() in pypulseq."
 readme = "README.md"
 license = {text = "MIT"}

{seqeyes_python-0.3.14 → seqeyes_python-0.3.15}/src/seqeyes/__init__.py

@@ -29,4 +29,4 @@ from seqeyes._plot import set, reset
 from seqeyes._renderer import SeqEyesViewer
 
 __all__ = ["set", "reset", "SeqEyesViewer"]
-__version__ = "0.3.14"
+__version__ = "0.3.15"

{seqeyes_python-0.3.14 → seqeyes_python-0.3.15}/src/seqeyes/resources/pulseq-bundle.js

@@ -90,7 +90,7 @@ var Pulseq = (() => {
   });
 
   // package.json
-  var version = "0.3.14";
+  var version = "0.3.15";
 
   // src/pulseq/decompressor.ts
   function decompressShape(compressed, numSamples) {
@@ -2327,9 +2327,13 @@ var Pulseq = (() => {
     };
   }
   function estimateKspacePeakMemoryBytes(estimate) {
-    const gridBytes = Math.max(0, estimate.gridCandidatePoints) * 11;
+    const gridBytes = Math.max(0, estimate.gridCandidatePoints) * 1;
     const adcAndTransferBytes = Math.max(0, estimate.adcSamples) * 43;
-    return Math.ceil(Math.min(Number.MAX_SAFE_INTEGER, (gridBytes + adcAndTransferBytes) * 1.25));
+    const fixedOverheadBytes = 2 * 1024 * 1024;
+    return Math.ceil(Math.min(
+      Number.MAX_SAFE_INTEGER,
+      (gridBytes + adcAndTransferBytes) * 1.25 + fixedOverheadBytes
+    ));
   }
   function kspaceExceedsInteractiveBudget(estimate) {
     return estimate.rasterSamples > INTERACTIVE_COMPUTE_LIMITS.kspaceRasterSamples || estimate.adcSamples > INTERACTIVE_COMPUTE_LIMITS.kspaceAdcSamples || estimate.gridCandidatePoints > INTERACTIVE_COMPUTE_LIMITS.kspaceGridCandidates || estimateKspacePeakMemoryBytes(estimate) >= KSPACE_CONFIRMATION_MEMORY_BYTES;
@@ -3106,7 +3110,6 @@ var Pulseq = (() => {
     let candBound = 2;
     for (const series of gradientSeries) candBound += countSeriesSupport(series, gradientSupport);
     candBound += excT.length * 3 + refT.length * 2 + adcT.length;
-    if (totalDuration > 0) candBound += Math.max(1, Math.round(totalDuration / GR)) + 1;
     const cand = new Float64Array(candBound);
     let candCount = 0;
     let candOverflow = false;
@@ -3131,10 +3134,6 @@ var Pulseq = (() => {
     for (const t of adcT) pushC(t);
     pushC(0);
     pushC(totalDuration);
-    if (totalDuration > 0) {
-      const nS = Math.max(1, Math.round(totalDuration / GR));
-      for (let i = 0; i <= nS; i++) pushC(i * GR);
-    }
     if (candOverflow) return null;
     if (candCount === 0) return null;
     cand.subarray(0, candCount).sort();
@@ -3142,25 +3141,78 @@ var Pulseq = (() => {
     for (let i = 0; i < candCount; i++) {
       if (i === 0 || cand[i] - cand[i - 1] > tacc * 0.5) cand[kept++] = cand[i];
     }
-    const N = kept;
-    if (N < 2) return null;
-    if (_options?.maxGridPoints && N > _options.maxGridPoints) return null;
-    const grid = cand.subarray(0, N);
+    const storedCount = kept;
+    const rasterSteps = totalDuration > 0 ? Math.max(1, Math.round(totalDuration / GR)) : -1;
+    const rasterAt = (i) => Math.max(0, tacc * Math.round(i * GR / tacc));
+    const makeGridWalk = () => {
+      let storedIndex = 0;
+      let rasterIndex = 0;
+      let previous = 0;
+      let started = false;
+      return () => {
+        for (; ; ) {
+          const haveStored = storedIndex < storedCount;
+          const haveRaster = rasterIndex <= rasterSteps;
+          if (!haveStored && !haveRaster) return NaN;
+          let value;
+          if (!haveRaster) {
+            value = cand[storedIndex++];
+          } else if (!haveStored) {
+            value = rasterAt(rasterIndex++);
+          } else {
+            const stored = cand[storedIndex];
+            const raster = rasterAt(rasterIndex);
+            if (stored <= raster) {
+              value = stored;
+              storedIndex++;
+              if (stored === raster) rasterIndex++;
+            } else {
+              value = raster;
+              rasterIndex++;
+            }
+          }
+          if (!started || value !== previous) {
+            previous = value;
+            started = true;
+            return value;
+          }
+        }
+      };
+    };
+    const excSorted = Float64Array.from(excT);
+    excSorted.sort();
+    const refSorted = Float64Array.from(refT);
+    refSorted.sort();
     const eIdx = [], rIdx = [];
-    for (const t of excT) {
-      const i = timeIdx(t, grid);
-      if (i >= 0) eIdx.push(i);
+    let excSeen = 0, refSeen = 0;
+    let N = 0;
+    {
+      const nextGridTime2 = makeGridWalk();
+      for (; ; ) {
+        const t = nextGridTime2();
+        if (Number.isNaN(t)) break;
+        while (excSeen < excSorted.length && t >= excSorted[excSeen] - 1e-12) {
+          eIdx.push(N);
+          excSeen++;
+        }
+        while (refSeen < refSorted.length && t >= refSorted[refSeen] - 1e-12) {
+          rIdx.push(N);
+          refSeen++;
+        }
+        N++;
+      }
     }
-    for (const t of refT) {
-      const i = timeIdx(t, grid);
-      if (i >= 0) rIdx.push(i);
-    }
-    eIdx.sort((a2, b) => a2 - b);
-    rIdx.sort((a2, b) => a2 - b);
-    const excitationAt = new Uint8Array(N);
-    const refocusingAt = new Uint8Array(N);
-    for (const i of eIdx) excitationAt[i] = 1;
-    for (const i of rIdx) refocusingAt[i] = 1;
+    if (N < 2) return null;
+    if (_options?.maxGridPoints && N > _options.maxGridPoints) return null;
+    let excCursor = 0, refCursor = 0;
+    const excitationAtIndex = (i) => {
+      while (excCursor < eIdx.length && eIdx[excCursor] < i) excCursor++;
+      return excCursor < eIdx.length && eIdx[excCursor] === i;
+    };
+    const refocusingAtIndex = (i) => {
+      while (refCursor < rIdx.length && rIdx[refCursor] < i) refCursor++;
+      return refCursor < rIdx.length && rIdx[refCursor] === i;
+    };
     const outCount = _options?.maxTrajectoryPoints && _options.maxTrajectoryPoints > 0 ? Math.min(_options.maxTrajectoryPoints, N) : N;
     const outStep = N / outCount;
     const outX = new Float64Array(outCount), outY = new Float64Array(outCount), outZ = new Float64Array(outCount);
@@ -3177,10 +3229,12 @@ var Pulseq = (() => {
     let out = 0;
     let nextKeep = 0;
     let ec = 0;
-    let gxPrev = sampleSeries(gradientSeries[0], grid[0], cursors, 0);
-    let gyPrev = sampleSeries(gradientSeries[1], grid[0], cursors, 1);
-    let gzPrev = sampleSeries(gradientSeries[2], grid[0], cursors, 2);
-    if (refocusingAt[0] && !excitationAt[0]) {
+    const nextGridTime = makeGridWalk();
+    let tPrev = nextGridTime();
+    let gxPrev = sampleSeries(gradientSeries[0], tPrev, cursors, 0);
+    let gyPrev = sampleSeries(gradientSeries[1], tPrev, cursors, 1);
+    let gzPrev = sampleSeries(gradientSeries[2], tPrev, cursors, 2);
+    if (refocusingAtIndex(0) && !excitationAtIndex(0)) {
       lx = -lx;
       ly = -ly;
       lz = -lz;
@@ -3188,24 +3242,24 @@ var Pulseq = (() => {
     if (nextKeep === 0) {
       while (ec < eIdx.length && eIdx[ec] < 1) ec++;
       const brk = ec < eIdx.length && eIdx[ec] === 1;
-      outT[0] = grid[0];
+      outT[0] = tPrev;
       outX[0] = brk ? NaN : lx;
       outY[0] = brk ? NaN : ly;
       outZ[0] = brk ? NaN : lz;
       out = 1;
       nextKeep = out < outCount ? Math.floor(out * outStep) : -1;
     }
-    while (a < nA && adcT[a] <= grid[0]) {
+    while (a < nA && adcT[a] <= tPrev) {
       kxA[a] = lx;
       kyA[a] = ly;
       kzA[a] = lz;
       a++;
     }
     for (let i = 1; i < N; i++) {
-      const gxi = sampleSeries(gradientSeries[0], grid[i], cursors, 0);
-      const gyi = sampleSeries(gradientSeries[1], grid[i], cursors, 1);
-      const gzi = sampleSeries(gradientSeries[2], grid[i], cursors, 2);
-      const tPrev = grid[i - 1], tCur = grid[i];
+      const tCur = nextGridTime();
+      const gxi = sampleSeries(gradientSeries[0], tCur, cursors, 0);
+      const gyi = sampleSeries(gradientSeries[1], tCur, cursors, 1);
+      const gzi = sampleSeries(gradientSeries[2], tCur, cursors, 2);
       const dt = tCur - tPrev;
       const px = lx, py = ly, pz = lz;
       if (dt > 0) {
@@ -3220,14 +3274,14 @@ var Pulseq = (() => {
         lx = nx;
         ly = ny;
         lz = nz;
-        if (excitationAt[i]) {
+        if (excitationAtIndex(i)) {
           lx = 0;
           ly = 0;
           lz = 0;
           cx = 0;
           cy = 0;
           cz = 0;
-        } else if (refocusingAt[i]) {
+        } else if (refocusingAtIndex(i)) {
           lx = -lx;
           ly = -ly;
           lz = -lz;
@@ -3262,6 +3316,7 @@ var Pulseq = (() => {
       gxPrev = gxi;
       gyPrev = gyi;
       gzPrev = gzi;
+      tPrev = tCur;
     }
     while (a < nA) {
       kxA[a] = lx;
@@ -3290,6 +3345,17 @@ var Pulseq = (() => {
     }
     for (const time of series.requiredSupport) push(time);
   }
+  function freezeSeries(series) {
+    const frozen = {
+      times: Float64Array.from(series.times),
+      values: Float64Array.from(series.values),
+      requiredSupport: Float64Array.from(series.requiredSupport)
+    };
+    series.times.length = 0;
+    series.values.length = 0;
+    series.requiredSupport.length = 0;
+    return frozen;
+  }
   function buildGlobalGradientSeries(blocks, gradientRaster, totalDuration) {
     const output = [
       { times: [], values: [], requiredSupport: [] },
@@ -3317,7 +3383,7 @@ var Pulseq = (() => {
         series.requiredSupport.push(last + POLYNOMIAL_SUPPORT_EPSILON_SEC, totalDuration + POLYNOMIAL_SUPPORT_EPSILON_SEC);
       }
     }
-    return output;
+    return [freezeSeries(output[0]), freezeSeries(output[1]), freezeSeries(output[2])];
   }
   function appendGradientPiece(target, piece, gradientRaster) {
     if (!piece.times.length) return;
@@ -3371,15 +3437,6 @@ var Pulseq = (() => {
     if (time >= t1) return v1;
     return v0 + (v1 - v0) * (time - t0) / (t1 - t0);
   }
-  function timeIdx(t, g) {
-    let lo = 0, hi = g.length;
-    while (lo < hi) {
-      const m = lo + hi >> 1;
-      if (g[m] < t - 1e-12) lo = m + 1;
-      else hi = m;
-    }
-    return lo < g.length ? lo : -1;
-  }
 
   // src/editor/kspaceTransport.ts
   var MAX_KSPACE_OVERVIEW_POINTS = 3e4;