diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index 2bd5fd234..199304b0e 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -124,8 +124,7 @@ for file in files: i += s #--- do work ------------------------------------------------------------------------------------ - newInfo['grid'] = np.array([{True: int(o*float(n.translate(None,'xX'))), - False: int(n.translate(None,'xX'))}[n[-1].lower() == 'x'] for o,n in zip(info['grid'],options.grid)],'i') + newInfo['grid'] = np.array(int(o*float(n.translate(None,'xX'))) if [n[-1].lower() == 'x' else int(n.translate(None,'xX'))}[n[-1].lower() == 'x'] for o,n in zip(info['grid'],options.grid)],'i') newInfo['grid'] = np.where(newInfo['grid'] <= 0 , info['grid'],newInfo['grid']) microstructure = microstructure.reshape(info['grid'],order='F') @@ -149,13 +148,8 @@ for file in files: newInfo['size'] = info['size']/info['grid']*newInfo['grid'] newInfo['origin'] = info['origin']+info['size']/info['grid']*options.offset - a = np.bincount(microstructure_cropped.flatten()) - b = np.nonzero(a)[0] - y = np.size(b) newInfo['microstructures'] = microstructure_cropped.max() - - #--- report --------------------------------------------------------------------------------------- if (any(newInfo['grid'] != info['grid'])): file['croak'].write('--> grid a b c: %s\n'%(' x '.join(map(str,newInfo['grid']))))