##// END OF EJS Templates
Correccion del Modo OnLine.
Alexander Valdez -
r551:62ee7a990034
parent child
Show More
@@ -171,7 +171,7 class HFReader(ProcessingUnit):
171
171
172 self.flagNoMoreFiles= False
172 self.flagNoMoreFiles= False
173
173
174 self.__waitForNewFile = 20
174 self.__waitForNewFile = 3
175
175
176
176
177 #--------------------------------------------------
177 #--------------------------------------------------
@@ -211,8 +211,9 class HFReader(ProcessingUnit):
211 self.__nSamples=1000
211 self.__nSamples=1000
212 self.__deltaHeigth=1.5
212 self.__deltaHeigth=1.5
213 self.__sample_rate=1e5
213 self.__sample_rate=1e5
214 self.__frequency=2.72e6
214 #self.__frequency=2.72e6
215 #self.__frequency=3.64e6
215 #self.__frequency=3.64e6
216 self.__frequency=None
216 self.__online = False
217 self.__online = False
217
218
218 #print "Frequency of Operation:", self.__frequency
219 #print "Frequency of Operation:", self.__frequency
@@ -232,6 +233,7 class HFReader(ProcessingUnit):
232 else:
233 else:
233 self.status=0
234 self.status=0
234 print 'Path %s does not exits'%self.path
235 print 'Path %s does not exits'%self.path
236 return
235 return
237 return
236
238
237 def __selDates(self, hf_dirname_format):
239 def __selDates(self, hf_dirname_format):
@@ -304,13 +306,15 class HFReader(ProcessingUnit):
304 #print "hola"
306 #print "hola"
305 #print self.dirnameList
307 #print self.dirnameList
306 dirList = [os.path.join(self.path,x) for x in self.dirnameList]
308 dirList = [os.path.join(self.path,x) for x in self.dirnameList]
307 self.filenameList= dirList
309 self.filenameList= dirList
308
310
309 def __selectDataForTimes(self, online=False):
311 def __selectDataForTimes(self, online=False):
310
312
311 if not(self.status):
313 if not(self.status):
312 return None
314 return None
315 #----------------
313 self.__getFilenameList()
316 self.__getFilenameList()
317 #----------------
314 if not(online):
318 if not(online):
315 if not(self.all):
319 if not(self.all):
316 self.__getTimeFromData()
320 self.__getTimeFromData()
@@ -364,45 +368,49 class HFReader(ProcessingUnit):
364 set=None):
368 set=None):
365
369
366
370
367
371 startDate = datetime.datetime.utcnow().date()
372 endDate = datetime.datetime.utcnow().date()
373
368 self.__setParameters(path=path,startDate=startDate,endDate=endDate,walk=walk)
374 self.__setParameters(path=path,startDate=startDate,endDate=endDate,walk=walk)
369
375
370 self.__checkPath()
376 self.__checkPath()
371
377
372 fullpath=path
378 # fullpath=path
373
379 #
374 print "%s folder was found: " %(fullpath )
380 # print "%s folder was found: " %(fullpath )
375
381 #
376 if set == None:
382 # if set == None:
377 filename =getlastFileFromPath(fullpath,ext)
383 # filename =getlastFileFromPath(fullpath,ext)
378 startDate= datetime.datetime.utcnow().date
384 # startDate= datetime.datetime.utcnow().date
379 endDate= datetime.datetime.utcnow().date()
385 # endDate= datetime.datetime.utcnow().date()
380
386 #
381 else:
387 # else:
382 filename= getFileFromSet(fullpath,ext,set)
388 # filename= getFileFromSet(fullpath,ext,set)
383 startDate=None
389 # startDate=None
384 endDate=None
390 # endDate=None
385
391 #
386 if not (filename):
392 # if not (filename):
387 return None,None,None,None,None
393 # return None,None,None,None,None
388 print "%s file was found" %(filename)
394 # print "%s file was found" %(filename)
389
395 #
390 dir_hf_filename= self.path+"/"+filename
396 # dir_hf_filename= self.path+"/"+filename
391 fp= h5py.File(dir_hf_filename,'r')
397 # fp= h5py.File(dir_hf_filename,'r')
392 hipoc=fp['t'].value
398 # hipoc=fp['t'].value
393 fp.close()
399 # fp.close()
394 date_time=stuffr.unix2datestr(hipoc)
400 # date_time=stuffr.unix2datestr(hipoc)
395
401 #
396 year =int(date_time[0:4])
402 # year =int(date_time[0:4])
397 month=int(date_time[5:7])
403 # month=int(date_time[5:7])
398 dom =int(date_time[8:10])
404 # dom =int(date_time[8:10])
399 set= int(filename[4:10])
405 # set= int(filename[4:10])
400 self.set=set-1
406 # self.set=set-1
401 #self.dirnameList=[filename]
407 #self.dirnameList=[filename]
402 self.__findDataForDates(online=True)
408 self.__findDataForDates(online=True)
409 self.dirnameList=[self.dirnameList[-1]]
403 #print self.dirnameList
410 #print self.dirnameList
404 self.__selectDataForTimes(online=True)
411 self.__selectDataForTimes(online=True)
405 return fullpath,filename,year,month,dom,set
412 #return fullpath,filename,year,month,dom,set
413 return
406
414
407 def __setNextFile(self,online=False):
415 def __setNextFile(self,online=False):
408 """
416 """
@@ -446,14 +454,7 class HFReader(ProcessingUnit):
446
454
447 def __setNextFileOnline(self):
455 def __setNextFileOnline(self):
448 """
456 """
449 """
457 """
450
451 self.set +=1
452 if self.set>8638:
453 print "There is no file with %s "%self.set
454 return
455
456
457 filename = self.filenameList[0]
458 filename = self.filenameList[0]
458 if self.filename_online != None:
459 if self.filename_online != None:
459 self.__selectDataForTimes(online=True)
460 self.__selectDataForTimes(online=True)
@@ -520,18 +521,19 class HFReader(ProcessingUnit):
520 self.__searchFilesOffline(path, startDate, endDate, ext, startTime, endTime, walk)
521 self.__searchFilesOffline(path, startDate, endDate, ext, startTime, endTime, walk)
521 else:
522 else:
522 print "Searching files in online mode..."
523 print "Searching files in online mode..."
524 self.__searchFilesOnline(path, walk)
523
525
524 for nTries in range(self.nTries):
526 # for nTries in range(self.nTries):
525
527 #
526 fullpath,file,year,month,day,set = self.__searchFilesOnline(path=path,expLabel=expLabel,ext=ext, walk=walk,set=set)
528 # fullpath,file,year,month,day,set = self.__searchFilesOnline(path=path,expLabel=expLabel,ext=ext, walk=walk,set=set)
527
529 #
528 if fullpath:
530 # if fullpath:
529 break
531 # break
530 print '\tWaiting %0.2f sec for an valid file in %s: try %02d ...' % (self.delay, path, nTries+1)
532 # print '\tWaiting %0.2f sec for an valid file in %s: try %02d ...' % (self.delay, path, nTries+1)
531 time.sleep(self.delay)
533 # time.sleep(self.delay)
532 if not(fullpath):
534 # if not(fullpath):
533 print "There ins't valid files in %s" % path
535 # print "There ins't valid files in %s" % path
534 return None
536 # return None
535
537
536
538
537 if not(self.filenameList):
539 if not(self.filenameList):
General Comments 0
You need to be logged in to leave comments. Login now