Remove special treatment of DC in tfCorrection + fix load_TF_fromVNA

src/MDF.jl

@@ -252,17 +252,9 @@ function rxTransferFunction(f::MDFFile)
     return nothing
   end
 end
-function rxTransferFunctionFileName(f::MDFFile)
-  parameter = "/acquisition/receiver/transferFunctionFileName"
-  if haskey(f.file, parameter)
-    return f[parameter]
-  else
-    return nothing
-  end
-end
-function rxHasTransferFunction(f::MDFFile)
-  haskey(f.file, "/acquisition/receiver/transferFunction")
-end
+rxTransferFunctionFileName(f::MDFFile) = @keyoptional f["/acquisition/receiver/transferFunctionFileName"]
+rxHasTransferFunction(f::MDFFile) = haskey(f.file, "/acquisition/receiver/transferFunction")
+
 rxInductionFactor(f::MDFFileV1) = nothing
 rxInductionFactor(f::MDFFileV2) = @keyoptional f["/acquisition/receiver/inductionFactor"]
 

src/Measurements.jl

@@ -278,11 +278,8 @@ function getMeasurements(f::MPIFile, neglectBGFrames=true;
 
     J = size(data,1)
     dataF = rfft(data, 1)
-    dataF[2:end,:,:,:] ./= tf[2:end,:,:,:]
-
-    if all(tf[1,:,:,:] .!= 0) && !any(isnan.(tf[1,:,:,:]))
-      dataF[1,:,:,:] ./= tf[1,:,:,:]
-    end
+    dataF ./= tf
+    dataF[isnan.(dataF)] .= zero(eltype(dataF))
 
     @warn "This measurement has been corrected with a Transfer Function. Name of TF: $(rxTransferFunctionFileName(f))"
     if !isnothing(inductionFactor)
@@ -335,11 +332,7 @@ function getMeasurementsFD(f::MPIFile, args...;
       inductionFactor = ones(Float64, rxNumChannels(f))
     end
 
-    data[2:end,:,:,:] ./= tf[2:end,:,:,:]
-
-    if all(tf[1,:,:,:] .!= 0) && !any(isnan.(tf[1,:,:,:]))
-      data[1,:,:,:] ./= tf[1,:,:,:]
-    end
+    data ./= tf
 
     @warn "This measurement has been corrected with a Transfer Function. Name of TF: $(rxTransferFunctionFileName(f))"
     if !isnothing(inductionFactor)

src/TransferFunction.jl

@@ -290,9 +290,9 @@
   return
 end
 
+setTF(f::MDFFile, filenameTF::AbstractString) = setTF(f, TransferFunction(filenameTF), filenameTF)
 
-function setTF(f::MDFFile, filenameTF::AbstractString)
-  tmf = TransferFunction(filenameTF)
+function setTF(f::MDFFile, tmf::TransferFunction, filenameTF::Union{AbstractString,Nothing}=nothing)
   tf = sampleTF(tmf, f)
 
   # We need to close the HDF5 file handle before we can write to it
@@ -302,7 +302,9 @@
 	  if haskey(file, "/acquisition/receiver/transferFunctionFileName")
       delete_object(file, "/acquisition/receiver/transferFunctionFileName")
     end
-    write(file, "/acquisition/receiver/transferFunctionFileName", filenameTF)
+    if !isnothing(filenameTF)
+      write(file, "/acquisition/receiver/transferFunctionFileName", filenameTF)
+    end
     if haskey(file, "/acquisition/receiver/transferFunction")
       delete_object(file, "/acquisition/receiver/transferFunction")
     end
@@ -312,6 +314,8 @@
     end
     write(file, "/acquisition/receiver/inductionFactor", tmf.inductionFactor)
   end
+  # reopen filehandler so f stays usable
+  f.file = h5open(filepath(f), "r")
   return
 end