From 6581d46232eebc8215e04379c4fe55a1b5965afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20L=C3=B8iten?= Date: Tue, 28 Feb 2017 19:51:18 +0100 Subject: [PATCH] Plot size modifications Former-commit-id: 349c0d25a6a35c4ce14edd3db8edc1a9554a57d9 --- celmaRC2/common/CELMAPy/PSD/plotPSD.py | 2 +- .../CELMAPy/radialProfile/plotRadialProfile.py | 16 +++++++++------- .../skewnessKurtosis/plotSkewnessKurtosis.py | 2 +- .../common/CELMAPy/totalFlux/plotTotalFlux.py | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/celmaRC2/common/CELMAPy/PSD/plotPSD.py b/celmaRC2/common/CELMAPy/PSD/plotPSD.py index 09f4cc37..60e7beb5 100755 --- a/celmaRC2/common/CELMAPy/PSD/plotPSD.py +++ b/celmaRC2/common/CELMAPy/PSD/plotPSD.py @@ -301,7 +301,7 @@ def plotSaveShowPSD2D(self): """ # Create the plot - fig = plt.figure(figsize = SizeMaker.standard(s=0.45)) + fig = plt.figure(figsize = SizeMaker.standard(w=6, a=0.3)) ax = fig.add_subplot(111) # Plot diff --git a/celmaRC2/common/CELMAPy/radialProfile/plotRadialProfile.py b/celmaRC2/common/CELMAPy/radialProfile/plotRadialProfile.py index 7b08b452..060f49ac 100755 --- a/celmaRC2/common/CELMAPy/radialProfile/plotRadialProfile.py +++ b/celmaRC2/common/CELMAPy/radialProfile/plotRadialProfile.py @@ -89,9 +89,10 @@ def setData(self, profGrad): self._gradLabel =\ self._gradLabelTemplate.\ format(pltVarName, **self.uc.conversionDict[self._varName]) - self._gradAvgLabel =\ - self._avgLabelTemplate.\ - format(DDXPltVarName, **self.uc.conversionDict[self._varName]) + if r"\mathrm{m}^{-3}\mathrm{m}^{-1}" in self._gradLabel: + self._gradLabel =\ + self._gradLabel.replace(r"\mathrm{m}^{-3}\mathrm{m}^{-1}",\ + r"\mathrm{m}^{-4}") # Set the legends self._varAvgLegend =\ @@ -350,7 +351,7 @@ def plotSaveShowPosOfFluct(self): """ # Create the plot - figSize = SizeMaker.standard(w=3, a=2) + figSize = SizeMaker.standard(w=2.5, a=1.25) fig, axes =\ plt.subplots(nrows=4, figsize=figSize, sharex=True) varAx, DDXVarAx, fluct1Ax, fluct2Ax = axes @@ -382,9 +383,10 @@ def plotSaveShowPosOfFluct(self): fluct2Ax.set_xlabel(self._xLabel) # Make the plot look nice - self._ph.makePlotPretty(fluct1Ax, loc="lower right", ybins = 6) - self._ph.makePlotPretty(fluct2Ax, loc="lower right",\ - rotation = 45, ybins = 6) + self._ph.makePlotPretty(varAx, ybins = 4) + self._ph.makePlotPretty(DDXVarAx, ybins = 4) + self._ph.makePlotPretty(fluct1Ax, ybins = 4) + self._ph.makePlotPretty(fluct2Ax, ybins = 4, rotation = 45) # Set the title varAx.set_title(self._title) diff --git a/celmaRC2/common/CELMAPy/skewnessKurtosis/plotSkewnessKurtosis.py b/celmaRC2/common/CELMAPy/skewnessKurtosis/plotSkewnessKurtosis.py index efa3713b..4cc0611b 100755 --- a/celmaRC2/common/CELMAPy/skewnessKurtosis/plotSkewnessKurtosis.py +++ b/celmaRC2/common/CELMAPy/skewnessKurtosis/plotSkewnessKurtosis.py @@ -143,7 +143,7 @@ def plotSaveShowSkewnessKurtosis(self): """ # Create the plot - fig, ax = plt.subplots(figsize = SizeMaker.standard(w=4.0)) + fig, ax = plt.subplots(figsize = SizeMaker.standard(w=4.0, a=0.5)) # Plot ax.plot(self._rho, self._skew,\ diff --git a/celmaRC2/common/CELMAPy/totalFlux/plotTotalFlux.py b/celmaRC2/common/CELMAPy/totalFlux/plotTotalFlux.py index d099e94a..af72e965 100755 --- a/celmaRC2/common/CELMAPy/totalFlux/plotTotalFlux.py +++ b/celmaRC2/common/CELMAPy/totalFlux/plotTotalFlux.py @@ -183,7 +183,7 @@ def plotSaveShowTotalFlux(self): textPos = (0.96, 0.91) # Create the plot - figSize = SizeMaker.array(1, 2, w = 6.3, aSingle = 0.7*0.7) + figSize = SizeMaker.standard(w=5, a=1) fig, (elIonAx, perpAx) =\ plt.subplots(nrows=2, figsize=figSize, sharex=True)