diff --git a/schainpy2/IO/JRODataIO.py b/schainpy2/IO/JRODataIO.py index acde4e9..ce703a7 100644 --- a/schainpy2/IO/JRODataIO.py +++ b/schainpy2/IO/JRODataIO.py @@ -254,11 +254,17 @@ class JRODataReader(JRODataIO): pass else: - print "Searching file in offline mode" + print "Searching files in offline mode" pathList, filenameList = self.__searchFilesOffLine(path, startDate, endDate, startTime, endTime, set, expLabel, ext) + if not(pathList): - print "No files in range: %s - %s"%(datetime.datetime.combine(startDate,startTime).ctime(), datetime.datetime.combine(endDate,endTime).ctime()) - return None + print "No *%s files into the folder %s \nfor the range: %s - %s"%(ext, path, + datetime.datetime.combine(startDate,startTime).ctime(), + datetime.datetime.combine(endDate,endTime).ctime()) + + sys.exit(-1) + + self.fileIndex = -1 self.pathList = pathList self.filenameList = filenameList @@ -275,7 +281,7 @@ class JRODataReader(JRODataIO): else: print "No files" - return None + sys.exit(-1) # self.updateDataHeader() diff --git a/schainpy2/IO/SpectraIO.py b/schainpy2/IO/SpectraIO.py index 9c57381..25bb612 100644 --- a/schainpy2/IO/SpectraIO.py +++ b/schainpy2/IO/SpectraIO.py @@ -377,7 +377,7 @@ class SpectraReader(JRODataReader): self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy() - return self.data_spc + return self.dataOutObj.data_spc class SpectraWriter(JRODataWriter): diff --git a/schainpy2/testSchainSpecExp.py b/schainpy2/testSchainSpecExp.py index ed88632..f67e0db 100644 --- a/schainpy2/testSchainSpecExp.py +++ b/schainpy2/testSchainSpecExp.py @@ -11,7 +11,7 @@ path = os.path.split(os.getcwd())[0] sys.path.append(path) -from Data.Spectra import Spectra +from Data.JROData import Spectra from IO.SpectraIO import * from Processing.SpectraProcessor import *