ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/Splitter.py

Comparing COMP/CRAB/python/Splitter.py (file contents):
Revision 1.46 by spiga, Mon Sep 27 08:56:08 2010 UTC vs.
Revision 1.48 by ewv, Wed Dec 1 15:44:09 2010 UTC

#	Line 707 | Line 707 | class JobSplitter:
707		lumisCreated = 0
708		list_of_blocks = []
709		if not self.limitJobLumis:
710	<	self.lumisPerJob = pubdata.getMaxLumis() // self.theNumberOfJobs + 1
710	>	if self.totalNLumis > 0:
711	>	self.lumisPerJob = max(self.totalNLumis // self.theNumberOfJobs,1)
712	>	else:
713	>	self.lumisPerJob = pubdata.getMaxLumis() // self.theNumberOfJobs + 1
714		common.logger.info('Each job will process about %s lumis.' %
715		self.lumisPerJob)
716
#	Line 722 | Line 725 | class JobSplitter:
725		lumis = []
726		lfns  = []
727		if self.useParent==1:
728	<	parentlfns  = []
728	>	parentlfns  = []
729		pString =""
730
731		locations = []
#	Line 758 | Line 761 | class JobSplitter:
761		common.logger.debug("Files: "+fileString+" with the following parents: "+pString[:-1])
762		pfileString = pString[:-1]
763		list_of_lists.append([fileString, pfileString, str(-1), str(0), lumiString])
764	<	else:
764	>	else:
765		list_of_lists.append([fileString, str(-1), str(0), lumiString])
766		list_of_blocks.append(blocks)
767		jobDestination.append(locations)
#	Line 772 | Line 775 | class JobSplitter:
775		# Prepare dict output matching back to non-WMBS job creation
776		dictOut = {}
777		dictOut['params'] = ['InputFiles', 'MaxEvents', 'SkipEvents', 'Lumis']
778	<	if self.useParent==1:
778	>	if self.useParent==1:
779		dictOut['params']= ['InputFiles','ParentFiles','MaxEvents','SkipEvents','Lumis']
780		dictOut['args'] = list_of_lists
781		dictOut['jobDestination'] = jobDestination

Diff Legend

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