Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
juobs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Javier Ugarrio
juobs
Commits
41bf22af
Commit
41bf22af
authored
May 08, 2024
by
Antonino D'Anna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrected kwargs... use
parent
16052740
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
15 deletions
+18
-15
src/juobs_obs.jl
src/juobs_obs.jl
+18
-15
No files found.
src/juobs_obs.jl
View file @
41bf22af
...
...
@@ -69,16 +69,23 @@ function meff(corr::Vector{uwreal}, plat::Vector{Int64}; pl::Bool=true, data::Bo
return
(
mass
,
aux
)
end
end
function
meff
(
corr
::
Corr
,
plat
::
Vector
{
Int64
};
pl
::
Bool
=
true
,
data
::
Bool
=
false
,
wpm
::
Union
{
Dict
{
Int64
,
Vector
{
Float64
}},
Dict
{
String
,
Vector
{
Float64
}},
Nothing
}
=
nothing
,
savepl
::
Bool
=
false
,
label
::
Union
{
String
,
Nothing
}
=
nothing
)
function
meff
(
corr
::
Corr
,
plat
::
Vector
{
Int64
};
kwargs
...
)
if
corr
.
mu
==
[
0.0
,
0.0
]
return
meff
(
corr
.
obs
,
plat
,
pl
=
pl
,
data
=
data
,
kappa
=
corr
.
kappa
,
mu
=
nothing
,
wpm
=
wpm
,
savepl
=
savepl
,
label
=
label
)
return
meff
(
corr
.
obs
,
plat
;
kappa
=
corr
.
kappa
,
mu
=
nothing
,
kwargs
...
)
else
return
meff
(
corr
.
obs
,
plat
,
pl
=
pl
,
data
=
data
,
mu
=
corr
.
mu
,
kappa
=
nothing
,
wpm
=
wpm
,
savepl
=
savepl
,
label
=
label
)
return
meff
(
corr
.
obs
,
plat
;
mu
=
corr
.
mu
,
kappa
=
nothing
,
kwargs
...
)
end
end
function
meff
(
corrs
::
Vector
{
Corr
},
plats
::
Vector
{
Vector
{
Int64
}};
data
::
Bool
=
false
,
kwargs
...
)
if
!
data
return
meff
.
(
corrs
,
plats
;
kwargs
)
end
aux
=
meff
.
(
corrs
,
plats
;
data
=
data
,
kwargs
...
)
return
getfield
.
(
aux
,
1
),
getfield
.
(
aux
,
2
);
end
@doc
raw
"""
mpcac(a0p::Vector{uwreal}, pp::Vector{uwreal}, plat::Vector{Int64}; ca::Float64=0.0, pl::Bool=true, data::Bool=false, wpm::Union{Dict{Int64,Vector{Float64}},Dict{String,Vector{Float64}}, Nothing}=nothing,savepl::Bool=false, label::Union{String,Nothing}=nothing)
...
...
@@ -180,28 +187,24 @@ function mpcac(a0p::Vector{uwreal}, pp::Vector{uwreal}, plat::Vector{Int64}; ca:
end
end
function
mpcac
(
a0p
::
Corr
,
pp
::
Corr
,
plat
::
Vector
{
Int64
};
ca
::
Float64
=
0.0
,
pl
::
Bool
=
true
,
data
::
Bool
=
false
,
wpm
::
Union
{
Dict
{
Int64
,
Vector
{
Float64
}},
Dict
{
String
,
Vector
{
Float64
}},
Nothing
}
=
nothing
,
savepl
::
Bool
=
false
,
label
::
Union
{
String
,
Nothing
}
=
nothing
)
function
mpcac
(
a0p
::
Corr
,
pp
::
Corr
,
plat
::
Vector
{
Int64
};
kwargs
...
)
if
a0p
.
kappa
==
pp
.
kappa
||
a0p
.
mu
==
pp
.
mu
if
a0p
.
mu
==
[
0.0
,
0.0
]
return
mpcac
(
a0p
.
obs
,
pp
.
obs
,
plat
,
ca
=
ca
,
pl
=
pl
,
data
=
data
,
kappa
=
a0p
.
kappa
,
mu
=
nothing
,
wpm
=
wpm
,
savepl
=
savepl
,
label
=
label
)
return
mpcac
(
a0p
.
obs
,
pp
.
obs
,
plat
;
kappa
=
a0p
.
kappa
,
mu
=
nothing
,
kwargs
...
)
else
return
mpcac
(
a0p
.
obs
,
pp
.
obs
,
plat
,
ca
=
ca
,
pl
=
pl
,
data
=
data
,
mu
=
a0p
.
mu
,
kappa
=
nothing
,
wpm
=
wpm
,
savepl
=
savepl
,
label
=
label
)
return
mpcac
(
a0p
.
obs
,
pp
.
obs
,
plat
;
mu
=
a0p
.
mu
,
kappa
=
nothing
,
kwargs
...
)
end
else
error
(
"mu or kappa values does not match"
)
end
end
function
mpcac
(
a0p
::
Vector
{
Corr
},
pp
::
Vector
{
Corr
},
plat
::
Vector
{
Vector
{
Int64
}};
ca
::
Float64
=
0.0
,
pl
::
Bool
=
true
,
data
::
Bool
=
false
,
wpm
::
Union
{
Dict
{
Int64
,
Vector
{
Float64
}},
Dict
{
String
,
Vector
{
Float64
}},
Nothing
}
=
nothing
,
savepl
::
Bool
=
false
,
label
::
Union
{
String
,
Nothing
}
=
nothing
)
function
mpcac
(
a0p
::
Vector
{
Corr
},
pp
::
Vector
{
Corr
},
plat
::
Vector
{
Vector
{
Int64
}};
data
::
Bool
=
false
,
kwargs
...
)
if
!
data
return
mpcac
.
(
a0p
,
pp
,
plat
,
ca
=
ca
,
pl
=
pl
,
data
=
data
,
wpm
=
wpm
,
savepl
=
savepl
,
label
=
label
)
return
mpcac
.
(
a0p
,
pp
,
plat
;
kwargs
...
)
else
aux
=
mpcac
.
(
a0p
,
pp
,
plat
,
ca
=
ca
,
pl
=
pl
,
data
=
data
,
wpm
=
wpm
,
savepl
=
savepl
,
label
=
label
)
aux
=
mpcac
.
(
a0p
,
pp
,
plat
;
data
=
true
,
kwargs
...
)
return
(
getfield
.
(
aux
,
1
),
getfield
.
(
aux
,
2
))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment