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
a428c0c2
Commit
a428c0c2
authored
7 months ago
by
Antonino D'Anna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug in plot_data, added support to mpcac for vector{vector{uwreal}}
parent
15dfff73
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
src/juobs_obs.jl
src/juobs_obs.jl
+4
-1
src/juobs_plots.jl
src/juobs_plots.jl
+1
-1
No files found.
src/juobs_obs.jl
View file @
a428c0c2
...
@@ -271,7 +271,7 @@ function mpcac(a0p::Corr, pp::Corr, plat::Vector{Int64}; kwargs... )
...
@@ -271,7 +271,7 @@ function mpcac(a0p::Corr, pp::Corr, plat::Vector{Int64}; kwargs... )
end
end
end
end
function
mpcac
(
a0p
::
Vector
{
Corr
},
pp
::
Vector
{
Corr
},
plat
::
Vector
{
Vector
{
Int64
}};
kwargs
...
)
function
mpcac
(
a0p
::
Vector
{
Vector
{
uwreal
}},
pp
::
Vector
{
Vector
{
uwreal
}
},
plat
::
Vector
{
Vector
{
Int64
}};
kwargs
...
)
a
=
mpcac
.
(
a0p
,
pp
,
plat
;
kwargs
...
)
a
=
mpcac
.
(
a0p
,
pp
,
plat
;
kwargs
...
)
if
length
(
a
[
1
])
==
1
if
length
(
a
[
1
])
==
1
...
@@ -293,6 +293,9 @@ function mpcac(a0p::Vector{Corr},pp::Vector{Corr},plat::Vector{Vector{Int64}}; k
...
@@ -293,6 +293,9 @@ function mpcac(a0p::Vector{Corr},pp::Vector{Corr},plat::Vector{Vector{Int64}}; k
return
Tuple
([
r
...
]
for
r
in
eachrow
(
a
))
return
Tuple
([
r
...
]
for
r
in
eachrow
(
a
))
end
end
function
mpcac
(
a0p
::
Vector
{
Corr
},
pp
::
Vector
{
Corr
},
plat
::
Vector
{
Vector
{
Int64
}};
kwargs
...
)
return
mpcac
([
a
.
obs
for
a
in
a0p
],[
p
.
obs
for
p
in
pp
],
plat
;
kwargs
...
)
end
## Decay constants
## Decay constants
@doc
raw
"""
@doc
raw
"""
...
...
This diff is collapsed.
Click to expand it.
src/juobs_plots.jl
View file @
a428c0c2
...
@@ -70,7 +70,7 @@ function plot_data(data::Vector{uwreal},xdata::Vector{uwreal};
...
@@ -70,7 +70,7 @@ function plot_data(data::Vector{uwreal},xdata::Vector{uwreal};
isnothing
(
wpm
)
?
uwerr
.
(
data
)
:
[
uwerr
(
d
,
wpm
)
for
d
in
data
];
isnothing
(
wpm
)
?
uwerr
.
(
data
)
:
[
uwerr
(
d
,
wpm
)
for
d
in
data
];
isnothing
(
wpm
)
?
uwerr
.
(
xdata
)
:
[
uwerr
(
x
,
wpm
)
for
x
in
xdata
];
isnothing
(
wpm
)
?
uwerr
.
(
xdata
)
:
[
uwerr
(
x
,
wpm
)
for
x
in
xdata
];
fig
,
ax
=
isnothing
(
figs
)
?
subplots
(
1
)
:
figs
;
fig
,
ax
=
isnothing
(
figs
)
?
subplots
(
1
)
:
figs
;
line
,
=
ax
.
errorbar
(
xdata
,
value
.
(
data
),
err
.
(
data
),
err
.
(
xdata
),
c
=
c
,
fmt
=
fmt
)
line
,
=
ax
.
errorbar
(
value
.
(
xdata
),
value
.
(
data
),
ADerrors
.
err
.
(
data
),
ADerrors
.
err
.
(
xdata
),
c
=
c
,
fmt
=
fmt
)
if
length
(
label
)
!=
0
if
length
(
label
)
!=
0
line
.
set_label
(
label
)
line
.
set_label
(
label
)
ax
.
legend
();
ax
.
legend
();
...
...
This diff is collapsed.
Click to expand it.
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