- Timestamp:
- 06/03/10 00:51:36 (3 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
branches/OpenElectrophy-0.2/OpenElectrophy/gui/spikesorting.py
r251 r252 621 621 self.recordingPoint = rPointList[0] 622 622 623 self.trodness = len( rPointList )623 624 624 625 625 # take block … … 627 627 628 628 if self.mode =='all_step_mode': 629 self.trodness = len( rPointList ) 629 630 # construction the anaSigList 630 631 self.anaSigList = [ ] … … 682 683 continue 683 684 685 if spikeTrain.id_neuron is not None: 686 id_neuron = spikeTrain.id_neuron 687 else: 688 id_neuron = -1 689 684 690 if self.spikeTimes is None : 685 691 self.spikeTimes = spikeTrain.spike_times 686 692 self.sampling_rate = spikeTrain.sampling_rate 687 693 self.waveforms = spikeTrain.waveforms 688 self.sorted = zeros( (spikeTrain.spike_times.size), dtype='i')* spikeTrain.id_neuron 694 695 self.sorted = zeros( (spikeTrain.spike_times.size), dtype='i')* id_neuron 689 696 self.id_segments = ones((spikeTrain.spike_times.size), dtype='i')*spikeTrain.id_segment 690 697 else: … … 693 700 self.spikeTimes = concatenate( (self.spikeTimes, spikeTrain.spike_times, ), axis = 0) 694 701 self.waveforms = concatenate( (self.waveforms, spikeTrain.waveforms, ), axis = 0) 695 self.sorted = concatenate( (self.sorted, ones((spikeTrain.spike_times.size), dtype='i') * spikeTrain.id_neuron ), axis = 0)702 self.sorted = concatenate( (self.sorted, ones((spikeTrain.spike_times.size), dtype='i') * id_neuron ), axis = 0) 696 703 self.id_segments = concatenate( (self.id_segments, ones( (spikeTrain.spike_times.size), dtype='i')*spikeTrain.id_segment) , axis = 0) 697 704 self.trodness = self.waveforms.shape[1] 698 705 # construct all tabs 699 706 self.hboxes = { } … … 831 838 self.session.delete(sptr) 832 839 for id_neuron in unique(id_neurons): 840 if id_neuron is None : continue 833 841 neu = self.session.query( Neuron ).filter(Neuron.id == id_neuron ).one( ) 834 842 self.session.delete(neu)
