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

Comparing COMP/CRAB/python/ServerCommunicator.py (file contents):
Revision 1.12 by spiga, Thu Apr 17 13:44:59 2008 UTC vs.
Revision 1.13 by farinafa, Mon Apr 21 16:12:11 2008 UTC

# Line 9 | Line 9 | __revision__ = "$Revision"
9   __author__ = "farinafa@cern.ch"
10  
11   from crab_exceptions import *
12 + from crab_util import *
13   from crab_logger import Logger
14   import common
15  
# Line 235 | Line 236 | class ServerCommunicator:
236          if 'EDG.se_black_list' in self.cfg_params:
237              miniCfg['EDG.se_black_list'] = str( self.cfg_params['EDG.se_black_list'] )
238  
239 <        miniCfg['cfgFileNameCkSum'] = ''
239 >        miniCfg['cfgFileNameCkSum'] = makeCksum(common.work_space.cfgFileName())
240          if 'cfgFileNameCkSum' in self.cfg_params:
241              miniCfg['cfgFileNameCkSum'] = str(self.cfg_params['cfgFileNameCkSum'])
242  
# Line 244 | Line 245 | class ServerCommunicator:
245              miniCfg['CRAB.se_remote_dir'] = str(self.cfg_params['CRAB.se_remote_dir'])
246  
247          ## JDL requirements specific data. Scheduler dependant
248 <        if 'glite' in str(self.cfg_params['CRAB.scheduler']):
249 <            miniCfg['EDG.max_wall_time'] = self.cfg_params.get('EDG.max_wall_clock_time', None)
250 <            miniCfg['EDG.max_cpu_time'] = self.cfg_params.get('EDG.max_cpu_time', '130')
251 <            miniCfg['proxyServer'] = self.cfg_params.get('EDG.proxy_server', 'myproxy.cern.ch')
252 <            miniCfg['VO'] = self.cfg_params.get('EDG.virtual_organization', 'cms')
253 <            miniCfg['EDG_retry_count'] = self.cfg_params.get('EDG.retry_count',0)
254 <            miniCfg['EDG_shallow_retry_count'] = self.cfg_params.get('EDG.shallow_retry_count',-1)
255 <        else:
256 <            # TODO fill here with proper data
256 <            pass
248 >        miniCfg['EDG.max_wall_time'] = self.cfg_params.get('EDG.max_wall_clock_time', None)
249 >        miniCfg['EDG.max_cpu_time'] = self.cfg_params.get('EDG.max_cpu_time', '130')
250 >        miniCfg['proxyServer'] = self.cfg_params.get('EDG.proxy_server', 'myproxy.cern.ch')
251 >        miniCfg['VO'] = self.cfg_params.get('EDG.virtual_organization', 'cms')
252 >        miniCfg['EDG_retry_count'] = self.cfg_params.get('EDG.retry_count',0)
253 >        miniCfg['EDG_shallow_retry_count'] = self.cfg_params.get('EDG.shallow_retry_count',-1)
254 >
255 >        ## Additional fields for DashBoard
256 >        miniCfg['CMSSW.datasetpath'] = self.cfg_params.get('CMSSW.datasetpath', 'None')
257  
258          ## put here other fields if needed
259          node.setAttribute("CfgParamDict", str(miniCfg) )

Diff Legend

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