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.32 by slacapra, Thu Apr 26 14:10:25 2012 UTC vs.
Revision 1.33 by slacapra, Thu Sep 20 13:09:26 2012 UTC

# Line 152 | Line 152 | class MultiCrab:
152          self.cfg_params_dataset = {}
153          common_opts = {}
154          # first get common sections
155 +        crab_cfg='crab.cfg' # this is the default
156          for sec in cfg_params:
157              if sec in ['MULTICRAB']:
158                  if 'cfg' in cfg_params[sec]:
159                      common_opts['cfg']=cfg_params[sec]['cfg']
160 +                    crab_cfg=common_opts['cfg'];
161                  continue
162              if sec in ['COMMON']:
163                  common_opts.update(cfg_params[sec])
164                  continue
165              pass
166  
165        crab_cfg='crab.cfg'
167          # read crab.cfg file and search for storage_path
168          crab_cfg_params = loadConfig(crab_cfg,{})
169          # also USER.ui_working_dir USER.outputdir and USER.logdir need special treatment
# Line 178 | Line 179 | class MultiCrab:
179              self.logdir = crab_cfg_params.get("USER.logdir",None)
180              self.ui_working_dir = crab_cfg_params.get("USER.ui_working_dir",None)
181              self.publish_data_name = crab_cfg_params.get("USER.publish_data_name",None)
181        print "self.publish_data_name ",self.publish_data_name
182  
183          if common_opts.has_key('cfg') : crab_cfg=common_opts['cfg']
184  
# Line 203 | Line 203 | class MultiCrab:
203                      self.cfg_params_dataset[sec][key]=common_opts[key]
204              pass
205  
206
206          return
207  
208      def loadMultiConfig(self, file):

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines