schain-jc Commit - r664:9aee9f7a8e3e

Version 2.1.3: ...

Miguel Valdez -

r664:9aee9f7a8e3e

parent child

Context file:

r664:9aee9f7a8e3e

Collapse all files

schainpy/VERSION +8 -1

@@ -5,4 +5,11 VERSIONS:
5	Server thread opens and closes remote server each time file list is sent	5	Server thread opens and closes remote server each time file list is sent
6	-jroplot_spectra.py: Noise path was not being created saving noise data.	6	-jroplot_spectra.py: Noise path was not being created saving noise data.
7	-jroIO_base.py: startTime can be greater than endTime	7	-jroIO_base.py: startTime can be greater than endTime
8	-jroplot_heispectra.py: SpectraHeisScope was not showing the right channel	8
		9	2.1.3:
		10	-jroplot_heispectra.py: SpectraHeisScope was not showing the right channels
		11	-jroproc_voltage.py: Bug fixed selecting profiles (self.nProfiles took a wrong value),
		12	Bug fixed selecting heights by block (selecting profiles instead heights)
		13	-jroproc_voltage.py: New feature added: decoding data by block using FFT.
		14	-jroIO_heispectra.py: Bug fixed in FitsReader. Using local Fits object instead schainpy.mode.data.jrodata.Fits object.
		15	-jroIO_heispectra.py: Channel index list does not exist. No newline at end of file

schainpy/__init__.py +1 -1

             @author $Author$
             @version $Id$
             '''
-            __version__ = "2.1.2"
  No newline at end of file
+            __version__ = "2.1.3"
  No newline at end of file

schainpy/controller.py +2 -3

             Created on September , 2012
             @author:
             '''
-            from xml.etree.ElementTree import Element, SubElement
+            from xml.etree.ElementTree import ElementTree, Element, SubElement, tostring
-            from xml.etree import ElementTree as ET
             from xml.dom import minidom
             from model import *
             def prettify(elem):
                 """Return a pretty-printed XML string for the Element.
                 """
-                rough_string = ET.tostring(elem, 'utf-8')
+                rough_string = tostring(elem, 'utf-8')
                 reparsed = minidom.parseString(rough_string)
                 return reparsed.toprettyxml(indent="  ")

schainpy/gui/viewcontroller/basicwindow.py +20 -24

                         return 0
                     # if something happened
-                    parms_ok, output_path, blocksperfile, metada = self.checkInputsPUSave(datatype='SpectraHeis')
+                    parms_ok, output_path, blocksperfile, metadata_file = self.checkInputsPUSave(datatype='SpectraHeis')
                     if parms_ok:
                         name_operation = 'FitsWriter'
                         optype = 'other'
                         name_parameter3 = 'metadatafile'
                         value1 = output_path
                         value2 = blocksperfile
-                        value3 = metada
+                        value3 = metadata_file
                         format2 = "int"
                         format3 = "str"
                         opObj = puObj.addOperation(name=name_operation, optype=optype)
                         opObj.addParameter(name=name_parameter1, value=value1)
-                        opObj.addParameter(name=name_parameter2, value=value2, format=format2)
-                        opObj.addParameter(name=name_parameter3, value=value3, format=format3)
+                        if blocksperfile:
+                            opObj.addParameter(name=name_parameter2, value=value2, format=format2)
+                        if metadata_file:
+                            opObj.addParameter(name=name_parameter3, value=value3, format=format3)
                     self.console.clear()
                     try:
                             self.specHeisOutputMetada.clear()
                         else:
                             value = opObj.getParameterValue(parameterName='metadatafile')
-                            metada = str(value)
+                            metadata_file = str(value)
-                            self.specHeisOutputMetada.setText(metada)
+                            self.specHeisOutputMetada.setText(metadata_file)
                     return
                     if datatype == "SpectraHeis":
                         output_path = str(self.specHeisOutputPath.text())
                         blocksperfile = str(self.specHeisOutputblocksperfile.text())
-                        metada = str(self.specHeisOutputMetada.text())
+                        metadata_file = str(self.specHeisOutputMetada.text())
                     if output_path == '':
                         outputstr = 'Outputpath is empty'
                         self.console.append(outputstr)
                         parms_ok = False
-                        data_path = None
-                    if output_path != None:
-                        if not os.path.exists(output_path):
-                            outputstr = 'OutputPath:%s does not exists' % output_path
-                            self.console.append(outputstr)
-                            parms_ok = False
-                            output_path = None
+                    if not os.path.isdir(output_path):
+                        outputstr = 'OutputPath:%s does not exists' % output_path
+                        self.console.append(outputstr)
+                        parms_ok = False
                     try:
                         profilesperblock = int(profilesperblock)
                         blocksperfile = None
                     if datatype == "SpectraHeis":
-                        if metada == '':
+                        if metadata_file != '':
-                            outputstr = 'Choose metada file'
+                           if not os.path.isfile(metadata_file):
-                            self.console.append(outputstr)
+                                outputstr = 'Metadata file %s does not exist' % metadata_file
-                            parms_ok = False
-                        if metada != None:
-                           if not  os.path.isfile(metada):
-                                outputstr = 'Metadata:%s does not exists' % metada
                                 self.console.append(outputstr)
                                 parms_ok = False
-                                output_path = None
                     if datatype == "Voltage":
                         return parms_ok, output_path, blocksperfile, profilesperblock
                     if datatype == "SpectraHeis":
-                        return parms_ok, output_path, blocksperfile, metada
+                        return parms_ok, output_path, blocksperfile, metadata_file
                 def findDatafiles(self, data_path, ext, walk, expLabel=''):

schainpy/gui/viewer/windows/ui_spectra_heis.py +2 -2

                     self.tabWidgetSpectraHeis.setTabText(self.tabWidgetSpectraHeis.indexOf(self.tabgraphSpectraHeis), _translate("MainWindow", "Graphics", None))
                     self.label_67.setText(_translate("MainWindow", "Path:", None))
-                    self.label_68.setText(_translate("MainWindow", "Blocks  per File:", None))
+                    self.label_68.setText(_translate("MainWindow", "Blocks per file:", None))
                     self.label_66.setText(_translate("MainWindow", "Type:", None))
                     self.tabWidgetSpectraHeis.setTabText(self.tabWidgetSpectraHeis.indexOf(self.taboutputSpectraHeis), _translate("MainWindow", "Output", None))
                     self.specHeisOutputToolPath.setText(_translate("MainWindow", "...", None))
                     self.specHeisOutputComdata.setItemText(0, _translate("MainWindow", ".fits", None))
-                    self.label_69.setText(_translate("MainWindow", "Metada", None))
+                    self.label_69.setText(_translate("MainWindow", "Metadata file:", None))
                     self.specHeisOutputMetadaToolPath.setText(_translate("MainWindow", "...", None))
                     self.tabWidgetProject.setTabText(self.tabWidgetProject.indexOf(self.tabSpectraHeis), _translate("MainWindow", "SpectraHeis", None))

schainpy/model/data/jrodata.py 0 -4

                     return heis
-                def isEmpty(self):
-                    return self.flagNoData
                 def getNHeights(self):
                     return len(self.heightList)

schainpy/model/io/__init__.py 0 -5

             from jroIO_spectra import *
             from jroIO_heispectra import *
             from jroIO_usrp import *
-            # try:
-            #     from jroIO_usrp_api import *
-            # except:
-            #     print "jroIO_usrp_api could not be imported"
             from jroIO_amisr import *
             from jroIO_HDF5 import *

schainpy/model/io/jroIO_heispectra.py +27 -31

             import numpy
             import fnmatch
             import glob
+            from time import sleep
-            try:
-                from gevent import sleep
-            except:
-                from time import sleep
             try:
                 import pyfits
-            except:
+            except ImportError, e:
-                """
+                print "Fits data cannot be used. Install pyfits module"
-                """
             from xml.etree.ElementTree import ElementTree
             from jroIO_base import isRadarFolder, isNumber
+            from schainpy.model.data.jrodata import Fits
             from schainpy.model.proc.jroproc_base import Operation, ProcessingUnit
-            class Fits:
+            class PyFits(object):
                 name=None
                 format=None
                 array =None
                 def getElementName(self):
                     return self.ELEMENTNAME
-            class Metadata:
+            class Metadata(object):
                 def __init__(self, filename):
                     self.parmConfObjList = []
                     self.ext = '.fits'
                     self.setFile = 0
-                def setFitsHeader(self, dataOut, metadatafile):
+                def setFitsHeader(self, dataOut, metadatafile=None):
                     header_data = pyfits.PrimaryHDU()
-                    metadata4fits = Metadata(metadatafile)
+                    header_data.header['EXPNAME'] = "RADAR DATA"
-                    for parameter in metadata4fits.parmConfObjList:
+                    header_data.header['DATATYPE'] = "SPECTRA"
-                        parm_name = parameter.name
+                    header_data.header['COMMENT'] = ""
-                        parm_value = parameter.value
+                    if metadatafile:
-            #             if parm_value == 'fromdatadatetime':
+                        metadata4fits = Metadata(metadatafile)
-            #                 value = time.strftime("%b %d %Y %H:%M:%S", dataOut.datatime.timetuple())
-            #             elif parm_value == 'fromdataheights':
-            #                 value = dataOut.nHeights
-            #             elif parm_value == 'fromdatachannel':
-            #                 value = dataOut.nChannels
-            #             elif parm_value == 'fromdatasamples':
-            #                 value = dataOut.nFFTPoints
-            #             else:
-            #                 value = parm_value
-                        header_data.header[parm_name] = parm_value
+                        for parameter in metadata4fits.parmConfObjList:
+                            parm_name = parameter.name
+                            parm_value = parameter.value
+                            header_data.header[parm_name] = parm_value
                     header_data.header['DATETIME'] = time.strftime("%b %d %Y %H:%M:%S", dataOut.datatime.timetuple())
                     header_data.header['CHANNELLIST'] = str(dataOut.channelList)
                     self.addExtension(dataOut.heightList,'HEIGHTLIST')
-                def setup(self, dataOut, path, dataBlocksPerFile, metadatafile):
+                def setup(self, dataOut, path, dataBlocksPerFile=100, metadatafile=None):
                     self.path = path
                     self.dataOut = dataOut
                     self.dataOut.header = self.header_dict
                     self.dataOut.expName = self.expName
-                    self.dataOut.nChannels = self.nChannels
                     self.dataOut.timeZone = self.timeZone
                     self.dataOut.dataBlocksPerFile = self.dataBlocksPerFile
                     self.dataOut.comments = self.comments
                     self.dataOut.nCohInt = self.nCohInt
                     self.dataOut.nIncohInt = self.nIncohInt
+                    self.dataOut.ippSeconds = self.ippSeconds
                 def readHeader(self):
                     headerObj = self.fitsObj[0]
                     return 1
+                def printInfo(self):
+                    pass
                 def getData(self):
                     if not(self.readNextBlock()):
                         return 0
-                    if self.data == None:
+                    if self.data is None:
                         self.dataOut.flagNoData = True
                         return 0
                 subfolder = None
                 def __init__(self):
-                    self.wrObj = Fits()
+                    self.wrObj = PyFits()
             #        self.dataOut = dataOut
                     self.nTotalBlocks=0
             #        self.set = None

schainpy/model/proc/jroproc_heispectra.py +1 -1

                 def __updateObjFromFits(self):
                     self.dataOut.utctime = self.dataIn.utctime
-                    self.dataOut.channelIndexList = self.dataIn.channelIndexList
+            #         self.dataOut.channelIndexList = self.dataIn.channelIndexList
                     self.dataOut.channelList = self.dataIn.channelList
                     self.dataOut.heightList = self.dataIn.heightList

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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