@@ -180,6 +180,7 @@ def gp_stack(version, energies, inclMed, inclFits):
180180 # cocktail/data
181181 scale = {}
182182 for e in ['19' , '27' , '39' , '62' , '200' ]:
183+ if version == 'QM12' and e == '27' : continue
183184 a , b = pi0yld [e + '_cocktail' ], pi0yld [e + '_data' ]
184185 z = a / b
185186 scale [e ] = ufloat (z .nominal_value , z .std_dev * 2 )
@@ -227,20 +228,19 @@ def gp_stack(version, energies, inclMed, inclFits):
227228 if version == 'Latest19200_PatrickQM12' : yr_low = 1e-7
228229 if version == 'QM12Latest200' : yr_low = 2e-6
229230 if version == 'LatestPatrickJieYi' : yr_low = 1e-8
231+ cocktailContribsProps = ([
232+ 'with lines lc %s lw 4 lt 3' % default_colors [- i - 2 ]
233+ for i in xrange (nSetsCocktailContribs - 1 )
234+ ] + [ 'with lines lc %s lw 4 lt 3' % default_colors [0 ] ]) \
235+ if nSetsCocktailContribs > 0 else []
230236 make_plot (
231237 data = cocktailContribs .values ()
232238 + cocktailOrdered .values () + ([ pseudo_point ] if inclMed else [])
233239 + qgpOnly .values () + medOnly .values ()
234240 + mediumOrdered .values () + [ pseudo_point ] + dataOrdered .values ()
235241 + dataIMRfitOrdered .values () + ([ pseudo_point ] if inclFits else [])
236242 + cocktailIMRfitOrdered .values () + ([ pseudo_point ] if inclFits else []),
237- properties = [
238- 'with lines lc %s lw 4 lt 3' % default_colors [- i - 2 ]
239- for i in xrange (nSetsCocktailContribs - 1 )
240- ] + [
241- 'with lines lc %s lw 4 lt 3' % default_colors [0 ]
242- ] + [ cocktail_style ] * (nSetsCocktail + 1 )
243- + [
243+ properties = cocktailContribsProps + [ cocktail_style ] * (nSetsCocktail + 1 ) + [
244244 'with lines lc %s lw 4 lt 2' % default_colors [- i - 16 ] for i in xrange (nSetsModelOnly )
245245 ] * (nSetsModelOnly / 2 )
246246 + [ medium_style ] * (nSetsMedium + bool (nSetsMedium )) + [
0 commit comments