Changeset 354

Show
Ignore:
Timestamp:
06/12/08 10:41:10 (5 months ago)
Author:
apdavison
Message:

A few fixes to deal with the latest version of NEST

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/0.4/setup.py

    r349 r354  
    4141setup( 
    4242    name = "PyNN", 
    43     version = "0.4.0", 
     43    version = "0.4.1", 
    4444    package_dir={'pyNN': 'src'}, 
    4545    packages = ['pyNN','pyNN.nest2','pyNN.nest1','pyNN.pcsim','pyNN.neuron'], 

  • branches/0.4/src/__init__.py

    r345 r354  
    1 __version__ = '0.4 ( $Revision$)'.replace(' $','') 
     1__version__ = '0.4.1 ( $Revision$)'.replace(' $','') 
    22__all__ = ["common", "random", "nest1", "nest2", "neuron", "pcsim" ] 

  • branches/0.4/src/nest2/__init__.py

    r342 r354  
    411411     
    412412    # check for older nest2 with need for interval 
    413     if len(nest.GetStatus(recording_device, 'interval')) == 1: # returns a list of length 1 if 'interval' is present, otherwise returns the whole dict  
    414         print "PyNN Warning: nest2 recording_device.interval detected." 
    415         print "Please upgrade to a more recent version of nest 2" 
    416         print "Transition code only temporarily supported." 
    417         ss_dict['interval'] = nest.GetStatus([0],"resolution")[0] 
     413    try: 
     414        if len(nest.GetStatus(recording_device, 'interval')) == 1: # returns a list of length 1 if 'interval' is present, otherwise returns the whole dict  
     415            print "PyNN Warning: nest2 recording_device.interval detected." 
     416            print "Please upgrade to a more recent version of nest 2" 
     417            print "Transition code only temporarily supported." 
     418            ss_dict['interval'] = nest.GetStatus([0],"resolution")[0] 
     419    except nest.hl_api.NESTError: 
     420        pass 
    418421         
    419422    nest.SetStatus(recording_device,ss_dict) 
    …… 
    740743     
    741744            # check for older nest2 with need for interval 
    742             if len(nest.GetStatus(self.recorders[variable], 'interval')) == 1: 
    743                 print "PyNN Warning: nest2 recording_device.interval detected." 
    744                 print "Please upgrade to a more recent version of nest 2" 
    745                 print "Transition code only temporarily supported." 
    746                 ss_dict['interval'] = nest.GetStatus([0],"resolution")[0] 
    747  
     745            try: 
     746                if len(nest.GetStatus(self.recorders[variable], 'interval')) == 1: 
     747                    print "PyNN Warning: nest2 recording_device.interval detected." 
     748                    print "Please upgrade to a more recent version of nest 2" 
     749                    print "Transition code only temporarily supported." 
     750                    ss_dict['interval'] = nest.GetStatus([0],"resolution")[0] 
     751            except nest.hl_api.NESTError: 
     752                pass 
    748753            nest.SetStatus(self.recorders[variable],ss_dict) 
    749754 
    …… 
    851856        """ 
    852857        # gather is not relevant, but is needed for API consistency 
    853         n_spikes = nest.GetStatus(self.recorders['spikes'], "events")[0] 
    854         return float(n_spikes)/self.n_rec 
     858        events = nest.GetStatus(self.recorders['spikes'], "events")[0] 
     859        if is_number(events): 
     860            return float(events)/self.n_rec 
     861        else: 
     862            return len(events['times']) 
    855863 
    856864    def randomInit(self, rand_distr):