Changing the filenames so that underscores are not added. Makes it easier to sort. -MT

template.py

@@ -167,7 +167,7 @@ class BaseExperiment(object):
         """
 
         if filename is None:
-            filename = (self.experiment_name + '_' +
+            filename = (self.experiment_name + 
                         self.experiment_info['Subject Identifier'].zfill(3) +
                         '_info')
         elif filename[-4:] == '.txt':
@@ -201,8 +201,8 @@ class BaseExperiment(object):
         """
 
         if data_filename is None:
-            data_filename = (self.experiment_name + '_' +
+            data_filename = (self.experiment_name + 
-                             self.experiment_info['Subject Identifier'].zfill(3))
+            self.experiment_info['Subject Identifier'].zfill(3))
         elif data_filename[-4:] == '.csv':
             data_filename = data_filename[:-4]
 
@@ -297,7 +297,7 @@ class BaseExperiment(object):
             pickle_dict.update(additional_fields_dict)
 
         pickle.dump(pickle_dict, open(
-            self.experiment_name + '_' +
+            self.experiment_name + 
             self.experiment_info['Subject Number'].zfill(3) + '.pickle',
             'wb+'))