Add files via upload
parent
567c691f3d
commit
74fdcbf657
|
@ -293,6 +293,7 @@ def main(args, files):
|
||||||
|
|
||||||
#######Determine number of input and output bands
|
#######Determine number of input and output bands
|
||||||
bandList = []
|
bandList = []
|
||||||
|
iMath['equations'] = []
|
||||||
for ii,expr in enumerate(args.equation.split(';')):
|
for ii,expr in enumerate(args.equation.split(';')):
|
||||||
|
|
||||||
#####Now parse the equation to get the file names used
|
#####Now parse the equation to get the file names used
|
||||||
|
@ -314,12 +315,16 @@ def main(args, files):
|
||||||
|
|
||||||
|
|
||||||
#####Determine unique images from the bandList
|
#####Determine unique images from the bandList
|
||||||
fileList = IML.bandsToFiles(bandList, logger)
|
fileList = IML.bandsToFiles(bandList, logger) #[a,b,c]
|
||||||
|
|
||||||
|
|
||||||
######Create input memmaps
|
######Create input memmaps
|
||||||
for ii,infile in enumerate(fileList):
|
for ii,infile in enumerate(fileList):
|
||||||
|
if type(files) == list:
|
||||||
fstr, files = parseInputFile(infile, files)
|
fstr, files = parseInputFile(infile, files)
|
||||||
|
else:
|
||||||
|
fstr = getattr(files, infile)
|
||||||
|
|
||||||
logger.debug('Input string for File %d: %s: %s'%(ii, infile, fstr))
|
logger.debug('Input string for File %d: %s: %s'%(ii, infile, fstr))
|
||||||
|
|
||||||
if len(fstr.split(';')) > 1:
|
if len(fstr.split(';')) > 1:
|
||||||
|
@ -341,6 +346,7 @@ def main(args, files):
|
||||||
if bbox is not None:
|
if bbox is not None:
|
||||||
iMath['bboxes'].append(bbox)
|
iMath['bboxes'].append(bbox)
|
||||||
|
|
||||||
|
if type(files) == list:
|
||||||
if len(files):
|
if len(files):
|
||||||
raise IOError('Unused input variables set:\n'+ ' '.join(files))
|
raise IOError('Unused input variables set:\n'+ ' '.join(files))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue