Added additional filters to template setup, allow user defined templates

* Added python methods list.split() and filter() to template environment for advanced template macros (file lists)
* Changed job script template search to allow local <EXP_ID>.<JOB.id>.tmpl override standard experiment templates.

mkexp

@@ -43,16 +43,13 @@ def chmod_plus_x(file_name):
 
 # Templates
 
-def get_template_name(base_name):
-    '''Determine script template, using experiments' library path.'''
-    template_name = os.path.join(ExpConfig.exp_lib_dir, base_name+'.tmpl')
-    return template_name
+def get_template_name(base_name, dir_name=ExpConfig.exp_lib_dir):
+    '''Determine script template, using experiments' or given library path.'''
+    return os.path.join(dir_name, base_name+'.tmpl')
 
-def get_exp_template_name(experiment_kind, job_id):
-    '''Determine script template, taking system default if type is unsupported.'''
-    run_template_name = os.path.join(ExpConfig.exp_lib_dir, 
-                                     experiment_kind+'.'+job_id+'.tmpl')
-    return run_template_name
+def get_exp_template_name(experiment_kind, job_id, dir_name=ExpConfig.exp_lib_dir):
+    '''Determine job script template, using experiments' or given library path.'''
+    return get_template_name(experiment_kind+'.'+job_id, dir_name)
 
 def get_script_name(base_name):
     '''Determine job script name.'''
@@ -233,6 +230,12 @@ template_env = Environment(
     line_comment_prefix = '#%#'
 )    
 
+# Additional filters
+# - There's a join but no split operation...
+template_env.filters['split'] = lambda x, s: x.split(s)
+# - Add list operations filter and map
+template_env.filters['filter'] = lambda x, f=None: filter(f, x)
+
 # Read and store configuration info from input and experiments' library
 # Store environment as default for control settings, then add config from files
 
@@ -342,7 +345,9 @@ for subjob, subconfig in config['jobs'].iteritems():
 
         # Generate job script
         expand_template_file(job_config,
-                             ( get_exp_template_name(config.experiment_kind,
+                             ( get_exp_template_name(config.experiment_id,
+                                                     template_job, ''),
+                               get_exp_template_name(config.experiment_kind,
                                                      template_job),
                                get_exp_template_name(ExpConfig.default_name,
                                                      template_job) ),