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.60 by slacapra, Mon Apr 12 09:43:51 2010 UTC vs.
Revision 1.61 by spiga, Tue May 4 16:48:12 2010 UTC

# Line 25 | Line 25 | else:
25      try:
26          from CRAB_Server_API_1_1 import CRAB_Server_Session as C_AS_Session
27      except:
28 +        from CRAB_Server_API_36X import CRAB_Server_Session as C_AS_Session
29 +    except:
30          from lib26x.CRAB_Server_API_1_1 import CRAB_Server_Session as C_AS_Session
31  
32   class ServerCommunicator:
# Line 36 | Line 38 | class ServerCommunicator:
38          Open the communication with an Analysis Server by passing the server URL and the port
39          """
40  
41 <        self.ServerTwiki = 'https://twiki.cern.ch/twiki/bin/view/CMS/CrabServerForUsers#Server_available_for_users'
41 >        self.ServerTwiki = 'https://twiki.cern.ch/twiki/bin/view/CMS/SWGuideCrabServerForUsers#Server_available_for_users'
42  
43          self.asSession = C_AS_Session(serverName, serverPort)
44          self.cfg_params = cfg_params
# Line 316 | Line 318 | class ServerCommunicator:
318  
319          miniCfg['CAF.queue'] = self.cfg_params.get('CAF.queue','cmscaf1nw')
320          miniCfg['CAF.resources'] = self.cfg_params.get('CAF.resource', 'cmscaf')
321 +        miniCfg['CAF.group'] = self.cfg_params.get('CAF.group', None)
322          ## JDL requirements specific data. Scheduler dependant
323          miniCfg['EDG.max_wall_time'] = self.cfg_params.get('GRID.max_wall_clock_time', None)
324          miniCfg['EDG.max_cpu_time'] = self.cfg_params.get('GRID.max_cpu_time', '130')

Diff Legend

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