Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Docker-in-Docker (DinD) capabilities of public runners deactivated.
More info
Open sidebar
Xavier Garrido
CAMEL
Commits
0338a016
Commit
0338a016
authored
Dec 01, 2016
by
perdereau
Browse files
correct indentation pb
parent
35b9f24f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
11 deletions
+16
-11
work/tools/python/camel.py
work/tools/python/camel.py
+16
-11
No files found.
work/tools/python/camel.py
View file @
0338a016
...
...
@@ -321,6 +321,7 @@ parname = {
'AdustTT'
:
'$A_\mathrm{dust}^\mathrm{TT}$'
,
'AdustTP'
:
'$A_\mathrm{dust}^\mathrm{TE}$'
,
'AdustPP'
:
'$A_\mathrm{dust}^\mathrm{EE}$'
,
'SPT_ADust'
:
'$A^\mathrm{dust}_\mathrm{SPT}$'
,
'SPT_high_95_cal'
:
'$c^\mathrm{SPT\ high}_{95}$'
,
'SPT_high_150_cal'
:
'$c^\mathrm{SPT\ high}_{150}$'
,
'SPT_high_220_cal'
:
'$c^\mathrm{SPT\ high}_{220}$'
,
...
...
@@ -977,8 +978,6 @@ def writeExtendedBestFit( dbdir, bfwrite=False, outpath=""):
#print param_line
sf
.
close
()
for
s
in
[
f1
for
f1
in
f
if
".o"
in
f1
]:
...
...
@@ -1313,27 +1312,29 @@ class prof:
for
idir
in
dirs
:
if
not
self
.
parname
in
idir
:
continue
p
,
d
,
f
=
os
.
walk
(
"%s/%s"
%
(
self
.
dbdir
,
idir
)).
next
()
if
writeBestfit
:
self
.
_writeBestFit
(
idir
,
f
)
# for f2 in [f1 for f1 in f if ".o" in f1]:
# for f2 in [f1 for f1 in f if ".o" in f1]:
#check there are more than nestimate bestfit in directory idir
if
sum
([
s
.
startswith
(
"best_fit"
)
for
s
in
f
])
>=
nestimate
:
# gets the value indicated in the subfolder's name
keep
=
True
for
ii
in
remove
:
if
ii
==
idir
.
replace
(
self
.
parname
+
'_'
,
''
):
keep
=
False
if
keep
:
self
.
_s
.
append
(
idir
.
replace
(
self
.
parname
+
'_'
,
''
))
# same thing but casts in double
self
.
_v
.
append
(
np
.
double
(
idir
.
replace
(
self
.
parname
+
'_'
,
''
))
+
self
.
_offset
)
if
len
(
self
.
_s
)
<=
2
:
raise
ValueError
(
"not enough profiled-value available (need at least two)"
)
sortidx
=
np
.
argsort
(
self
.
_v
)
...
...
@@ -1399,13 +1400,16 @@ class prof:
for
f
in
np
.
sort
(
files
):
#read all parameters
fname
=
"%s/%s_%s/%s"
%
(
self
.
dbdir
,
self
.
parname
,
val
,
f
)
if
verbose
:
print
fname
print
os
.
stat
(
fname
).
st_size
if
os
.
stat
(
fname
).
st_size
!=
0
:
bftmp
=
read_bestfit
(
"%s/%s_%s/%s"
%
(
self
.
dbdir
,
self
.
parname
,
val
,
f
))
if
verbose
:
prtval
=
'chi2'
if
verbose
==
True
else
verbose
print
(
f
,
bftmp
[
prtval
])
if
bftmp
[
'chi2'
]
<
bf
[
'chi2'
]:
bf
=
bftmp
if
verbose
:
prtval
=
'chi2'
if
verbose
==
True
else
verbose
print
(
f
,
bftmp
[
prtval
])
if
bftmp
[
'chi2'
]
<
bf
[
'chi2'
]:
bf
=
bftmp
return
(
bf
)
...
...
@@ -1571,6 +1575,7 @@ class prof:
all plot arguments
"""
ax
=
plt
.
gca
()
color
=
kwargs
.
pop
(
"color"
,
next
(
ax
.
_get_lines
.
color_cycle
))
linestyle
=
kwargs
.
pop
(
"linestyle"
,
'-'
)
label
=
kwargs
.
pop
(
"label"
,
None
)
...
...
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