schain Commit - r1459:52714d4d854d · Jicamarca Repository

HDFWriter writes standard Weather parameters/Now we can run a type OTHER Operation even if flagNoData is True

rflores -

r1459:52714d4d854d

parent child

Context file:

r1459:52714d4d854d

schainpy/model/io/jroIO_digitalRF.py +4 0

                     self.__samples_to_read  = int(nSamples)  # FIJO: AHORA 40
+                    #self.__samples_to_read  = int(1000000)  # FIJO: AHORA 40
                     self.__nChannels        = len(self.__channelList)
                     #print("------------------------------------------")
                     #print("self.__samples_to_read",self.__samples_to_read)
                         for indexSubchannel in range(self.__num_subchannels):
                             try:
                                 t0     = time()
+                                #print("Unitindex",self.__thisUnixSample)
+                                #print("__samples_to_read",self.__samples_to_read)
                                 result = self.digitalReadObj.read_vector_c81d(self.__thisUnixSample,
                                                                               self.__samples_to_read,
                                                                               thisChannelName, sub_channel=indexSubchannel)
                             # ojo debo anadir el readNextBLock y el  __isBufferEmpty(
                             self.dataOut.flagNoData             = False
                             buffer = self.__data_buffer[:,self.__bufferIndex:self.__bufferIndex + self.__samples_to_read]
+                            #print("test",self.__bufferIndex)
                             buffer = buffer.reshape((self.__nChannels, self.nProfileBlocks, int(self.__samples_to_read/self.nProfileBlocks)))
                             self.dataOut.nProfileBlocks = self.nProfileBlocks
                             self.dataOut.data = buffer

schainpy/model/io/jroIO_param.py +44 -27

@@ -482,6 +482,8 class HDFWriter(Operation):
482		482
483	self.dataOut = dataOut	483	self.dataOut = dataOut
484	self.mode = mode	484	self.mode = mode
		485	self.var = dataList[0]
		486
485	if not(self.isConfig):	487	if not(self.isConfig):
486	self.setup(path=path, blocksPerFile=blocksPerFile,	488	self.setup(path=path, blocksPerFile=blocksPerFile,
487	metadataList=metadataList, dataList=dataList,	489	metadataList=metadataList, dataList=dataList,
@@ -532,33 +534,47 class HDFWriter(Operation):
532	setFile,	534	setFile,
533	ext )	535	ext )
534	elif self.setType == "weather":	536	elif self.setType == "weather":
535	print("HOLA AMIGOS")
536	wr_exp = self.dataOut.wr_exp
537	if wr_exp== "PPI":
538	wr_type = 'E'
539	ang_ = numpy.mean(self.dataOut.elevation)
540	else:
541	wr_type = 'A'
542	ang_ = numpy.mean(self.dataOut.azimuth)
543
544	wr_writer = '%s%s%2.1f%s'%('-',
545	wr_type,
546	ang_,
547	'-')
548	###print("wr_writer********************",wr_writer)
549	file = '%s%4.4d%2.2d%2.2d%s%2.2d%2.2d%2.2d%s%s%s' % (self.optchar,
550	timeTuple.tm_year,
551	timeTuple.tm_mon,
552	timeTuple.tm_mday,
553	'-',
554	timeTuple.tm_hour,
555	timeTuple.tm_min,
556	timeTuple.tm_sec,
557	wr_writer,
558	type_data,
559	ext )
560	###print("FILENAME", file)
561		537
		538	if self.var.lower() == 'Zdb'.lower():
		539	wr_type = 'Z'
		540	elif self.var.lower() == 'Zdb_D'.lower():
		541	wr_type = 'D'
		542	elif self.var.lower() == 'PhiD_P'.lower():
		543	wr_type = 'P'
		544	elif self.var.lower() == 'RhoHV_R'.lower():
		545	wr_type = 'R'
		546	elif self.var.lower() == 'velRadial_V'.lower():
		547	wr_type = 'V'
		548	elif self.var.lower() == 'Sigmav_W'.lower():
		549	wr_type = 'S'
		550	elif self.var.lower() == 'dataPP_POWER'.lower():
		551	wr_type = 'Pow'
		552	elif self.var.lower() == 'dataPP_DOP'.lower():
		553	wr_type = 'Dop'
		554
		555
		556	#Z_SOPHy_El10.0_20200505_14:02:15.h5
		557	#Z_SOPHy_Az40.0_20200505_14:02:15.h5
		558	if self.dataOut.flagMode == 1: #'AZI' #PPI
		559	ang_type = 'El'
		560	ang_ = round(numpy.mean(self.dataOut.data_ele),1)
		561	elif self.dataOut.flagMode == 0: #'ELE' #RHI
		562	ang_type = 'Az'
		563	ang_ = round(numpy.mean(self.dataOut.data_azi),1)
		564
		565	file = '%s%s%s%2.1f%s%2.2d%2.2d%2.2d%s%2.2d%2.2d%2.2d%s' % (wr_type,
		566	'_SOPHy_',
		567	ang_type,
		568	ang_,
		569	'_',
		570	timeTuple.tm_year,
		571	timeTuple.tm_mon,
		572	timeTuple.tm_mday,
		573	'_',
		574	timeTuple.tm_hour,
		575	timeTuple.tm_min,
		576	timeTuple.tm_sec,
		577	ext )
562		578
563	else:	579	else:
564	setFile = timeTuple.tm_hour*60+timeTuple.tm_min	580	setFile = timeTuple.tm_hour*60+timeTuple.tm_min
@@ -571,7 +587,7 class HDFWriter(Operation):
571	self.filename = os.path.join( path, subfolder, file )	587	self.filename = os.path.join( path, subfolder, file )
572		588
573	#Setting HDF5 File	589	#Setting HDF5 File
574		590	print("filename",self.filename)
575	self.fp = h5py.File(self.filename, 'w')	591	self.fp = h5py.File(self.filename, 'w')
576	#write metadata	592	#write metadata
577	self.writeMetadata(self.fp)	593	self.writeMetadata(self.fp)
@@ -682,6 +698,7 class HDFWriter(Operation):
682	return	698	return
683		699
684	def putData(self):	700	def putData(self):
		701
685	if (self.blockIndex == self.blocksPerFile) or self.timeFlag():# or self.generalFlag_vRF():	702	if (self.blockIndex == self.blocksPerFile) or self.timeFlag():# or self.generalFlag_vRF():
686	self.closeFile()	703	self.closeFile()
687	self.setNextFile()	704	self.setNextFile()

schainpy/model/proc/jroproc_base.py +11 -1

@@ -86,7 +86,17 class ProcessingUnit(object):
86	##### correcion de la declaracion Out	86	##### correcion de la declaracion Out
87	for op, optype, opkwargs in self.operations:	87	for op, optype, opkwargs in self.operations:
88	aux = self.dataOut.copy()	88	aux = self.dataOut.copy()
89	if optype == 'other' and not self.dataOut.flagNoData:	89	'''
		90	print("op",op)
		91	try:
		92	print("runNextOp",self.dataOut.runNextOp)
		93	except:
		94	pass
		95	'''
		96	if not hasattr(self.dataOut, 'runNextOp'):
		97	self.dataOut.runNextOp = False
		98	if optype == 'other' and (not self.dataOut.flagNoData or self.dataOut.runNextOp):
		99	#if optype == 'other' and not self.dataOut.flagNoData:
90	self.dataOut = op.run(self.dataOut, **opkwargs)	100	self.dataOut = op.run(self.dataOut, **opkwargs)
91	elif optype == 'external' and not self.dataOut.flagNoData:	101	elif optype == 'external' and not self.dataOut.flagNoData:
92	#op.queue.put(self.dataOut)	102	#op.queue.put(self.dataOut)

schainpy/model/proc/jroproc_parameters.py +4 -3

                     Add a profile to he __buffer and increase in one the __profiel Index
                     '''
                     tmp= getattr(data, attr)
-                    if tmp.shape[0] is not 2:
+                    if tmp.shape[0] != 2:
                         size_tmp= tmp.shape[0]
                         tmp=tmp.reshape(1,size_tmp)
                         if diff_angle > 0: #Subida
                             return 0
-                def run(self, dataOut, attr_data='dataPP_POWER', axis=None,**kwargs):
+                def run(self, dataOut, attr_data='dataPP_POWER', axis=None, runNextOp = False,**kwargs):
                     dataOut.attr_data = attr_data
+                    dataOut.runNextOp = runNextOp
                     dataOut.flagMode = axis[0] #Provisional, debería venir del header
                         dataOut.data_ele  = data_e
                         dataOut.utctime  = avgdatatime
                         dataOut.flagNoData  = False
-                        print("********************attr_data********************",attr_data)
+                        #print("********************attr_data********************",attr_data)
                         #print(data_360.shape)
                         #print(dataOut.heightList)

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

                         if not dataOut.flagCohInt:
                             dataOut.nCohInt *= self.n
                             dataOut.flagCohInt = True
-                        dataOut.utctime = avgdatatime
+                        ####################################dataOut.utctime = avgdatatime
                         # print avgdata, avgdatatime
                         # raise
                         #   dataOut.timeInterval = dataOut.ippSeconds * dataOut.nCohInt
                 def run(self, dataOut,n = None,removeDC= False, overlapping= False,**kwargs):
                     if dataOut.flagDataAsBlock:
-                        n = dataOut.nProfiles
+                        n = int(dataOut.nProfiles)
+                        #print("n",n)
                     if not self.isConfig:
                         self.setup(dataOut = dataOut, n    = n , removeDC=removeDC , **kwargs)

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