@@ -11,6 +11,13 import numpy | |||
|
11 | 11 | |
|
12 | 12 | from schainpy.model.graphics.jroplot_base import Plot, plt, log |
|
13 | 13 | |
|
14 | from matplotlib import __version__ as plt_version | |
|
15 | ||
|
16 | if plt_version >='3.3.4': | |
|
17 | EXTRA_POINTS = 0 | |
|
18 | else: | |
|
19 | EXTRA_POINTS = 1 | |
|
20 | ||
|
14 | 21 | |
|
15 | 22 | class SpectraPlot(Plot): |
|
16 | 23 | ''' |
@@ -51,7 +58,7 class SpectraPlot(Plot): | |||
|
51 | 58 | data['noise'] = 10 * numpy.log10(dataOut.getNoise() / dataOut.normFactor) |
|
52 | 59 |
extrapoints = spc.shape[1] % dataOut.nFFTPoints |
|
53 | 60 |
extrapoints=1 |
|
54 |
meta['xrange'] = (dataOut.getFreqRange( |
|
|
61 | meta['xrange'] = (dataOut.getFreqRange(EXTRA_POINTS) / 1000., dataOut.getAcfRange(EXTRA_POINTS), dataOut.getVelRange(EXTRA_POINTS)) | |
|
55 | 62 | if self.CODE == 'spc_moments': |
|
56 | 63 | data['moments'] = dataOut.moments |
|
57 | 64 | if self.CODE == 'gaussian_fit': |
@@ -161,7 +168,7 class SpectraObliquePlot(Plot): | |||
|
161 | 168 | data['spc'] = spc |
|
162 | 169 | data['rti'] = dataOut.getPower() |
|
163 | 170 | data['noise'] = 10*numpy.log10(dataOut.getNoise()/dataOut.normFactor) |
|
164 |
meta['xrange'] = (dataOut.getFreqRange( |
|
|
171 | meta['xrange'] = (dataOut.getFreqRange(EXTRA_POINTS)/1000., dataOut.getAcfRange(EXTRA_POINTS), dataOut.getVelRange(EXTRA_POINTS)) | |
|
165 | 172 | |
|
166 | 173 | data['shift1'] = dataOut.Dop_EEJ_T1[0] |
|
167 | 174 | data['shift2'] = dataOut.Dop_EEJ_T2[0] |
@@ -261,7 +268,7 class CrossSpectraPlot(Plot): | |||
|
261 | 268 | spc = dataOut.data_spc |
|
262 | 269 | cspc = dataOut.data_cspc |
|
263 | 270 | extrapoints = spc.shape[1] % dataOut.nFFTPoints |
|
264 |
meta['xrange'] = (dataOut.getFreqRange( |
|
|
271 | meta['xrange'] = (dataOut.getFreqRange(EXTRA_POINTS) / 1000., dataOut.getAcfRange(EXTRA_POINTS), dataOut.getVelRange(EXTRA_POINTS)) | |
|
265 | 272 | meta['pairs'] = dataOut.pairsList |
|
266 | 273 | |
|
267 | 274 | tmp = [] |
@@ -765,7 +772,7 class SpectrogramPlot(Plot): | |||
|
765 | 772 | z = numpy.where(numpy.isfinite(z), z, numpy.NAN) |
|
766 | 773 | #buffer = 10 * numpy.log10(z) |
|
767 | 774 | |
|
768 |
meta['xrange'] = (dataOut.getFreqRange( |
|
|
775 | meta['xrange'] = (dataOut.getFreqRange(EXTRA_POINTS)/1000., dataOut.getAcfRange(EXTRA_POINTS), dataOut.getVelRange(EXTRA_POINTS)) | |
|
769 | 776 | |
|
770 | 777 | |
|
771 | 778 | #self.hei = hei |
@@ -999,7 +1006,7 class SpectraCutPlot(Plot): | |||
|
999 | 1006 | meta = {} |
|
1000 | 1007 | spc = 10 * numpy.log10(dataOut.data_pre[0] / dataOut.normFactor) |
|
1001 | 1008 | data['spc'] = spc |
|
1002 |
meta['xrange'] = (dataOut.getFreqRange( |
|
|
1009 | meta['xrange'] = (dataOut.getFreqRange(EXTRA_POINTS) / 1000., dataOut.getAcfRange(EXTRA_POINTS), dataOut.getVelRange(EXTRA_POINTS)) | |
|
1003 | 1010 | if self.CODE == 'cut_gaussian_fit': |
|
1004 | 1011 | data['gauss_fit0'] = 10 * numpy.log10(dataOut.GaussFit0 / dataOut.normFactor) |
|
1005 | 1012 | data['gauss_fit1'] = 10 * numpy.log10(dataOut.GaussFit1 / dataOut.normFactor) |
General Comments 0
You need to be logged in to leave comments.
Login now