Skip to content

J
juobs
Commit f2252849 authored by ale's avatar ale
Browse files
Options

rwf clean try, change flag_s

parent 2015cdb7
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 66 deletions
constants/juobs_const.jl
View file @ f2252849
...@@ -139,3 +139,10 @@ const db_c = Dict( ...@@ -139,3 +139,10 @@ const db_c = Dict(
"E300" => ["ts001_chunk2"],#, "ts001_chunk1"] "E300" => ["ts001_chunk2"],#, "ts001_chunk1"]
"D450" => ["ts001_1", "ts001_2"] "D450" => ["ts001_1", "ts001_2"]
) )
const flag_s = Dict(
"J303r003" => [324,325,326],
"H105r001" => [100,105,106],
"H105r002" => [1],
"H105r005" => [254, 255, 256, 257, 259, 260, 261, 264, 265, 266, 269, 280, 282, 283, 284, 285, 286, 287, 288, 289, 291, 299, 301, 313, 314, 315, 316, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342]
)
\ No newline at end of file
src/juobs_tools.jl
View file @ f2252849
#TODO: apply_rw with gaps function apply_rw(data::Array{Float64}, W::Matrix{Float64}, vcfg::Union{Nothing, Vector{Int32}}=nothing, id::Union{String, Nothing}=nothing, fs::Bool=false)
function apply_rw(data::Array{Float64}, W::Matrix{Float64}, id::Union{String, Nothing}=nothing; vcfg::Union{Nothing, Vector{Int32}}=nothing) nc = size(W,2)
nc = isnothing(vcfg) ? collect(1:size(data, 1)) : vcfg if isnothing(vcfg)
W1 = W[1, nc] vcfg = collect(1:nc)
W2 = W[2, nc]
if id == "J303" || id == "J303r003"
W_J303 = [1 for i in 1:length(data)]
W_J303[324] = W_J303[325] = W_J303[326] = -1
data_r = data .* W1 .* W2 .* W_J303
return (data_r, W1 .* W2 .* W_J303)
elseif id == "H105r005"
flagged_cfg = [254, 255, 256, 257, 259, 260, 261, 264, 265, 266, 269, 280, 282, 283, 284, 285, 286, 287, 288, 289, 291, 299, 301, 313, 314, 315, 316, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342]
W_H105r005 = [1 for i in 1:length(data)]
for i in flagged_cfg
W_H105r005[i] = -1
end end
data_r = data .* W1 .* W2 .* W_H105r005
return (data_r, W1 .* W2 .* W_H105r005) rw1 = W[1, 1:nc]
rw2 = W[2, 1:nc]
if fs == false
rw = rw1 .* rw2
data_r = data .* rw[vcfg]
return (data_r, rw)
else else
data_r = data .* W1 .* W2 rw_s = [1.0 for i in 1:nc]
return (data_r, W1 .* W2) rw_s[flag_s[id]] .= -1.0
rw = rw1 .* rw2 .* rw_s
data_r = data .* rw[vcfg]
return (data_r, rw)
end end
end end
function apply_rw(data::Vector{<:Array{Float64}}, W::Vector{Matrix{Float64}}, id::Union{String, Nothing}=nothing) function apply_rw(data::Vector{<:Array{Float64}}, W::Vector{Matrix{Float64}}, vcfg::Union{Nothing, Vector{Int32}}=nothing, id::Union{String, Nothing}=nothing, fs::Bool=false)
if length(W) != length(data) nc = size.(W, 2)
error("Lenghts must match") if isnothing(vcfg)
vcfg = [collect(1:nc[k]) for k=1:length(nc)]
end end
nc = size.(data, 1)
if id == "J303" || id == "J303r003"
W_J303 = [1 for i in 1:nc[1]]
W_J303[324] = W_J303[325] = W_J303[326] = -1
rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)] rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)]
rw2 = [W[k][2, 1:nc[k]] for k=1:length(W)] rw2 = [W[k][2, 1:nc[k]] for k=1:length(W)]
rw3 = [W_J303]
rw = [rw1[k] .* rw2[k] .* rw3[k] for k=1:length(W)] if fs == false
data_r = [data[k] .* rw[k] for k=1:length(data)] rw = [rw1[k] .* rw2[k] for k =1:length(W)]
data_r = [data[k] .* rw[k][vcfg[k]] for k=1:length(data)]
return (data_r, rw) return (data_r, rw)
else
rw_s = [[1.0 for i in 1:nc[k]] for k=1:length(W)]
if id == "H105"
rw_s[1][flag_s["H105r001"]] .= -1.0
rw_s[2][flag_s["H105r002"]] .= -1.0
elseif id == "H105r005" elseif id == "H105r005"
flagged_cfg = [254, 255, 256, 257, 259, 260, 261, 264, 265, 266, 269, 280, 282, 283, 284, 285, 286, 287, 288, 289, 291, 299, 301, 313, 314, 315, 316, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342] rw_s[1][flag_s["H105r005"]] .= -1.0
W_H105r005 = [1 for i in 1:nc[1]] elseif id == "J303" || "J303r003"
for i in flagged_cfg rw_s[1][flag_s["J303r003"]] .= -1.0
W_H105r005[i] = -1
end end
rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)] rw = [rw1[k] .* rw2[k] .* rw_s[k] for k =1:length(W)]
rw2 = [W[k][2, 1:nc[k]] for k=1:length(W)] data_r = [data[k] .* rw[k][vcfg[k]] for k=1:length(data)]
rw3 = [W_H105r005]
rw = [rw1[k] .* rw2[k] .* rw3[k] for k=1:length(W)]
data_r = [data[k] .* rw[k] for k=1:length(data)]
return (data_r, rw) return (data_r, rw)
elseif id == "H105r001" || id == "H105" end
W_H105r001 = [1 for i in 1:nc[1]] end
W_H105r001[100] = W_H105r001[105] = W_H105r001[106] = -1
W_H105r002 = [1 for i in 1:nc[2]]
W_H105r002[1] = -1
rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)]
rw2 = [W[k][2, 1:nc[k]] for k=1:length(W)]
rw3 = [W_H105r001, W_H105r002]
rw = [rw1[k] .* rw2[k] .* rw3[k] for k=1:length(W)] function apply_rw(data::Array{Float64}, W::Matrix{Float64}, vcfg::Union{Nothing, Vector{Int32}}=nothing, id::String="A653", fs::Bool=false)
data_r = [data[k] .* rw[k] for k=1:length(data)] nc = size(W,2)
return (data_r, rw) if isnothing(vcfg)
else vcfg = collect(1:nc)
rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)] end
rw2 = [W[k][2, 1:nc[k]] for k=1:length(W)]
rw = [rw1[k] .* rw2[k] for k=1:length(W)] rw1 = W[1, 1:nc]
data_r = [data[k] .* rw[k] for k=1:length(data)]
rw = rw1
data_r = data .* rw[vcfg]
return (data_r, rw) return (data_r, rw)
end
end end
# rw with gaps
function apply_rw(data::Vector{<:Array{Float64}}, W::Vector{Matrix{Float64}}, vcfg::Vector{Vector{Int32}}) function apply_rw(data::Vector{<:Array{Float64}}, W::Vector{Matrix{Float64}}, vcfg::Union{Nothing, Vector{Int32}}=nothing, id::String="A653", fs::Bool=false)
nc = size.(W, 2) nc = size.(W, 2)
if isnothing(vcfg)
vcfg = [collect(1:nc[k]) for k=1:length(nc)]
end
rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)] rw1 = [W[k][1, 1:nc[k]] for k=1:length(W)]
rw2 = [W[k][2, 1:nc[k]] for k=1:length(W)]
rw = [rw1[k] .* rw2[k] for k =1:length(W)] rw = [rw1[k] for k =1:length(W)]
data_r = [data[k] .* rw[k][vcfg[k]] for k=1:length(data)] data_r = [data[k] .* rw[k][vcfg[k]] for k=1:length(data)]
return (data_r, rw) return (data_r, rw)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment