##// END OF EJS Templates
schain-jc
RSS
merge con online_data_hour
José Chávez -
r1039:a86c6846b78a
parent child
Show More
Side by Side Unified
Context file:
r1039:a86c6846b78a Loading diff...:
Show file before | Show file after | Hide comments
@@ -1491,33 +1491,31 class JRODataReader(JRODataIO):
1491 1491
1492 1492 self.__printInfo = False
1493 1493
1494
1495 1494 def run(self,
1496 path=None,
1497 startDate=None,
1498 endDate=None,
1499 startTime=datetime.time(0,0,0),
1500 endTime=datetime.time(23,59,59),
1501 set=None,
1502 expLabel = "",
1503 ext = None,
1504 online = False,
1505 delay = 60,
1506 walk = True,
1507 getblock = False,
1508 nTxs = 1,
1509 realtime=False,
1510 blocksize=None,
1511 blocktime=None,
1512 queue=None,
1513 skip=None,
1514 cursor=None,
1515 warnings=True,
1516 server=None,
1517 verbose=True, **kwargs):
1495 path=None,
1496 startDate=None,
1497 endDate=None,
1498 startTime=datetime.time(0,0,0),
1499 endTime=datetime.time(23,59,59),
1500 set=None,
1501 expLabel = "",
1502 ext = None,
1503 online = False,
1504 delay = 60,
1505 walk = True,
1506 getblock = False,
1507 nTxs = 1,
1508 realtime=False,
1509 blocksize=None,
1510 blocktime=None,
1511 queue=None,
1512 skip=None,
1513 cursor=None,
1514 warnings=True,
1515 server=None,
1516 verbose=True, **kwargs):
1518 1517
1519 1518 if not(self.isConfig):
1520 <<<<<<< HEAD
1521 1519 # self.dataOut = dataOut
1522 1520 self.setup( path=path,
1523 1521 startDate=startDate,
@@ -1540,12 +1538,7 class JRODataReader(JRODataIO):
1540 1538 cursor=cursor,
1541 1539 warnings=warnings,
1542 1540 server=server,
1543 verbose=verbose)
1544 =======
1545
1546 # self.dataOut = dataOut
1547 self.setup(**kwargs)
1548 >>>>>>> online_data_hour
1541 verbose=verbose, **kwargs)
1549 1542 self.isConfig = True
1550 1543 if server is None:
1551 1544 self.getData()
@@ -1668,15 +1661,9 class JRODataWriter(JRODataIO):
1668 1661 Return:
1669 1662 None
1670 1663 """
1671 <<<<<<< HEAD
1672
1673 # CALCULAR PARAMETROS
1674
1675 =======
1676 1664
1677 # CALCULAR PARAMETROS
1665 # CALCULAR PARAMETROS
1678 1666
1679 >>>>>>> online_data_hour
1680 1667 sizeLongHeader = self.systemHeaderObj.size + self.radarControllerHeaderObj.size + self.processingHeaderObj.size
1681 1668 self.basicHeaderObj.size = self.basicHeaderSize + sizeLongHeader
1682 1669
General Comments 0
You need to be logged in to leave comments. Login now