Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
cigale
CIGALE
Commits
aef1188f
Commit
aef1188f
authored
Feb 05, 2016
by
Médéric Boquien
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adapt pcigale-plots to the recent changes in the configuration file format.
parent
4f8fa817
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
pcigale_plots/__init__.py
pcigale_plots/__init__.py
+4
-6
No files found.
pcigale_plots/__init__.py
View file @
aef1188f
...
...
@@ -370,8 +370,7 @@ def chi2(config):
"""Plot the χ² values of analysed variables.
"""
input_data
=
read_table
(
config
.
configuration
[
'data_file'
])
chi2_vars
=
(
config
.
configuration
[
'analysis_method_params'
]
[
'analysed_variables'
])
chi2_vars
=
config
.
configuration
[
'analysis_params'
][
'variables'
]
with
mp
.
Pool
(
processes
=
config
.
configuration
[
'cores'
])
as
pool
:
items
=
product
(
input_data
[
'id'
],
chi2_vars
)
...
...
@@ -384,8 +383,7 @@ def pdf(config):
"""Plot the PDF of analysed variables.
"""
input_data
=
read_table
(
config
.
configuration
[
'data_file'
])
pdf_vars
=
(
config
.
configuration
[
'analysis_method_params'
]
[
'analysed_variables'
])
pdf_vars
=
config
.
configuration
[
'analysis_params'
][
'variables'
]
with
mp
.
Pool
(
processes
=
config
.
configuration
[
'cores'
])
as
pool
:
items
=
product
(
input_data
[
'id'
],
pdf_vars
)
...
...
@@ -402,7 +400,7 @@ def sed(config, sed_type, nologo):
with
Database
()
as
base
:
filters
=
OrderedDict
([(
name
,
base
.
get_filter
(
name
))
for
name
in
config
.
configuration
[
'
column_list
'
]
for
name
in
config
.
configuration
[
'
bands
'
]
if
not
name
.
endswith
(
'_err'
)])
with
mp
.
Pool
(
processes
=
config
.
configuration
[
'cores'
])
as
pool
:
...
...
@@ -428,7 +426,7 @@ def mock(config, nologo):
print
(
"Mock models file {} not found."
.
format
(
OUT_DIR
+
MOCK_RESULTS
))
sys
.
exit
(
1
)
params
=
config
.
configuration
[
'analysis_
method_
params'
][
'
analysed_
variables'
]
params
=
config
.
configuration
[
'analysis_params'
][
'variables'
]
for
param
in
params
:
if
param
.
endswith
(
'_log'
):
...
...
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