##// END OF EJS Templates
schain-jc
RSS
jroIO_base.py: Compare dates when startTime > endTime
Miguel Valdez -
r652:303180c98d9d
parent child
Show More
Show file before | Show file after | Hide comments
@@ -83,13 +83,17 def isFileInEpoch(filename, startUTSeconds, endUTSeconds):
83
83
84 return 1
84 return 1
85
85
86 def isFileInTimeRange(filename, startTime, endTime):
86 def isFileInTimeRange(filename, startDate, endDate, startTime, endTime):
87 """
87 """
88 Retorna 1 si el archivo de datos se encuentra dentro del rango de horas especificado.
88 Retorna 1 si el archivo de datos se encuentra dentro del rango de horas especificado.
89
89
90 Inputs:
90 Inputs:
91 filename : nombre completo del archivo de datos en formato Jicamarca (.r)
91 filename : nombre completo del archivo de datos en formato Jicamarca (.r)
92
92
93 startDate : fecha inicial del rango seleccionado en formato datetime.date
94
95 endDate : fecha final del rango seleccionado en formato datetime.date
96
93 startTime : tiempo inicial del rango seleccionado en formato datetime.time
97 startTime : tiempo inicial del rango seleccionado en formato datetime.time
94
98
95 endTime : tiempo final del rango seleccionado en formato datetime.time
99 endTime : tiempo final del rango seleccionado en formato datetime.time
@@ -116,6 +120,7 def isFileInTimeRange(filename, startTime, endTime):
116 fp.close()
120 fp.close()
117
121
118 thisDatetime = basicHeaderObj.datatime
122 thisDatetime = basicHeaderObj.datatime
123 thisDate = thisDatetime.date()
119 thisTime = thisDatetime.time()
124 thisTime = thisDatetime.time()
120
125
121 if not(sts):
126 if not(sts):
@@ -140,6 +145,12 def isFileInTimeRange(filename, startTime, endTime):
140 #-----------o----------------------------o-----------
145 #-----------o----------------------------o-----------
141 # endTime startTime
146 # endTime startTime
142
147
148 if (thisDate == startDate) and (thisTime < startTime):
149 return None
150
151 if (thisDate == endDate) and (thisTime > endTime):
152 return None
153
143 if (thisTime < startTime) and (thisTime > endTime):
154 if (thisTime < startTime) and (thisTime > endTime):
144 return None
155 return None
145
156
@@ -554,7 +565,7 class JRODataReader(JRODataIO):
554 return None, None
565 return None, None
555
566
556 if len(dateList) > 1:
567 if len(dateList) > 1:
557 print "[Reading] %d dates with data were found for the date range: %s - %s" %(len(dateList), startDate, endDate)
568 print "[Reading] %d days were found in date range: %s - %s" %(len(dateList), startDate, endDate)
558 else:
569 else:
559 print "[Reading] data was found for the date %s" %(dateList[0])
570 print "[Reading] data was found for the date %s" %(dateList[0])
560
571
@@ -574,7 +585,7 class JRODataReader(JRODataIO):
574 if not isFileInDateRange(filename, startDate, endDate):
585 if not isFileInDateRange(filename, startDate, endDate):
575 continue
586 continue
576
587
577 thisDatetime = isFileInTimeRange(filename, startTime, endTime)
588 thisDatetime = isFileInTimeRange(filename, startDate, endDate, startTime, endTime)
578
589
579 if not(thisDatetime):
590 if not(thisDatetime):
580 continue
591 continue
General Comments 0
You need to be logged in to leave comments. Login now