248 |
|
miniCfg = {} |
249 |
|
|
250 |
|
## migrate CE/SE infos |
251 |
< |
miniCfg['GRID.ce_white_list'] = "" |
251 |
> |
miniCfg['EDG.ce_white_list'] = "" |
252 |
|
if 'GRID.ce_white_list' in self.cfg_params: |
253 |
< |
miniCfg['GRID.ce_white_list'] = str( self.cfg_params['GRID.ce_white_list'] ) |
253 |
> |
miniCfg['EDG.ce_white_list'] = str( self.cfg_params['GRID.ce_white_list'] ) |
254 |
|
|
255 |
< |
miniCfg['GRID.ce_black_list'] = T1_BL |
255 |
> |
miniCfg['EDG.ce_black_list'] = T1_BL |
256 |
|
if 'GRID.ce_black_list' in self.cfg_params: |
257 |
|
if len(T1_BL) > 0: |
258 |
< |
miniCfg['GRID.ce_black_list'] += ", " |
259 |
< |
miniCfg['GRID.ce_black_list'] += str( self.cfg_params['GRID.ce_black_list'] ) |
258 |
> |
miniCfg['EDG.ce_black_list'] += ", " |
259 |
> |
miniCfg['EDG.ce_black_list'] += str( self.cfg_params['GRID.ce_black_list'] ) |
260 |
|
|
261 |
< |
miniCfg['GRID.se_white_list'] = "" |
261 |
> |
miniCfg['EDG.se_white_list'] = "" |
262 |
|
if 'GRID.se_white_list' in self.cfg_params: |
263 |
< |
miniCfg['GRID.se_white_list'] = str( self.cfg_params['GRID.se_white_list'] ) |
263 |
> |
miniCfg['EDG.se_white_list'] = str( self.cfg_params['GRID.se_white_list'] ) |
264 |
|
|
265 |
< |
miniCfg['GRID.se_black_list'] = "" |
265 |
> |
miniCfg['EDG.se_black_list'] = "" |
266 |
|
if 'GRID.se_black_list' in self.cfg_params: |
267 |
< |
miniCfg['GRID.se_black_list'] = str( self.cfg_params['GRID.se_black_list'] ) |
267 |
> |
miniCfg['EDG.se_black_list'] = str( self.cfg_params['GRID.se_black_list'] ) |
268 |
|
|
269 |
< |
miniCfg['GRID.group'] = "" |
269 |
> |
miniCfg['EDG.group'] = "" |
270 |
|
if 'GRID.group' in self.cfg_params: |
271 |
< |
miniCfg['GRID.group'] = str( self.cfg_params['GRID.group'] ) |
271 |
> |
miniCfg['EDG.group'] = str( self.cfg_params['GRID.group'] ) |
272 |
|
|
273 |
< |
miniCfg['GRID.role'] = "" |
273 |
> |
miniCfg['EDG.role'] = "" |
274 |
|
if 'GRID.role' in self.cfg_params: |
275 |
< |
miniCfg['GRID.role'] = str( self.cfg_params['GRID.role'] ) |
275 |
> |
miniCfg['EDG.role'] = str( self.cfg_params['GRID.role'] ) |
276 |
|
|
277 |
|
miniCfg['cfgFileNameCkSum'] = makeCksum(common.work_space.cfgFileName()) |
278 |
|
if 'cfgFileNameCkSum' in self.cfg_params: |
283 |
|
miniCfg['CRAB.se_remote_dir'] = str(self.cfg_params['CRAB.se_remote_dir']) |
284 |
|
|
285 |
|
## JDL requirements specific data. Scheduler dependant |
286 |
< |
miniCfg['GRID.max_wall_time'] = self.cfg_params.get('GRID.max_wall_clock_time', None) |
287 |
< |
miniCfg['GRID.max_cpu_time'] = self.cfg_params.get('GRID.max_cpu_time', '130') |
286 |
> |
miniCfg['EDG.max_wall_time'] = self.cfg_params.get('GRID.max_wall_clock_time', None) |
287 |
> |
miniCfg['EDG.max_cpu_time'] = self.cfg_params.get('GRID.max_cpu_time', '130') |
288 |
|
miniCfg['proxyServer'] = self.cfg_params.get('GRID.proxy_server', 'myproxy.cern.ch') |
289 |
|
miniCfg['VO'] = self.cfg_params.get('GRID.virtual_organization', 'cms') |
290 |
< |
miniCfg['GRID_retry_count'] = self.cfg_params.get('GRID.retry_count',0) |
291 |
< |
miniCfg['GRID_shallow_retry_count'] = self.cfg_params.get('GRID.shallow_retry_count',-1) |
292 |
< |
miniCfg['GRID.proxyInfos'] = self.cfg_params.get('GRID.proxyInfos',{}) #TODO activate this when using MyProxy-based delegation |
290 |
> |
miniCfg['EDG_retry_count'] = self.cfg_params.get('GRID.retry_count',0) |
291 |
> |
miniCfg['EDG_shallow_retry_count'] = self.cfg_params.get('GRID.shallow_retry_count',-1) |
292 |
> |
miniCfg['EDG.proxyInfos'] = self.cfg_params.get('GRID.proxyInfos',{}) #TODO activate this when using MyProxy-based delegation |
293 |
|
|
294 |
|
## Additional field for DashBoard |
295 |
|
miniCfg['CMSSW.datasetpath'] = self.cfg_params.get('CMSSW.datasetpath', 'None') |