diff --git a/SaccadePursuitEyeTracking.py b/SaccadePursuitEyeTracking.py index b7d14cc..51f0966 100755 --- a/SaccadePursuitEyeTracking.py +++ b/SaccadePursuitEyeTracking.py @@ -260,25 +260,25 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask): self.tracker.close_edf() self.tracker.transfer_edf() self.tracker.close_connection() - fName = os.path.join(self.data_directory, - self.experiment_info['Subject ID'] + - self.experiment_info['Timepoint'] + '.edf') - if os.path.exists(fName): - baseName = os.path.join(self.data_directory, - 'ETSP_' + - self.experiment_info['Subject ID'] + - self.experiment_info['Session'] + - self.experiment_info['Timepoint']) - fName2 = baseName + '.edf' - if os.path.exists(fName2): - ii = 1 + fName = os.path.join(self.data_directory, + self.experiment_info['Subject ID'] + + self.experiment_info['Timepoint'] + '.edf') + if os.path.exists(fName): + baseName = os.path.join(self.data_directory, + 'ETSP_' + + self.experiment_info['Subject ID'] + + self.experiment_info['Session'] + + self.experiment_info['Timepoint']) + fName2 = baseName + '.edf' + if os.path.exists(fName2): + ii = 1 + newName = baseName+'('+str(ii)+')'+'.edf' + while os.path.exists(newName): + ii+=1 newName = baseName+'('+str(ii)+')'+'.edf' - while os.path.exists(newName): - ii+=1 - newName = baseName+'('+str(ii)+')'+'.edf' - fName2 = newName - os.rename(fName, fName2) - subprocess.call(['edf2asc', fName2]) + fName2 = newName + os.rename(fName, fName2) + subprocess.call(['edf2asc', fName2]) super(EyeTrackingSaccadePursuit, self).quit_experiment()