From de96659ace582fe76cde3b60821a8e48dba50c40 2014-10-29 16:01:01 From: Daniel Valdez Date: 2014-10-29 16:01:01 Subject: [PATCH] Bug Fixed: AMISR Setup File does not correspond with the experiment range dates Bug Fixed: Coherent Integration, the input parameter 'timeInterval' should be in seconds unit --- diff --git a/schainpy/model/io/jroIO_amisr.py b/schainpy/model/io/jroIO_amisr.py index 5adce7c..14ce32b 100644 --- a/schainpy/model/io/jroIO_amisr.py +++ b/schainpy/model/io/jroIO_amisr.py @@ -248,11 +248,19 @@ class AMISRReader(ProcessingUnit): else: self.status = 0 return None - return 1 + else: #get the last file - 1 self.filenameList = [self.filenameList[-2]] - return 1 + + new_dirnameList = [] + for dirname in self.dirnameList: + junk = numpy.array([dirname in x for x in self.filenameList]) + junk_sum = junk.sum() + if junk_sum > 0: + new_dirnameList.append(dirname) + self.dirnameList = new_dirnameList + return 1 def __searchFilesOnline(self, path, diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 9f4f625..bd76f6f 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -282,7 +282,7 @@ class CohInt(Operation): self.n = n self.__byTime = False else: - self.__integrationtime = timeInterval * 60. #if (type(timeInterval)!=integer) -> change this line + self.__integrationtime = timeInterval #* 60. #if (type(timeInterval)!=integer) -> change this line self.n = 9999 self.__byTime = True