Changeset 430

Show
Ignore:
Timestamp:
07/31/08 10:18:24 (2 months ago)
Author:
apdavison
Message:

Can now save conductance recordings with nest2 using compatible_output=True (thanks to Jens for implementing this).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/nest2/__init__.py

    r429 r430  
    101101     
    102102    formats = {'spikes': 'id t', 
    103                'v': 'id t v'} 
     103               'v': 'id t v', 
     104               'conductance':'id t ge gi'} 
    104105     
    105106    def __init__(self, variable, population=None, file=None): 

  • trunk/src/recording.py

    r424 r430  
    105105            ge_column = input_format.index('ge') 
    106106            gi_column = input_format.index('gi') 
    107             raise Exception("Not yet implemented") 
     107            result.write("# n = %d\n" % len(data)) 
     108            for idx in xrange(len(data)): 
     109                result.write("%g\t%g\t%d\n" % (data[idx][ge_column], data[idx][gi_column], data[idx][id_column])) # ge gi id 
    108110        elif data.shape[1] == 3: # voltage files 
    109111            v_column = input_format.index('v') 
    …… 
    173175        else: # assume data is a filename or open file object 
    174176            #data_array = numpy.loadtxt(data_source, usecols=column_map) 
    175             data_array = readArray(sim_filename, sepchar=None) 
     177            data_array = readArray(data_source, sepchar=None) 
    176178        data_array[:,-1] -= id_offset # replies on fact that id is always last column 
    177179        metadata['n'] = data_array.shape[0]