Merge branch 'JuliaHealth:master' into 3D_recon

.buildkite/pipeline.yml

@@ -21,6 +21,7 @@ steps:
                 - "KomaMRIBase/Project.toml"
                 - "benchmarks/**/*"
                 - ".buildkite/**/*"
+                - ".github/workflows/Benchmark.yml"
                 - "Project.toml"
               config:
                 command: "buildkite-agent pipeline upload .buildkite/runbenchmarks.yml"

.github/workflows/Benchmark.yml

@@ -32,7 +32,7 @@ on:
 
 jobs:
   benchmark:
-    if: "!contains(github.event.head_commit.message, '[skip benchmarks]')"
+    if: ${{ !contains(github.event.head_commit.message, '[skip benchmarks]') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
           tool: 'julia'
           output-file-path: ${{ steps.locate.outputs.path }}
           benchmark-data-dir-path: "benchmarks"
-          summary-always: true
+          summary-always: true # I think this doesn't work on PRs
           github-token: ${{ secrets.GITHUB_TOKEN }}
           comment-always: true
           alert-threshold: "150%"

KomaMRIBase/Project.toml

@@ -1,7 +1,7 @@
 name = "KomaMRIBase"
 uuid = "d0bc0b20-b151-4d03-b2a4-6ca51751cb9c"
 authors = ["Carlos Castillo Passi <[email protected]>"]
-version = "0.9.0"
+version = "0.9.0-DEV"
 
 [deps]
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"

KomaMRIBase/src/datatypes/Sequence.jl

@@ -314,23 +314,23 @@ function get_samples(seq::Sequence, range; events=[:rf, :gr, :adc], freq_in_phas
     fill_if_empty(x) = isempty(x.t) && length(range) == length(seq) ? merge(x, (t=[0.0; dur(seq)], A=zeros(eltype(x.A), 2))) : x
     # RF
     if :rf in events
-        t_rf = reduce(vcat, T0[i] .+ times(seq.RF[1,i], :A)   for i in range)
-        t_Δf = reduce(vcat, T0[i] .+ times(seq.RF[1,i], :Δf)  for i in range)
-        A_rf = reduce(vcat, ampls(seq.RF[1,i]; freq_in_phase) for i in range)
-        A_Δf = reduce(vcat, freqs(seq.RF[1,i])                for i in range)
+        t_rf = reduce(vcat, [T0[i] .+ times(seq.RF[1,i], :A)   for i in range])
+        t_Δf = reduce(vcat, [T0[i] .+ times(seq.RF[1,i], :Δf)  for i in range])
+        A_rf = reduce(vcat, [ampls(seq.RF[1,i]; freq_in_phase) for i in range])
+        A_Δf = reduce(vcat, [freqs(seq.RF[1,i])                for i in range])
         rf_samples = (
             rf  = fill_if_empty((t = t_rf, A = A_rf)),
             Δf  = fill_if_empty((t = t_Δf, A = A_Δf))
             )
     end
     # Gradients
     if :gr in events
-        t_gx = reduce(vcat, T0[i] .+ times(seq.GR[1,i]) for i in range)
-        t_gy = reduce(vcat, T0[i] .+ times(seq.GR[2,i]) for i in range)
-        t_gz = reduce(vcat, T0[i] .+ times(seq.GR[3,i]) for i in range)
-        A_gx = reduce(vcat, ampls(seq.GR[1,i]) for i in range)
-        A_gy = reduce(vcat, ampls(seq.GR[2,i]) for i in range)
-        A_gz = reduce(vcat, ampls(seq.GR[3,i]) for i in range)
+        t_gx = reduce(vcat, [T0[i] .+ times(seq.GR[1,i]) for i in range])
+        t_gy = reduce(vcat, [T0[i] .+ times(seq.GR[2,i]) for i in range])
+        t_gz = reduce(vcat, [T0[i] .+ times(seq.GR[3,i]) for i in range])
+        A_gx = reduce(vcat, [ampls(seq.GR[1,i]) for i in range])
+        A_gy = reduce(vcat, [ampls(seq.GR[2,i]) for i in range])
+        A_gz = reduce(vcat, [ampls(seq.GR[3,i]) for i in range])
         gr_samples = (
                 gx  = fill_if_empty((t = t_gx, A = A_gx)),
                 gy  = fill_if_empty((t = t_gy, A = A_gy)),
@@ -339,8 +339,8 @@ function get_samples(seq::Sequence, range; events=[:rf, :gr, :adc], freq_in_phas
     end
     # ADC
     if :adc in events
-        t_aq = reduce(vcat, T0[i] .+ times(seq.ADC[i]) for i in range)
-        A_aq = reduce(vcat, ampls(seq.ADC[i]) for i in range)
+        t_aq = reduce(vcat, [T0[i] .+ times(seq.ADC[i]) for i in range])
+        A_aq = reduce(vcat, [ampls(seq.ADC[i]) for i in range])
         adc_samples = (
                 adc = fill_if_empty((t = t_aq, A = A_aq)),
                 )

KomaMRICore/Project.toml

@@ -1,7 +1,7 @@
 name = "KomaMRICore"
 uuid = "4baa4f4d-2ae9-40db-8331-a7d1080e3f4e"
 authors = ["Carlos Castillo Passi <[email protected]>"]
-version = "0.9.0"
+version = "0.9.0-DEV"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

KomaMRIFiles/Project.toml

@@ -1,7 +1,7 @@
 name = "KomaMRIFiles"
 uuid = "fcf631a6-1c7e-4e88-9e64-b8888386d9dc"
 authors = ["Carlos Castillo Passi <[email protected]>"]
-version = "0.9.0"
+version = "0.9.0-DEV"
 
 [deps]
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"

KomaMRIPlots/Project.toml

@@ -1,7 +1,7 @@
 name = "KomaMRIPlots"
 uuid = "76db0263-63f3-4d26-bb9a-5dba378db904"
 authors = ["Carlos Castillo Passi <[email protected]>"]
-version = "0.9.0"
+version = "0.9.0-DEV"
 
 [deps]
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"

Project.toml

@@ -1,6 +1,6 @@
 name = "KomaMRI"
 uuid = "6a340f8b-2cdf-4c04-99be-4953d9b66d0a"
-version = "0.9.0"
+version = "0.9.0-DEV"
 authors = ["Carlos Castillo Passi <[email protected]>"]
 
 [deps]