Skip to content

Commit

Permalink
Updated notebooks
Browse files Browse the repository at this point in the history
  • Loading branch information
@rwpogge
rwpogge committed Dec 28, 2022
1 parent 91241d6 commit 1352906
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 84 deletions.
33 changes: 15 additions & 18 deletions Chapter10/Fig10_2_BaryonMassFraction.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,38 +159,35 @@
"metadata": {},
"outputs": [],
"source": [
"fig,ax = plt.subplots()\n",
"\n",
"fig.set_dpi(dpi)\n",
"fig.set_size_inches(wInches,hInches,forward=True)\n",
"fig,ax = plt.subplots(figsize=(wInches,hInches),dpi=dpi)\n",
"\n",
"ax.tick_params('both',length=6,width=lwidth,which='major',direction='in',top='on',right='on')\n",
"ax.tick_params('both',length=3,width=lwidth,which='minor',direction='in',top='on',right='on')\n",
"\n",
"plt.xlim(xMin,xMax)\n",
"ax.set_xlim(xMin,xMax)\n",
"ax.xaxis.set_major_locator(MultipleLocator(2))\n",
"ax.xaxis.set_minor_locator(MultipleLocator(0.5))\n",
"plt.xlabel(r'z')\n",
"ax.set_xlabel(r'z')\n",
"\n",
"plt.ylim(yMin,yMax)\n",
"ax.set_ylim(yMin,yMax)\n",
"ax.set_yscale('log')\n",
"ax.set_yticks([0.001,0.01,0.1,1])\n",
"ax.set_yticklabels(['0.001','0.01','0.1','1'])\n",
"plt.ylabel(r'Mass fraction',fontsize=axisFontSize)\n",
"ax.set_ylabel(r'Mass fraction',fontsize=axisFontSize)\n",
"\n",
"# plot the data\n",
"\n",
"plt.plot(z,whim,'-',color='black',lw=1.5*lwidth,zorder=10)\n",
"plt.plot(z,dim,'--',color='black',lw=1.5*lwidth,zorder=10)\n",
"plt.plot(z,hot,'-.',color='black',lw=1.5*lwidth,zorder=10)\n",
"plt.plot(z,dense,':',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,whim,'-',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,dim,'--',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,hot,'-.',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,dense,':',color='black',lw=1.5*lwidth,zorder=10)\n",
"\n",
"# Annotate\n",
"\n",
"plt.text(2.5,1.0,'DIM',color='black',ha='center',va='center',fontsize=axisFontSize)\n",
"plt.text(3.75,0.18,'dense',color='black',ha='center',va='bottom',fontsize=axisFontSize)\n",
"plt.text(5.0,0.03,'WHIM',color='black',ha='center',va='center',fontsize=axisFontSize)\n",
"plt.text(1.8,0.008,'hot',color='black',ha='center',va='center',fontsize=axisFontSize)\n",
"ax.text(2.5,1.0,'DIM',color='black',ha='center',va='center',fontsize=axisFontSize)\n",
"ax.text(3.75,0.18,'dense',color='black',ha='center',va='bottom',fontsize=axisFontSize)\n",
"ax.text(5.0,0.03,'WHIM',color='black',ha='center',va='center',fontsize=axisFontSize)\n",
"ax.text(1.8,0.008,'hot',color='black',ha='center',va='center',fontsize=axisFontSize)\n",
"\n",
"# plot and file\n",
"\n",
Expand All @@ -201,7 +198,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -215,7 +212,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down
17 changes: 5 additions & 12 deletions Chapter10/Fig10_3_PhaseDiagram.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,13 @@
"metadata": {},
"outputs": [],
"source": [
"# Make the plot\n",
"\n",
"fig,ax = plt.subplots()\n",
"\n",
"fig.set_dpi(dpi)\n",
"fig.set_size_inches(wInches,hInches,forward=True)\n",
"\n",
"# Axies\n",
"fig,ax = plt.subplots(figsize=(wInches,hInches),dpi=dpi)\n",
"\n",
"ax.tick_params('both',length=6,width=lwidth,which='major',direction='in',top='on',right='on')\n",
"ax.tick_params('both',length=3,width=lwidth,which='minor',direction='in',top='on',right='on')\n",
"\n",
"plt.xlabel(r'$\\log_{10} {\\rm n}_{\\rm H}$ [cm$^{-3}$]')\n",
"plt.ylabel(r'$\\log_{10}$ T [K]')\n",
"ax.set_xlabel(r'$\\log_{10} {\\rm n}_{\\rm H}$ [cm$^{-3}$]')\n",
"ax.set_ylabel(r'$\\log_{10}$ T [K]')\n",
"\n",
"# Image\n",
"\n",
Expand All @@ -195,7 +188,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -209,7 +202,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down
29 changes: 13 additions & 16 deletions Chapter10/Fig10_4_MetalEvolution.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,36 +158,33 @@
"metadata": {},
"outputs": [],
"source": [
"fig,ax = plt.subplots()\n",
"\n",
"fig.set_dpi(dpi)\n",
"fig.set_size_inches(wInches,hInches,forward=True)\n",
"fig,ax = plt.subplots(figsize=(wInches,hInches),dpi=dpi)\n",
"\n",
"ax.tick_params('both',length=6,width=lwidth,which='major',direction='in',top='on',right='on')\n",
"ax.tick_params('both',length=3,width=lwidth,which='minor',direction='in',top='on',right='on')\n",
"\n",
"plt.xlim(xMin,xMax)\n",
"ax.set_xlim(xMin,xMax)\n",
"ax.xaxis.set_major_locator(MultipleLocator(2))\n",
"ax.xaxis.set_minor_locator(MultipleLocator(0.5))\n",
"plt.xlabel(r'z')\n",
"ax.set_xlabel(r'z')\n",
"\n",
"plt.ylim(yMin,yMax)\n",
"ax.set_ylim(yMin,yMax)\n",
"ax.set_yscale('log')\n",
"ax.set_yticks([0.0001,0.001,0.01,0.1,1])\n",
"ax.set_yticklabels([r'10$^{-4}$','0.001','0.01','0.1','1'])\n",
"plt.ylabel(r'Z/Z$_{\\odot}$',fontsize=axisFontSize)\n",
"ax.set_ylabel(r'Z/Z$_{\\odot}$',fontsize=axisFontSize)\n",
"\n",
"# plot the data\n",
"\n",
"plt.plot(z,whim,'-',color='black',lw=1.5*lwidth,zorder=10)\n",
"plt.plot(z,dim,'--',color='black',lw=1.5*lwidth,zorder=10)\n",
"plt.plot(z,sfg,':',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,whim,'-',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,dim,'--',color='black',lw=1.5*lwidth,zorder=10)\n",
"ax.plot(z,sfg,':',color='black',lw=1.5*lwidth,zorder=10)\n",
"\n",
"# Annotate\n",
"\n",
"plt.text(4.0,0.035,'WHIM',color='black',fontsize=axisFontSize,ha='center',va='center')\n",
"plt.text(4.5,0.6,'star-forming',color='black',fontsize=axisFontSize,ha='center',va='center')\n",
"plt.text(3.5,0.0023,'DIM',color='black',fontsize=axisFontSize,ha='center',va='center')\n",
"ax.text(4.0,0.035,'WHIM',color='black',fontsize=axisFontSize,ha='center',va='center')\n",
"ax.text(4.5,0.6,'star-forming',color='black',fontsize=axisFontSize,ha='center',va='center')\n",
"ax.text(3.5,0.0023,'DIM',color='black',fontsize=axisFontSize,ha='center',va='center')\n",
"\n",
"# plot and file\n",
"\n",
Expand All @@ -198,7 +195,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -212,7 +209,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down
39 changes: 18 additions & 21 deletions Chapter10/Fig10_5_CIECoolingMetals.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,42 +174,39 @@
"metadata": {},
"outputs": [],
"source": [
"fig,ax = plt.subplots()\n",
"\n",
"fig.set_dpi(dpi)\n",
"fig.set_size_inches(wInches,hInches,forward=True)\n",
"fig,ax = plt.subplots(figsize=(wInches,hInches),dpi=dpi)\n",
"\n",
"ax.tick_params('both',length=6,width=lwidth,which='major',direction='in',top='on',right='on')\n",
"ax.tick_params('both',length=3,width=lwidth,which='minor',direction='in',top='on',right='on')\n",
"\n",
"plt.xlim(xMin,xMax)\n",
"ax.set_xlim(xMin,xMax)\n",
"ax.set_xscale('log')\n",
"plt.xlabel(r'Temperature [K]')\n",
"ax.set_xlabel(r'Temperature [K]')\n",
"\n",
"plt.ylim(yMin,yMax)\n",
"ax.set_ylim(yMin,yMax)\n",
"ax.set_yscale('log')\n",
"plt.ylabel(r'$\\Lambda$ [erg cm$^3$ s$^{-1}$]',fontsize=axisFontSize)\n",
"ax.set_ylabel(r'$\\Lambda$ [erg cm$^3$ s$^{-1}$]',fontsize=axisFontSize)\n",
"\n",
"# Total cooling function\n",
"\n",
"for z in metallicities:\n",
" if z == '1':\n",
" plt.plot(Temp[z],Cool[z],'-',lw=1.5*lwidth,color='black',zorder=10)\n",
" ax.plot(Temp[z],Cool[z],'-',lw=1.5*lwidth,color='black',zorder=10)\n",
" elif '5' in z:\n",
" plt.plot(Temp[z],Cool[z],':',lw=lwidth,color='black',zorder=10)\n",
" ax.plot(Temp[z],Cool[z],':',lw=lwidth,color='black',zorder=10)\n",
" elif '1' in z:\n",
" plt.plot(Temp[z],Cool[z],'-',lw=lwidth,color='black',zorder=10)\n",
" ax.plot(Temp[z],Cool[z],'-',lw=lwidth,color='black',zorder=10)\n",
" \n",
"# Annotate\n",
"\n",
"plt.text(229086.765277,6.24938e-22,'1',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(229086.765277,1.94463e-21,'5',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(229086.765277,6.13532e-21,'Z=10',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(229086.765277,2.08474e-22,'0.5',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(229086.765277,7.5e-23,'0.1',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(460000,1.35e-23,'0.05',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(1.2e6,6.05e-24,'0.01',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"plt.text(1.2e6,4.5e-24,'0.001',fontsize=labelFontSize,ha='center',va='top',color='black')\n",
"ax.text(229086.765277,6.24938e-22,'1',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(229086.765277,1.94463e-21,'5',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(229086.765277,6.13532e-21,'Z=10',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(229086.765277,2.08474e-22,'0.5',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(229086.765277,7.5e-23,'0.1',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(460000,1.35e-23,'0.05',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(1.2e6,6.05e-24,'0.01',fontsize=labelFontSize,ha='center',va='bottom',color='black')\n",
"ax.text(1.2e6,4.5e-24,'0.001',fontsize=labelFontSize,ha='center',va='top',color='black')\n",
"\n",
"# plot and file\n",
"\n",
Expand All @@ -220,7 +217,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -234,7 +231,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down
31 changes: 14 additions & 17 deletions Chapter10/Fig10_6_Nicastro2018.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,35 +227,32 @@
},
"outputs": [],
"source": [
"fig,ax = plt.subplots()\n",
"\n",
"fig.set_dpi(dpi)\n",
"fig.set_size_inches(wInches,hInches,forward=True)\n",
"fig,ax = plt.subplots(figsize=(wInches,hInches),dpi=dpi)\n",
"\n",
"ax.tick_params('both',length=6,width=lwidth,which='major',direction='in',top='on',right='on')\n",
"ax.tick_params('both',length=3,width=lwidth,which='minor',direction='in',top='on',right='on')\n",
"\n",
"# Limits\n",
"\n",
"plt.xlim(xMin,xMax)\n",
"ax.set_xlim(xMin,xMax)\n",
"ax.xaxis.set_major_locator(MultipleLocator(1))\n",
"ax.xaxis.set_minor_locator(MultipleLocator(0.2))\n",
"plt.xlabel(r'Wavelength [\\AA]',fontsize=axisFontSize)\n",
"ax.set_xlabel(r'Wavelength [\\AA]',fontsize=axisFontSize)\n",
"\n",
"plt.ylim(yMin,yMax)\n",
"plt.ylabel(r'Data/Continuum',fontsize=axisFontSize)\n",
"ax.set_ylim(yMin,yMax)\n",
"ax.set_ylabel(r'Data/Continuum',fontsize=axisFontSize)\n",
"\n",
"plt.errorbar(wave1,fluxNorm1,xerr=errWave1,yerr=ferrNorm1,color='black',fmt='o',ms=1,zorder=10,lw=0.5)\n",
"plt.errorbar(wave2,fluxNorm2,xerr=errWave2,yerr=ferrNorm2,color='#666666',fmt='o',ms=1,zorder=10,lw=0.5)\n",
"ax.errorbar(wave1,fluxNorm1,xerr=errWave1,yerr=ferrNorm1,color='black',fmt='o',ms=1,zorder=10,lw=0.5)\n",
"ax.errorbar(wave2,fluxNorm2,xerr=errWave2,yerr=ferrNorm2,color='#666666',fmt='o',ms=1,zorder=10,lw=0.5)\n",
"\n",
"# Model showing the absorption line\n",
"\n",
"plt.plot(waveModel,fluxModel,'-',lw=1.0,color='black')\n",
"plt.text(cen1,1-pk1-0.025,r'O{\\sc vii}',color='black',ha='center',va='top',fontsize=axisFontSize)\n",
"plt.text(cen1,1-pk1-0.055,r'(z=0.355)',color='black',ha='center',va='top',fontsize=labelFontSize)\n",
"ax.plot(waveModel,fluxModel,'-',lw=1.0,color='black')\n",
"ax.text(cen1,1-pk1-0.025,r'O{\\sc vii}',color='black',ha='center',va='top',fontsize=axisFontSize)\n",
"ax.text(cen1,1-pk1-0.055,r'(z=0.355)',color='black',ha='center',va='top',fontsize=labelFontSize)\n",
"\n",
"plt.text(cen2,1-pk2-0.025,r'O{\\sc vii}',color='black',ha='center',va='top',fontsize=axisFontSize)\n",
"plt.text(cen2,1-pk2-0.055,r'(z=0.434)',color='black',ha='center',va='top',fontsize=labelFontSize)\n",
"ax.text(cen2,1-pk2-0.025,r'O{\\sc vii}',color='black',ha='center',va='top',fontsize=axisFontSize)\n",
"ax.text(cen2,1-pk2-0.055,r'(z=0.434)',color='black',ha='center',va='top',fontsize=labelFontSize)\n",
"\n",
"plt.plot()\n",
"plt.savefig(plotFile,bbox_inches='tight',facecolor='white')"
Expand All @@ -264,7 +261,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -278,7 +275,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
"version": "3.9.7"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 1352906

Please sign in to comment.