Add resolution and nsamples variables

src/readouts/ADCs.jl

 module ADCs
 import JuMP: @constraint
-import ...Variables: variables, dwell_time, duration, effective_time, get_free_variable, VariableType, nsamples, resolution
+import ...Variables: variables, dwell_time, duration, effective_time, get_free_variable, VariableType, nsamples, resolution, oversample
 import ...BuildingBlocks: BuildingBlock, apply_simple_constraint!, set_simple_constraints!, fixed
 import ...BuildSequences: global_model
 
@@ -19,9 +19,10 @@ Adds a readout event with `nsamples` readouts.
 - `time_to_center`: time till the center of k-space.
 """
 struct ADC <: BuildingBlock
-    nsamples :: VariableType
+    resolution :: VariableType
     dwell_time :: VariableType
     time_to_center :: VariableType
+    oversample :: VariableType
 end
 
 function ADC(; nsamples=nothing, dwell_time=nothing, time_to_center=nothing, center_halfway=true, kwargs...)
@@ -41,14 +42,15 @@ function ADC(; nsamples=nothing, dwell_time=nothing, time_to_center=nothing, cen
     return res
 end
 
-nsamples(adc::ADC) = adc.nsamples
+oversample(adc::ADC) = adc.oversample
+nsamples(adc::ADC) = resolution(adc) * oversample(adc)
 dwell_time(adc::ADC) = adc.dwell_time
 duration(adc::ADC) = nsamples(adc) * dwell_time(adc)
 time_to_center(adc::ADC) = adc.time_to_center
 effective_time(adc::ADC) = time_to_center(adc)
-resolution(adc::ADC) = adc.nsamples
+resolution(adc::ADC) = adc.resolution
 
-variables(::Type{<:ADC}) = [nsamples, dwell_time, duration, time_to_center, resolution]
+variables(::Type{<:ADC}) = [nsamples, dwell_time, duration, time_to_center, resolution, oversample]
 
 function fixed(adc::ADC)
     # round nsamples during fixing

src/variables.jl

@@ -36,10 +36,11 @@ all_variables_symbols = [
     ],
     :readout => [
         :dwell_time => "Time between two samples in an `ADC` in ms.",
-        :nsamples => "Number of samples during a readout. During the optimisation this might produce non-integer values (also see [`resolution`](@ref)).",
+        :nsamples => "Number of samples during a readout. During the optimisation this might produce non-integer values.",
         :fov => "Size of the field of view in mm.",
         :voxel_size => "Size of each voxel in mm.",
-        :resolution => "Number of voxels in the final readout (also see [`nsamples`](@ref)).",
+        :resolution => "Number of voxels in the final readout. During the optimisation this might produce non-integer values, but this will be fixed after optimsation.",
+        :oversample => "How much to oversample with ([`nsamples`](@ref) / [`resolution`](@ref))",
     ]
 ]