Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/python/T0/JobSplitting/RepackMerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def algorithm(self, groupInstance = None, jobInstance = None,
self.minInputSize = kwargs['minInputSize']
self.maxInputSize = kwargs['maxInputSize']

self.maxInputEvents = kwargs['maxInputEvents']
self.maxInputFiles = kwargs['maxInputFiles']

self.maxEdmSize = kwargs['maxEdmSize']
Expand Down Expand Up @@ -152,8 +151,7 @@ def defineJobs(self, filesByLumi, filesetOpen):
#
# => split up lumi and merge individual parts
#
if lumiSizeTotal > self.maxEdmSize or \
lumiEventsTotal > self.maxInputEvents:
if lumiSizeTotal > self.maxEdmSize:

# merge what we have to preserve order
if len(jobFileList) > 0:
Expand Down Expand Up @@ -182,8 +180,7 @@ def defineJobs(self, filesByLumi, filesetOpen):
newEventsTotal = eventsTotal + fileInfo['events']
newSizeTotal = sizeTotal + fileInfo['filesize']

if newSizeTotal <= self.maxEdmSize and \
newEventsTotal <= self.maxInputEvents:
if newSizeTotal <= self.maxEdmSize:

eventsTotal = newEventsTotal
sizeTotal = newSizeTotal
Expand Down Expand Up @@ -216,7 +213,6 @@ def defineJobs(self, filesByLumi, filesetOpen):

# still safe with new file, just add it
if newSizeTotal <= self.maxInputSize and \
newEventsTotal <= self.maxInputEvents and \
newInputFiles <= self.maxInputFiles:

jobSizeTotal = newSizeTotal
Expand All @@ -238,8 +234,7 @@ def defineJobs(self, filesByLumi, filesetOpen):
# over limits with new file, below minimum without it
# still below override limits (and below event limit)
# add file, issue merge job (too large)
elif newSizeTotal <= self.maxOverSize and \
newEventsTotal <= self.maxInputEvents:
elif newSizeTotal <= self.maxOverSize:

jobFileList.extend(lumiFileList)
self.createJob(jobFileList, jobSizeTotal)
Expand Down