Skip to content

Fix for large PSF Data #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for large PSF Data #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/deserialize_sweep.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,22 @@ function deserialize(r::DataReader, value::SweepValueWindowed, totaln::Int, wind
end

i = 0
testtype = 16
while i < totaln
deserialize_chunk(r, SweepValueWindowed)
if i == 0
testtype = ntoh(read(r.io, UInt32))
end
if(testtype == 16 && i != 0)
read(r,UInt32)
elseif(testtype == 20)
deserialize(r,ZeroPad)
read(r, Int32)

end

#Read number of points in this window (n)
tmp = read(r, Int32)
tmp = read(r, UInt32)

windowleft = tmp>>16 #Is this the rest of the number? Does it have another meaning?
n = tmp & 0xFFFF #Number of data points in window (lower 32 bits)

Expand All @@ -184,11 +195,13 @@ function deserialize(r::DataReader, value::SweepValueWindowed, totaln::Int, wind
VT = psfdata_type(paramtype, r.types)

#x-value vector?
deserialize_data(r, value.paramvalues, pwinstart .+ (1:n), VT)
testtype = deserialize_data(r, value.paramvalues, pwinstart .+ (1:n), VT)


startpos = position(r.io) #Save start of trace values pointer in buffer (const char *valuebuf)
valuesection = r.sweepvalues


for j in 1:length(filter) #Also length of vectorlist
typeref = filter[j]::DataTypeRef #Validate type
VT = psfdata_type(typeref, r.types)
Expand All @@ -197,9 +210,11 @@ function deserialize(r::DataReader, value::SweepValueWindowed, totaln::Int, wind
vec = value.vectorlist[j]

deserialize_data(r, vec, i .+ (1:n), VT)
end

end
#Advance buffer pointer to end of trace values
test = seek(r.io, startpos + ntraces * windowsize)
testtype = ntoh(read(r.io, UInt32))
seek(r.io, startpos + ntraces * windowsize)
i += n
end
Expand Down