From e22267a76e165d1c9b9bb6302796686e97e1b70c Mon Sep 17 00:00:00 2001
From: Yngve Inntjore Levinsen <Yngve.Levinsen@esss.se>
Date: Mon, 7 Dec 2015 13:58:54 +0100
Subject: [PATCH] moved templates to separate file

---
 ess/__queue_templates__.py  | 55 +++++++++++++++++++++++++++++++
 scripts/tracewin_errorstudy | 64 +++----------------------------------
 2 files changed, 60 insertions(+), 59 deletions(-)
 create mode 100644 ess/__queue_templates__.py

diff --git a/ess/__queue_templates__.py b/ess/__queue_templates__.py
new file mode 100644
index 0000000..58994cb
--- /dev/null
+++ b/ess/__queue_templates__.py
@@ -0,0 +1,55 @@
+
+# supporting templates..
+
+HEAD_TEMPLATE='''
+universe       = Vanilla
+# always transfer files to tmp directory
+should_transfer_files = yes
+initialdir      = {args.calc_dir}/Local_TraceWin_$(Process)
+transfer_input_files = {input_files}
+requirements = ( OpSys == "LINUX" || OpSys == "OSX" )
+log            = condor.log
+executable     = TraceWin_exe/tracewin.$$(OpSys).$$(Arch)
+'''
+HEAD_MULTI_TEMPLATE='''
+universe       = Vanilla
+# always transfer files to tmp directory
+should_transfer_files = yes
+requirements = ( OpSys == "LINUX" || OpSys == "OSX" )
+log            = condor.log
+executable     = TraceWin_exe/tracewin.$$(OpSys).$$(Arch)
+'''
+
+QUEUE_TEMPLATE='''
+priority = {q_priority}
+arguments      = 1 {stat_study} {rand}
+queue 1
+'''
+
+QUEUE_MULTI_TEMPLATE='''
+initialdir      = {args.calc_dir}/{job_folder}
+transfer_input_files = {input_files}
+priority = {q_priority}
+arguments      = 1 {stat_study} {rand}
+queue 1
+'''
+
+def get_head_template(filename='head.tmp'):
+    return _get_template(filename,HEAD_TEMPLATE)
+def get_head_multi_template(filename='head.multi.tmp'):
+    return _get_template(filename,HEAD_MULTI_TEMPLATE)
+def get_queue_template(filename='queue.tmp'):
+    return _get_template(filename,QUEUE_TEMPLATE)
+def get_queue_multi_template(filename='queue.multi.tmp'):
+    return _get_template(filename,QUEUE_MULTI_TEMPLATE)
+
+def _get_template(filename, template):
+    '''
+    Only to be used by get_NN_template()
+    '''
+    import os
+
+    if os.path.exists(filename):
+        return file(filename).read()
+    else:
+        return template
diff --git a/scripts/tracewin_errorstudy b/scripts/tracewin_errorstudy
index 6c2f3b2..4ffa203 100644
--- a/scripts/tracewin_errorstudy
+++ b/scripts/tracewin_errorstudy
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+from ess import __queue_templates__
 
 def define_and_handle_args():
     import argparse
@@ -131,8 +131,8 @@ def setup_multi(args):
             seeds.append(l.split()[-1])
 
 
-    head_template=get_head_multi_template()
-    queue_template=get_queue_multi_template()
+    head_template=__queue_templates__.get_head_multi_template()
+    queue_template=__queue_templates__.get_queue_multi_template()
     with file(args.calc_dir+"/multi.job","w") as out:
         out.write(head_template.format(**locals()))
 
@@ -196,8 +196,8 @@ def setup(args):
             input_files[i]=input_files[i][:-2]+'_$(Process)'
     input_files=', '.join(input_files)
 
-    head_template=get_head_template()
-    queue_template=get_queue_template()
+    head_template=__queue_templates__.get_head_template()
+    queue_template=__queue_templates__.get_queue_template()
     with file(args.calc_dir+"/submit.job","w") as out:
         out.write(head_template.format(**locals()))
 
@@ -231,57 +231,3 @@ if __name__=="__main__":
     ask(args)
     execute(args.calc_dir,args.multi>1)
 
- # supporting templates..
-
-HEAD_TEMPLATE='''
-universe       = Vanilla
-# always transfer files to tmp directory
-should_transfer_files = yes
-initialdir      = {args.calc_dir}/Local_TraceWin_$(Process)
-transfer_input_files = {input_files}
-requirements = ( OpSys == "LINUX" || OpSys == "OSX" )
-log            = condor.log
-executable     = TraceWin_exe/tracewin.$$(OpSys).$$(Arch)
-'''
-HEAD_MULTI_TEMPLATE='''
-universe       = Vanilla
-# always transfer files to tmp directory
-should_transfer_files = yes
-requirements = ( OpSys == "LINUX" || OpSys == "OSX" )
-log            = condor.log
-executable     = TraceWin_exe/tracewin.$$(OpSys).$$(Arch)
-'''
-
-QUEUE_TEMPLATE='''
-priority = {q_priority}
-arguments      = 1 {stat_study} {rand}
-queue 1
-'''
-
-QUEUE_MULTI_TEMPLATE='''
-initialdir      = {args.calc_dir}/{job_folder}
-transfer_input_files = {input_files}
-priority = {q_priority}
-arguments      = 1 {stat_study} {rand}
-queue 1
-'''
-
-def get_head_template(filename='head.tmp'):
-    return _get_template(filename,QUEUE_TEMPLATE)
-def get_head_multi_template(filename='head.multi.tmp'):
-    return _get_template(filename,QUEUE_MULTI_TEMPLATE)
-def get_queue_template(filename='queue.tmp'):
-    return _get_template(filename,QUEUE_TEMPLATE)
-def get_queue_multi_template(filename='queue.multi.tmp'):
-    return _get_template(filename,QUEUE_MULTI_TEMPLATE)
-
-def _get_template(filename, template):
-    '''
-    Only to be used by get_NN_template()
-    '''
-    import os
-
-    if os.path.exists(filename):
-        return file(filename).read()
-    else:
-        return template
-- 
GitLab