Minor fix for cleanup

ample/ensembler/__init__.py

@@ -94,6 +94,7 @@ def create_ensembles(amoptd):
     # Hack to pull out the data - need to update code to work with ensemble objects rather than dictionaries
     amoptd['ensembles'] = [e.pdb for e in ensembles]
     amoptd['ensembles_data'] = [e.__dict__ for e in ensembles]
+    amoptd['ensembles_workdir'] = ensembler.work_dir
 
     # We need to let the main process know that we have succeeded as this module could be run on a cluster node with no link
     # to the parent process, so we create a file here indicating that we got this far and didn't die from an exception

ample/main.py

@@ -167,7 +167,7 @@ def cleanup(optd):
         """Remove directories based on purge level
         """
         purge_level = optd['purge']
-        to_remove = {1 : ['modelling_workdir', 'ensemble_workdir'],
+        to_remove = {1 : ['modelling_workdir', 'ensembles_workdir'],
                      2 : ['models_dir', 'ensembles_directory', 'contacts_dir']}
         for level in to_remove.keys():
             if purge_level >= level:

ample/util/argparse_util.py

@@ -89,7 +89,7 @@ def add_general_options(parser=None):
     parser.add_argument('-nmr_process', type=int, help='number of times to process the NMR models')
     parser.add_argument('-nmr_remodel', metavar='True/False', help='Remodel the NMR structures')
     parser.add_argument('-nmr_remodel_fasta', help='The FASTA sequence to be used for remodelling the NMR ensemble if different from the default FASTA sequence')
-    parser.add_argument('-purge', metavar='purge_level', choices=[0, 1, 2], help='Delete intermediate files and failed MRBUMP results: 0 - None, 1 - Some, 2 - All possible')
+    parser.add_argument('-purge', metavar='purge_level', type=int, choices=[0, 1, 2], help='Delete intermediate files and failed MRBUMP results: 0 - None, 1 - Some, 2 - All possible')
     parser.add_argument('-psipred_ss2', metavar='PSIPRED_FILE', help='Psipred secondary structure prediction file')
     parser.add_argument('-quick_mode', metavar='True/False', help='Preset options to run quickly, but less thoroughly')
     parser.add_argument('-restart_pkl', help='Rerun a job using the pickled ample dictionary')