ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/multicrab.py
(Generate patch)

Comparing COMP/CRAB/python/multicrab.py (file contents):
Revision 1.20 by slacapra, Fri Jan 8 13:35:31 2010 UTC vs.
Revision 1.22.2.1 by spiga, Thu Apr 15 08:19:43 2010 UTC

# Line 216 | Line 216 | class MultiCrab:
216                  
217                  options[tmp]=self.cfg_params_dataset[sec][opt]
218  
219 +            # protect against no user_remote_dir
220 +            self.user_remote_dir =self.cfg_params_dataset[sec].get("user.user_remote_dir",None)
221 +            if not self.user_remote_dir:
222 +                self.user_remote_dir = "./"
223              # add section to storage_path if exist in crab.cfg
224              if not self.cfg_params_dataset.has_key("USER.user_remote_dir") and self.user_remote_dir:
225                  options["-USER.user_remote_dir"]=self.user_remote_dir+"/"+sec
# Line 235 | Line 239 | class MultiCrab:
239                  if self.flag_continue and options.has_key("-cfg"):
240                      del options['-cfg']
241                  pass
238 <<<<<<< multicrab.py
242  
243              # write crab command to be executed later...
244              cmd='crab '
# Line 266 | Line 269 | class MultiCrab:
269              #     pass
270              # pass
271              # if (common.logger): common.logger.delete()
269 =======
270
271            # write crab command to be executed later...
272            cmd='crab '
273            for o in options:
274                if options[o]==None: options[o]=""
275                cmd+=str(o)+'='+str(options[o])+' '
276            cmd+="\n"
277            # print cmd
278
279            runFile.write(cmd)
280
281            # SL this does not work for complex, multi include pset.py
282
283            # crab = Crab()
284            # try:
285            #     crab.initialize_(options)
286            #     crab.run()
287            #     del crab
288            #     print 'Log file is %s%s.log'%(common.work_space.logDir(),common.prog_name)  
289            #     print '\n##############################  E N D  ####################################\n'
290            # except CrabException, e:
291            #     del crab
292            #     print '\n' + common.prog_name + ': ' + str(e) + '\n'
293            #     pass
294            # pass
295            # if (common.logger): common.logger.delete()
296 >>>>>>> 1.19
272          pass
273          
274  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines