schain-jc Commit - r111:9c1626ca5c6a

Getnoise se agrega al metodo getFft de SpectraProcessor.

Daniel Valdez -

r111:9c1626ca5c6a

parent child

Context file:

r111:9c1626ca5c6a

schainpy/Graphics/BaseGraph.py +8 -6

             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.plsetopt("geometry", "%dx%d"%(width,height))
-                plplot.plsdev("pngcairo")
+                plplot.plsdev("png")
                 plplot.plsfnam(filename)
                 plplot.plcpstrm(curr_strm,0)
                 plplot.plreplot()
+                plplot.plclear()
                 plplot.plend1()
-                plplot.plsstrm(indexPlot)
+                plplot.plsstrm(curr_strm)
-                print ''
             def initPlplot(indexPlot,ncol,nrow,winTitle,width,height):
                     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)

schainpy/Processing/JRONoise.py +1 -1

                     """
                     if data == None:
-                        return 0
+                        raise ValueError, "The data value is not defined"
                     shape = data.shape
                     self.dim = len(shape)

schainpy/Processing/SpectraProcessor.py +6 -2

                     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)
                         #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:
                 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":

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages