ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/VHbb/python/submitThem.py
(Generate patch)

Comparing UserCode/VHbb/python/submitThem.py (file contents):
Revision 1.14 by bortigno, Mon Oct 1 12:44:45 2012 UTC vs.
Revision 1.18 by peller, Wed Oct 3 16:35:15 2012 UTC

# Line 50 | Line 50 | if( not os.path.isdir(logPath) ):
50          print 'Exit'
51          sys.exit(-1)
52  
53 < repDict = {'en':en,'logpath':logPath,'job':'','task':opts.task}
53 > repDict = {'en':en,'logpath':logPath,'job':'','task':opts.task,'queue': 'all.q'}
54   def submit(job,repDict):
55          repDict['job'] = job
56 <        command = 'qsub -V -cwd -q all.q -N %(job)s_%(en)s%(task)s -o %(logpath)s/%(job)s_%(en)s_%(task)s.out -e %(logpath)s/%(job)s_%(en)s_%(task)s.err runAll.sh %(job)s %(en)s ' %(repDict) + opts.task
56 >        command = 'qsub -V -cwd -q %(queue)s -N %(job)s_%(en)s%(task)s -o %(logpath)s/%(job)s_%(en)s_%(task)s.out -e %(logpath)s/%(job)s_%(en)s_%(task)s.err runAll.sh %(job)s %(en)s ' %(repDict) + opts.task
57          print command
58          subprocess.call([command], shell=True)
59  
60   if opts.task == 'dc':
61 <    DC_vars = config.items('Limit')
61 >    #DC_vars = config.items('Limit')
62 >    DC_vars= (config.get('LimitGeneral','List')).split(',')
63 >    print DC_vars
64 >
65   if opts.task == 'plot':
66 <    Plot_vars= config.items('Plot')
66 >    Plot_vars= (config.get('Plot_general','List')).split(',')
67  
68   if not opts.task == 'prep':
69      path = config.get("Directories","samplepath")
# Line 70 | Line 73 | if not opts.task == 'prep':
73  
74  
75   if opts.task == 'plot':
76 +    repDict['queue'] = 'short.q'
77      for item in Plot_vars:
78 <        if 'ZH%s'%opts.mass in item[0]:
75 <            submit(item[0],repDict)
76 <        elif opts.mass == '' and 'ZH' in item[0]:
77 <            submit(item[0],repDict)
78 >        submit(item,repDict)
79  
80   elif opts.task == 'dc':
81 +    repDict['queue'] = 'short.q'
82      for item in DC_vars:
83 <        if 'ZH%s'%opts.mass in item[0] and opts.tag in item[0]:
84 <            submit(item[0],repDict)
85 <        elif 'ZH' in item[0] and opts.tag in item[0] and opts.mass == '*':
86 <            submit(item[0],repDict)
83 >        if 'ZH%s'%opts.mass in item and opts.tag in item:
84 >            submit(item,repDict)
85 >        elif 'ZH' in item and opts.tag in item and opts.mass == '*':
86 >            submit(item,repDict)
87 >            
88   elif opts.task == 'prep':
89      submit('prepare',repDict)
90  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines