##// END OF EJS Templates
schain-jc
RSS
base primer
José Chávez -
r1038:2da89ff4f915
parent child
Show More
Side by Side Unified
Context file:
r1038:2da89ff4f915 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1277,13 +1277,13 class JRODataReader(JRODataIO):
1277 1277
1278 1278 def setup(self,
1279 1279 path=None,
1280 startDate=None,
1281 endDate=None,
1282 startTime=datetime.time(0,0,0),
1283 endTime=datetime.time(23,59,59),
1284 set=None,
1285 expLabel = "",
1286 ext = None,
1280 startDate=None,
1281 endDate=None,
1282 startTime=datetime.time(0,0,0),
1283 endTime=datetime.time(23,59,59),
1284 set=None,
1285 expLabel = "",
1286 ext = None,
1287 1287 online = False,
1288 1288 delay = 60,
1289 1289 walk = True,
@@ -1291,76 +1291,8 class JRODataReader(JRODataIO):
1291 1291 nTxs = 1,
1292 1292 realtime=False,
1293 1293 blocksize=None,
1294 blocktime=None,
1295 queue=None,
1296 skip=None,
1297 cursor=None,
1298 warnings=True,
1299 verbose=True,
1300 server=None):
1301 if server is not None:
1302 if 'tcp://' in server:
1303 address = server
1304 else:
1305 address = 'ipc:///tmp/%s' % server
1306 self.server = address
1307 self.context = zmq.Context()
1308 self.receiver = self.context.socket(zmq.PULL)
1309 self.receiver.connect(self.server)
1310 time.sleep(0.5)
1311 print '[Starting] ReceiverData from {}'.format(self.server)
1312 else:
1313 self.server = None
1314 if path == None:
1315 raise ValueError, "[Reading] The path is not valid"
1316
1317 if ext == None:
1318 ext = self.ext
1319
1320 if online:
1321 print "[Reading] Searching files in online mode..."
1322
1323 for nTries in range( self.nTries ):
1324 fullpath, foldercounter, file, year, doy, set = self.__searchFilesOnLine(path=path, expLabel=expLabel, ext=ext, walk=walk, set=set)
1325
1326 if fullpath:
1327 break
1328
1329 print '[Reading] Waiting %0.2f sec for an valid file in %s: try %02d ...' % (self.delay, path, nTries+1)
1330 sleep( self.delay )
1331
1332 if not(fullpath):
1333 print "[Reading] There 'isn't any valid file in %s" % path
1334 return
1335
1336 self.year = year
1337 self.doy = doy
1338 self.set = set - 1
1339 self.path = path
1340 self.foldercounter = foldercounter
1341 last_set = None
1342 else:
1343 print "[Reading] Searching files in offline mode ..."
1344 pathList, filenameList = self.__searchFilesOffLine(path, startDate=startDate, endDate=endDate,
1345 startTime=startTime, endTime=endTime,
1346 set=set, expLabel=expLabel, ext=ext,
1347 walk=walk, cursor=cursor,
1348 skip=skip, queue=queue)
1349
1350 <<<<<<< HEAD
1351 if not(pathList):
1352 # print "[Reading] No *%s files in %s (%s - %s)"%(ext, path,
1353 # datetime.datetime.combine(startDate,startTime).ctime(),
1354 # datetime.datetime.combine(endDate,endTime).ctime())
1355
1356 # sys.exit(-1)
1294 blocktime=None):
1357 1295
1358 self.fileIndex = -1
1359 self.pathList = []
1360 self.filenameList = []
1361 return
1362
1363 =======
1364 1296 if path == None:
1365 1297 raise ValueError, "[Reading] The path is not valid"
1366 1298
@@ -1482,58 +1414,16 class JRODataReader(JRODataIO):
1482 1414 else:
1483 1415 print "[Reading] No files"
1484 1416
1485 >>>>>>> online_data_hour
1486 1417 self.fileIndex = -1
1487 self.pathList = pathList
1488 self.filenameList = filenameList
1489 file_name = os.path.basename(filenameList[-1])
1490 basename, ext = os.path.splitext(file_name)
1491 last_set = int(basename[-3:])
1492
1493 self.online = online
1494 self.realtime = realtime
1495 self.delay = delay
1496 ext = ext.lower()
1497 self.ext = ext
1498 self.getByBlock = getblock
1499 self.nTxs = nTxs
1500 self.startTime = startTime
1501 self.endTime = endTime
1502
1503 #Added-----------------
1504 self.selBlocksize = blocksize
1505 self.selBlocktime = blocktime
1506
1507 # Verbose-----------
1508 self.verbose = verbose
1509 self.warnings = warnings
1510
1511 <<<<<<< HEAD
1512 if not(self.setNextFile()):
1513 if (startDate!=None) and (endDate!=None):
1514 print "[Reading] No files in range: %s - %s" %(datetime.datetime.combine(startDate,startTime).ctime(), datetime.datetime.combine(endDate,endTime).ctime())
1515 elif startDate != None:
1516 print "[Reading] No files in range: %s" %(datetime.datetime.combine(startDate,startTime).ctime())
1517 else:
1518 print "[Reading] No files"
1519
1520 self.fileIndex = -1
1521 self.pathList = []
1522 self.filenameList = []
1523 return
1524
1525 # self.getBasicHeader()
1418 self.pathList = []
1419 self.filenameList = []
1420 return
1526 1421
1527 if last_set != None:
1528 self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock
1529 return
1530 =======
1531 1422 # self.getBasicHeader()
1532 1423
1533 1424 if last_set != None:
1534 1425 self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock
1535 1426 return
1536 >>>>>>> online_data_hour
1537 1427
1538 1428 def getBasicHeader(self):
1539 1429
General Comments 0
You need to be logged in to leave comments. Login now