schain Commit - r1310:ce24778ee4ae · Jicamarca Repository

Fix ScpecraWriter and CohInt attribute

Juan C. Espinoza -

r1310:ce24778ee4ae

parent child

Context file:

r1310:ce24778ee4ae

Collapse all files

CHANGELOG.md +21 -21

-            ## CHANGELOG:
+            # CHANGELOG:
-            ### 3.0
+            ## 3.0
             * Python 3.x & 2.X compatible
             * New architecture with multiprocessing support
             * Add @MPDecorator for multiprocessing Operations (Plots, Writers and Publishers)
             * Clean controller to optimize scripts (format & optype are no longer required)
             * New GUI with dinamic load of Units and operations (use Kivy framework)
-            ### 2.3
+            ## 2.3
             * Added support for Madrigal formats (reading/writing).
             * Added support for reading BLTR parameters (*.sswma).
             * Added support for reading Julia format (*.dat).
             * Updated README for MAC OS GUI installation.
             * Setup now installs numpy.
-            ### 2.2.6
+            ## 2.2.6
             * Graphics generated by the GUI are now the same as generated by scripts. Issue #1074.
             * Added support for C extensions.
             * Function `hildebrand_sehkon` optimized with a C wrapper.
             * Numpy version updated.
             * Migration to GIT.
-            ### 2.2.5:
+            ## 2.2.5:
             * splitProfiles and combineProfiles modules were added to VoltageProc and Signal Chain GUI.
             * nProfiles of USRP data (hdf5) is the number of profiles thera are in one second.
             * jroPlotter works directly with data objects instead of dictionaries
             * script "schain" was added to Signal Chain installer
-            ### 2.2.4.1:
+            ## 2.2.4.1:
             * jroIO_usrp.py is update to read Sandra's data
             * decimation in Spectra and RTI plots is always enabled.
             * time* window option added to GUI
-            ### 2.2.4:
+            ## 2.2.4:
             * jroproc_spectra_lags.py added to schainpy
             * Bug fixed in schainGUI: ProcUnit was created with the same id in some cases.
             * Bug fixed in jroHeaderIO: Header size validation.
-            ### 2.2.3.1:
+            ## 2.2.3.1:
             * Filtering block by time has been added.
             * Bug fixed plotting RTI, CoherenceMap and others using xmin and xmax parameters. The first day worked
             properly but the next days did not.
-            ### 2.2.3:
+            ## 2.2.3:
             * Bug fixed in GUI: Error getting(reading) Code value
             * Bug fixed in GUI: Flip option always needs channelList field
             * Bug fixed in jrodata: when one branch modified a value in "dataOut" (example: dataOut.code) this value
             was modified for every branch (because this was a reference). It was modified in data.copy()
             * Bug fixed in jroproc_voltage.profileSelector(): rangeList replaces to profileRangeList.
-            ### 2.2.2:
+            ## 2.2.2:
             * VoltageProc: ProfileSelector, Reshape, Decoder with nTxs!=1 and getblock=True was tested
             * Rawdata and testRawdata.py added to Signal Chain project
-            ### 2.2.1:
+            ## 2.2.1:
             * Bugs fixed in GUI
             * Views were improved in GUI
             * Support to MST* ISR experiments
             * Bug fixed getting noise using hyldebrant. (minimum number of points > 20%)
             * handleError added to jroplotter.py
-            ### 2.2.0:
+            ## 2.2.0:
             * GUI: use of external plotter
             * Compatible with matplotlib 1.5.0
-            ### 2.1.5:
+            ## 2.1.5:
             * serializer module added to Signal Chain
             * jroplotter.py added to Signal Chain
-            ### 2.1.4.2:
+            ## 2.1.4.2:
             * A new Plotter Class was added
             * Project.start() does not accept filename as a parameter anymore
-            ### 2.1.4.1:
+            ## 2.1.4.1:
             * Send notifications when an error different to ValueError is detected
-            ### 2.1.4:
+            ## 2.1.4:
             * Sending error notifications to signal chain administrator
             * Login to email server added
-            ### 2.1.3.3:
+            ## 2.1.3.3:
             * Colored Button Icons were added to GUI
-            ### 2.1.3.2:
+            ## 2.1.3.2:
             * GUI: user interaction enhanced
             * controller_api.py: Safe access to ControllerThead
-            ### 2.1.3.1:
+            ## 2.1.3.1:
             * GUI: every icon were resized
             * jroproc_voltage.py: Print a message when "Read from code" option is selected and the code is not defined inside data file
-            ### 2.1.3:
+            ## 2.1.3:
             * jroplot_heispectra.py: SpectraHeisScope was not showing the right channels
             * jroproc_voltage.py: Bug fixed selecting profiles (self.nProfiles took a wrong value),
             					 Bug fixed selecting heights by block (selecting profiles instead heights)
             * jroIO_heispectra.py: Bug fixed in FitsReader. Using local Fits instance instead schainpy.mode.data.jrodata.Fits.
             * jroIO_heispectra.py: Channel index list does not exist.
-            ### 2.1.2:
+            ## 2.1.2:
             * jroutils_ftp.py: Bug fixed, Any error sending file stopped the Server Thread
             				  Server thread opens and closes remote server each time file list is sent
             * jroplot_spectra.py: Noise path was not being created when noise data is saved.

schainpy/model/data/jrodata.py +1 0

                     self.errorCount = None
                     self.nCohInt = None
                     self.blocksize = None
+                    self.flagCohInt = False
                     self.flagDecodeData = False  # asumo q la data no esta decodificada
                     self.flagDeflipData = False  # asumo q la data no esta sin flip
                     self.flagShiftFFT = False

schainpy/model/io/jroIO_base.py +35 -40

@@ -899,7 +899,8 class JRODataReader(Reader):
899	def readNextBlock(self):	899	def readNextBlock(self):
900		900
901	while True:	901	while True:
902	self.__setNewBlock()	902	if not(self.__setNewBlock()):
		903	continue
903		904
904	if not(self.readBlock()):	905	if not(self.readBlock()):
905	return 0	906	return 0
@@ -954,55 +955,49 class JRODataReader(Reader):
954	# self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)	955	# self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
955	self.getBlockDimension()	956	self.getBlockDimension()
956		957
957	def verifyFile(self, filename, ~~msgFlag~~=~~True~~):	958	def verifyFile(self, filename):
958		959
959	msg = ~~Non~~e	960	flag = True
960		961
961	try:	962	try:
962	fp = open(filename, 'rb')	963	fp = open(filename, 'rb')
963	except IOError:	964	except IOError:
964		965	log.error("File {} can't be opened".format(filename), self.name)
965	if msgFlag:
966	print("[Reading] File %s can't be opened" % (filename))
967
968	return False	966	return False
969		967
970	if self.waitDataBlock(0):	968	if self.online and self.waitDataBlock(0):
971	basicHeaderObj = BasicHeader(LOCALTIME)	969	pass
972	systemHeaderObj = SystemHeader()	970
973	radarControllerHeaderObj = RadarControllerHeader()	971	basicHeaderObj = BasicHeader(LOCALTIME)
974	~~processing~~HeaderObj = ~~Processing~~Header()	972	systemHeaderObj = SystemHeader()
975		973	radarControllerHeaderObj = RadarControllerHeader()
976	if not(basicHeaderObj.read(fp)):	974	processingHeaderObj = ProcessingHeader()
977	fp.close()	975
978	return False	976	if not(basicHeaderObj.read(fp)):
979		977	flag = False
980	if not(systemHeaderObj.read(fp)):	978	if not(systemHeaderObj.read(fp)):
981	fp.~~close~~()	979	flag = False
982	return False	980	if not(radarControllerHeaderObj.read(fp)):
983		981	flag = False
984	if not(~~radarController~~HeaderObj.read(fp)):	982	if not(processingHeaderObj.read(fp)):
985	fp.~~close~~()	983	flag = False
986	return False	984	if not self.online:
987		985	dt1 = basicHeaderObj.datatime
988	if ~~not~~(processingHeaderObj.~~read~~(fp~~)):~~	986	pos = self.fileSize-processingHeaderObj.blockSize-24
989	fp.~~close~~()	987	if pos<0:
990	~~return~~ False	988	flag = False
991		989	log.error('Invalid size for file: {}'.format(self.filename), self.name)
992	if ~~not~~ ~~self~~.~~onlin~~e:	990	else:
993	dt1 = basicHeaderObj.datatime	991	fp.seek(pos)
994	fp.seek(self.fileSize-processingHeaderObj.blockSize-24)
995	if not(basicHeaderObj.read(fp)):	992	if not(basicHeaderObj.read(fp)):
996	fp.~~close~~()	993	flag = False
997	return False	994	dt2 = basicHeaderObj.datatime
998	dt2 = basicHeaderObj.datatime	995	if not self.isDateTimeInRange(dt1, self.startDate, self.endDate, self.startTime, self.endTime) and not \
999	if ~~not~~ self.isDateTimeInRange(dt1, self.startDate, self.endDate, self.startTime, self.endTime) ~~and~~ ~~not~~ \	996	self.isDateTimeInRange(dt2, self.startDate, self.endDate, self.startTime, self.endTime):
1000	self.isDateTimeInRange(dt2, self.startDate, self.endDate, self.startTime, self.endTime):	997	flag = False
1001	return False
1002		998
1003	fp.close()	999	fp.close()
1004		1000	return flag
1005	return True
1006		1001
1007	def findDatafiles(self, path, startDate=None, endDate=None, expLabel='', ext='.r', walk=True, include_path=False):	1002	def findDatafiles(self, path, startDate=None, endDate=None, expLabel='', ext='.r', walk=True, include_path=False):
1008		1003

schainpy/model/io/jroIO_spectra.py +2 -2

                     spc = numpy.transpose( self.data_spc, (0,2,1) )
                     if not self.processingHeaderObj.shif_fft:
-                        spc = numpy.roll( spc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
+                        spc = numpy.roll( spc, int(self.processingHeaderObj.profilesPerBlock/2), axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                     data = spc.reshape((-1))
                     data = data.astype(self.dtype[0])
                     data.tofile(self.fp)
                         data = numpy.zeros( numpy.shape(cspc), self.dtype )
                         #print 'data.shape', self.shape_cspc_Buffer
                         if not self.processingHeaderObj.shif_fft:
-                            cspc = numpy.roll( cspc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
+                            cspc = numpy.roll( cspc, int(self.processingHeaderObj.profilesPerBlock/2), axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                         data['real'] = cspc.real
                         data['imag'] = cspc.imag
                         data = data.reshape((-1))

schainpy/model/proc/jroproc_base.py +2 -2

                         elif 'SchainError' in err:
                             log.error(err.split('SchainError:')[-1].split('\n')[0].strip(), self.name)
                         else:
-                            log.error(err.split('\n')[-2], self.name)
+                            log.error(err, self.name)
                         self.dataOut.error = True
                     for op, optype, opkwargs in self.operations:
                                     BaseClass.run(self, dataOut, **self.kwargs)
                                 except:
                                     err = traceback.format_exc()
-                                    log.error(err.split('\n')[-2], self.name)
+                                    log.error(err, self.name)
                             else:
                                 break

schainpy/model/proc/jroproc_voltage.py +3 -3

                     Operation.__init__(self, **kwargs)
-                    #   self.isConfig = False
                 def setup(self, n=None, timeInterval=None, stride=None, overlapping=False, byblock=False):
                     """
                     Set the parameters of the integration class.
                     if self.__dataReady:
                         dataOut.data = avgdata
-                        dataOut.nCohInt *= self.n
+                        if not dataOut.flagCohInt:
+                            dataOut.nCohInt *= self.n
+                            dataOut.flagCohInt = True
                         dataOut.utctime = avgdatatime
                         # print avgdata, avgdatatime
                         # raise

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