Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit e2013ec5 authored by Matthieu Tristram's avatar Matthieu Tristram
Browse files

Correct color cycle

parent 83cb00ed
......@@ -863,6 +863,7 @@ def gauss_prior(x,m,s):
########################################################################
simple_lik_name = {
'smica_g30_ftl_full_pttptt' : 'lensing',
'lowl_SMW_70_dx11d_2014_10_03_v5c_Ap' : 'bflike',
'HiLLiPOP:DX11dHM_superExt_CO_TT' : 'hlpTT',
'Hillipop:DX11dHM_superExt_CO_TT' : 'hlpPS',
......@@ -877,14 +878,13 @@ simple_lik_name = {
'BAO1D_dr12' : 'BAO(1D)',
'boss_dr12' : 'BAO(3D)',
'JLA' : 'SNIa(JLA)'
}
}
def writeExtendedBestFit( dbdir, bfwrite=False, outpath=""):
#Extract Bestfit from logfile
path, dirs, files = os.walk("%s" % (dbdir)).next()
for idir in dirs:
for idir in dirs:
p,d,f = os.walk("%s/%s" % (dbdir,idir)).next()
# this will find the last 'camelZZ.par' file in folder
......@@ -893,7 +893,8 @@ def writeExtendedBestFit( dbdir, bfwrite=False, outpath=""):
if ("camel" in s and ".par" in s):
camelparfile="%s/%s/%s" % (dbdir,idir,s)
print(idir)
print(camelparfile)
# on cherche si on a lance le code avec Profile ou Minimize (camelrun)
CheckProfile=False
name =""
......@@ -901,16 +902,16 @@ def writeExtendedBestFit( dbdir, bfwrite=False, outpath=""):
name = file
print(file)
try:
#name="%s/%s/%s" % (dbdir,idir,"camelrun")
cr=open(name)
all_lines=cr.readlines()
for c in all_lines:
if "Profile" in c and not "#" in c:
CheckProfile=True
cr.close()
except ValueError:
return()
try:
#name="%s/%s/%s" % (dbdir,idir,"camelrun")
cr=open(name)
all_lines=cr.readlines()
for c in all_lines:
if "Profile" in c and not "#" in c:
CheckProfile=True
cr.close()
except ValueError:
return()
print CheckProfile
#build a line with all param names avoiding double counts
......@@ -955,9 +956,8 @@ def writeExtendedBestFit( dbdir, bfwrite=False, outpath=""):
line_satisfied=True
#print chnam
#print "|"+param_line+"|"
if ".clik" in c :
param_line += simple_lik_name[chnam.replace(".clik:","")]
if ".clik" in c :
param_line += simple_lik_name[chnam.replace(".clik_lensing:","").replace(".clik:","")]
param_line += " "
line_satisfied=True
#print "|"+param_line+"|"
......@@ -1632,24 +1632,25 @@ class prof:
all plot arguments
"""
ax = plt.gca()
from matplotlib import __version__
if __version__ >= '1.5':
colordef = next(ax._get_lines.prop_cycler)
else:
colordef = next(ax._get_lines.color_cycle)
color = kwargs.pop( "color", colordef)
## from matplotlib import __version__
## if __version__ >= '1.5':
## colordef = next(ax._get_lines.prop_cycler)
## else:
## colordef = next(ax._get_lines.color_cycle)
linestyle = kwargs.pop( "linestyle", '-')
label = kwargs.pop( "label", None)
marker = kwargs.pop( "marker", 'o')
marker = kwargs.pop( "marker", 'o')
if extent==None:
extent = (self._v[0],self._v[-1])
ax.plot(self._v,self._p-self.ymin,color=color,marker=marker,linestyle='')
baseplt,=ax.plot(self._v,self._p-self.ymin,marker=marker,linestyle='', **kwargs)
c = kwargs.pop( "color", "")
ax.set_xlabel(parname.get(self._nameforclass,self._nameforclass),fontsize=fontsize)
ax.set_ylabel("$\chi^2-\chi^2_{min}$",fontsize=fontsize)
ax.set_ylim((-0.1,5))
color = baseplt.get_color()
if draw_CL and self.CL==68:
plt.axhline(y=1,color='k',linestyle='--')
......
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