Switch on ambiguities and piracies

src/Devices/DAQ/SimpleSimulatedDAQ.jl

@@ -128,7 +128,7 @@ function stopTx(daq::SimpleSimulatedDAQ)
   daq.txRunning = false
 end
 
-function setTxParams(daq::SimpleSimulatedDAQ, Γ; postpone=false)
+function setTxParams(daq::SimpleSimulatedDAQ, amplitudes::Dict{String, Vector{Union{Float32, Nothing}}}, phases::Dict{String, Vector{Union{Float32, Nothing}}}, awg::Union{Dict{String, Vector{Float32}}, Nothing} = nothing)
 # Needs to update period and frame
 end
 

src/Protocols/Storage/MDF.jl

@@ -304,7 +304,7 @@ function fillMDFAcquisition(mdf::MDFv2InMemory, scanner::MPIScanner, sequence::S
 	if hasTransferFunction(scanner)
 		numFreq = div(numSamplingPoints_,2)+1
 		freq = collect(0:(numFreq-1))./(numFreq-1).*ustrip(u"Hz", rxBandwidth(sequence))
-		tf_ =  TransferFunction(scanner)
+		tf_ =  getTransferFunction(scanner)
 		tf = tf_(freq,1:numRxChannels_)
 		MPIFiles.rxTransferFunction(mdf, tf)
 		MPIFiles.rxInductionFactor(mdf, tf_.inductionFactor)

src/Protocols/Storage/ProducerConsumer.jl

@@ -1,19 +1,20 @@
-SequenceMeasState(x, sequence::ControlSequence, sequenceBuffer::Nothing = nothing) = SequenceMeasState(x, sequence, StorageBuffer[])
-function SequenceMeasState(x, sequence::ControlSequence, sequenceBuffer::Vector{StorageBuffer})
-  numFrames = acqNumFrames(sequence.targetSequence)
-  numPeriods = acqNumPeriodsPerFrame(sequence.targetSequence)
-  # TODO function for length(keys(simpleChannel))
-  len = length(keys(sequence.simpleChannel))
-  buffer = DriveFieldBuffer(1, zeros(ComplexF64, len, len, numPeriods, numFrames), sequence)
-  avgFrames = acqNumFrameAverages(sequence.targetSequence)
-  if avgFrames > 1
-    samples = rxNumSamplesPerPeriod(sequence.targetSequence)
-    periods = acqNumPeriodsPerFrame(sequence.targetSequence)
-    buffer = AverageBuffer(buffer, samples, len, periods, avgFrames)
-  end
-  return SequenceMeasState(x, sequence.targetSequence, push!(sequenceBuffer, buffer))
-end
-SequenceMeasState(protocol::Protocol, x, sequenceBuffer::Union{Nothing, Vector{StorageBuffer}} = nothing) = SequenceMeasState(getDAQ(scanner(protocol)), x, sequenceBuffer)
+# TODO: I guess this is all obsolete. Only SequenceMeasState(daq, sequence) calls can be found in the protocol code
+# SequenceMeasState(x, sequence::ControlSequence, sequenceBuffer::Nothing = nothing) = SequenceMeasState(x, sequence, StorageBuffer[])
+# function SequenceMeasState(x, sequence::ControlSequence, sequenceBuffer::Vector{StorageBuffer})
+#   numFrames = acqNumFrames(sequence.targetSequence)
+#   numPeriods = acqNumPeriodsPerFrame(sequence.targetSequence)
+#   # TODO function for length(keys(simpleChannel))
+#   len = length(keys(sequence.simpleChannel))
+#   buffer = DriveFieldBuffer(1, zeros(ComplexF64, len, len, numPeriods, numFrames), sequence)
+#   avgFrames = acqNumFrameAverages(sequence.targetSequence)
+#   if avgFrames > 1
+#     samples = rxNumSamplesPerPeriod(sequence.targetSequence)
+#     periods = acqNumPeriodsPerFrame(sequence.targetSequence)
+#     buffer = AverageBuffer(buffer, samples, len, periods, avgFrames)
+#   end
+#   return SequenceMeasState(x, sequence.targetSequence, push!(sequenceBuffer, buffer))
+# end
+# SequenceMeasState(protocol::Protocol, x, sequenceBuffer::Union{Nothing, Vector{StorageBuffer}} = nothing) = SequenceMeasState(getDAQ(scanner(protocol)), x, sequenceBuffer)
 function SequenceMeasState(daq::RedPitayaDAQ, sequence::Sequence, sequenceBuffer::Union{Nothing, Vector{StorageBuffer}} = nothing)
   numFrames = acqNumFrames(sequence)
 

src/Scanner.jl

@@ -518,15 +518,15 @@ function getTransferFunctionList(scanner::MPIScanner)
   end
 end
 
-function MPIFiles.TransferFunction(configdir::AbstractString, name::AbstractString)
+function getTransferFunction(configdir::AbstractString, name::AbstractString)
   path = joinpath(configdir, "TransferFunctions", name*".h5")
   if !isfile(path)
     error("TransferFunction $(path) not available!")
   end
   return TransferFunction(path)
 end
 
-MPIFiles.TransferFunction(scanner::MPIScanner) = TransferFunction(configDir(scanner),transferFunction(scanner))
+getTransferFunction(scanner::MPIScanner) = getTransferFunction(configDir(scanner), transferFunction(scanner))
 
 #### Protocol ####
 function getProtocolList(scanner::MPIScanner)

src/Utils/Utils.jl

@@ -5,11 +5,6 @@ include("BidirectionalChannel.jl")
 include("ScannerCoordinates.jl")
 include("TracerDescription.jl")
 
-function Base.wait(::Nothing)
- @debug "Wait was called with `nothing`."
- # NOP
-end
-
 # I only add this here until https://github.com/JuliaLang/julia/pull/42272 is decided.
 Base.convert(::Type{IPAddr}, str::AbstractString) = parse(IPAddr, str)
 

test/runtests.jl

@@ -12,8 +12,7 @@ addConfigurationPath(testConfigDir)
 
 @testset "MPIMeasurements" begin
   @testset "Aqua" begin
-    @warn "Ambiguities and piracies are accepted for now"
-    Aqua.test_all(MPIMeasurements, ambiguities=false, piracies=false)
+    Aqua.test_all(MPIMeasurements)
   end
 
   include("TestDevices.jl")
@@ -31,4 +30,4 @@ addConfigurationPath(testConfigDir)
       include(joinpath(basePath, "test", "runtests.jl"))
     end
   end
-end
+end