diff --git a/schainpy/Graphics/BaseGraph.py b/schainpy/Graphics/BaseGraph.py index b259cb9..df45b8b 100644 --- a/schainpy/Graphics/BaseGraph.py +++ b/schainpy/Graphics/BaseGraph.py @@ -191,17 +191,17 @@ def cmap1_init(colormap="gray"): def setColormap(colormap="jet"): cmap1_init(colormap) -def savePlplot(indexPlot,filename,ncol,nrow,width,height): +def savePlplot(filename,width,height): curr_strm = plplot.plgstrm() save_strm = plplot.plmkstrm() - plplot.plsetopt("geometry", "%dx%d"%(width*ncol,height*nrow)) - plplot.plsdev("pngcairo") + plplot.plsetopt("geometry", "%dx%d"%(width,height)) + plplot.plsdev("png") plplot.plsfnam(filename) plplot.plcpstrm(curr_strm,0) plplot.plreplot() + plplot.plclear() plplot.plend1() - plplot.plsstrm(indexPlot) - print '' + plplot.plsstrm(curr_strm) def initPlplot(indexPlot,ncol,nrow,winTitle,width,height): @@ -740,7 +740,9 @@ class SpectraPlot: now = datetime.datetime.now().timetuple() file = "spc_img%02d_%03d_%02d%02d%02d"%(indexPlot,now[7],now[3],now[4],now[5]) filename = os.path.join(path,file+".png") - savePlplot(indexPlot,filename,self.ncol,self.nrow,self.width,self.height) + width = self.width*self.ncol + hei = self.height*self.nrow + savePlplot(filename,width,hei) diff --git a/schainpy/Processing/JRONoise.py b/schainpy/Processing/JRONoise.py index e1a4379..3a7e0ef 100644 --- a/schainpy/Processing/JRONoise.py +++ b/schainpy/Processing/JRONoise.py @@ -148,7 +148,7 @@ class Noise: """ if data == None: - return 0 + raise ValueError, "The data value is not defined" shape = data.shape self.dim = len(shape) diff --git a/schainpy/Processing/SpectraProcessor.py b/schainpy/Processing/SpectraProcessor.py index a58b246..6f5d91f 100644 --- a/schainpy/Processing/SpectraProcessor.py +++ b/schainpy/Processing/SpectraProcessor.py @@ -239,7 +239,8 @@ class SpectraProcessor: self.dataOutObj.data_dc = dc self.dataOutObj.m_ProcessingHeader.blockSize = blocksize self.dataOutObj.m_BasicHeader.utc = self.dataInObj.m_BasicHeader.utc - + + self.getNoise() def addWriter(self,wrpath): objWriter = SpectraWriter(self.dataOutObj) @@ -329,7 +330,7 @@ class SpectraProcessor: #print "myIncohIntObj.navg: ",myIncohIntObj.navg self.dataOutObj.flagNoData = False - self.getNoise(type="hildebrand",parm=myIncohIntObj.navg) + self.getNoise(type="hildebrand") # self.getNoise(type="sort", parm=16) else: @@ -357,6 +358,9 @@ class SpectraProcessor: def getNoise(self, type="hildebrand", parm=None): + if parm == None: + parm =self.dataOutObj.m_ProcessingHeader.incoherentInt + self.noiseObj.setNoise(self.dataOutObj.data_spc) if type == "hildebrand":