From b8af43314e05a2345d84cc248782e57f11674323 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sun, 2 Mar 2008 21:33:33 -0500 Subject: tweaks --- importdata.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'importdata.py') diff --git a/importdata.py b/importdata.py index a72f71e..befb171 100644 --- a/importdata.py +++ b/importdata.py @@ -4,14 +4,17 @@ import shutil, os, scipy, pylab; -def dothing(arg,thisdir,files): +def dothing(arg,thisdir,files,prefix="d"): global all_data for fname in files: if os.path.isfile(thisdir + '/' + fname): if (fname.find('.') == -1): try: dat = pylab.load(thisdir + '/' + fname) - all_data[fname.split('.')[0]] = dat + if(fname.split('.')[0][0].isalpha()): + all_data[fname.split('.')[0]] = dat + else: + all_data[prefix + fname.split('.')[0]] = dat print "Loaded (no type): %s/%s" % (thisdir,fname); except: print "Tried, but didn't load (no type): %s/%s" % (thisdir,fname); @@ -19,7 +22,10 @@ def dothing(arg,thisdir,files): try: dat = pylab.load(thisdir + '/' + fname) #print all_data - all_data[fname.split('.')[0]] = dat + if(fname.split('.')[0][0].isalpha()): + all_data[fname.split('.')[0]] = dat + else: + all_data[prefix + fname.split('.')[0]] = dat print "Loaded .TKA: %s/%s" % (thisdir,fname); #print "all_data has %d" % len(all_data) except: @@ -28,8 +34,14 @@ def dothing(arg,thisdir,files): try: dat = pylab.load(thisdir + '/' + fname,skiprows=1) #print all_data - all_data[fname.split('.')[0]] = dat - print "Loaded .txt: %s/%s" % (thisdir,fname); + if(fname.split('.')[0][0].isalpha()): + all_data[fname.split('.')[0]] = dat + print "Loaded .txt: %s/%s as %s" % (thisdir,fname, + fname.split('.')[0]); + else: + all_data[prefix + fname.split('.')[0]] = dat + print "Loaded .txt: %s/%s as %s" % (thisdir,fname, + prefix + fname.split('.')[0]); #print "all_data has %d" % len(all_data) except: print "Tried, but didn't load .txt: %s/%s" % (thisdir,fname); @@ -42,7 +54,10 @@ def dothing(arg,thisdir,files): # print len(dat) # print dat dat = scipy.array(dat); - all_data[fname.split('.')[0]] = dat + if(fname.split('.')[0][0].isalpha()): + all_data[fname.split('.')[0]] = dat + else: + all_data[prefix + fname.split('.')[0]] = dat print "Loaded .Spe: %s/%s" % (thisdir,fname); # except: print "Tried, but didn't load .Spe: %s/%s" % (thisdir,fname); @@ -51,7 +66,7 @@ def dothing(arg,thisdir,files): else: print "Wasn't a file: %s/%s" % (thisdir,fname); -def import_data(outfile='data.pydat',root='.',saveit=True,recurse=False): +def import_data(outfile='data.pydat',root='.',saveit=True,recurse=False,prefix="d"): """Imports all that yummah files...""" global all_data if saveit: -- cgit v1.2.3