Skip to content

Commit

Permalink
Merge branch 'develop' into release/6.1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
milliams committed May 3, 2016
2 parents 191c002 + 65f854c commit a279cd4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
5 changes: 2 additions & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
coverage:
status:
patch: false
project:
default:
target: false
project: false
changes: false
comment: false
2 changes: 1 addition & 1 deletion python/Ganga/GPIDev/Lib/Registry/RegistrySlice.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def __call__(self, this_id):
return addProxy(self.objects[this_id])
except KeyError as err:
logger.debug('Object id=%d not found' % this_id)
logger.deubg("%s" % err)
logger.debug("%s" % err)
raise RegistryKeyError('Object id=%d not found' % this_id)

def __iter__(self):
Expand Down
6 changes: 0 additions & 6 deletions python/GangaLHCb/Lib/RTHandlers/RTHUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ def lhcbdiracAPI_script_template():
def is_gaudi_child(app):
if isType(app, Gaudi):
return True

if isType(app, TaskApplication):
from GangaLHCb.Lib.Applications import GaudiPythonTask, BenderTask
if not isType(app, GaudiPythonTask) and not isType(app, BenderTask):
return True

return False


Expand Down
2 changes: 1 addition & 1 deletion python/GangaLHCb/Lib/Tasks/LHCbUnit.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def createNewJob(self):
if isType(trf.splitter, GaussSplitter):
events_per_unit = j.splitter.eventsPerJob * \
j.splitter.numberOfJobs
j.splitter.firstEventNumber = self.getID() * events_per_unit
j.splitter.firstEventNumber += self.getID() * events_per_unit

else:
j.splitter = SplitByFiles()
Expand Down

0 comments on commit a279cd4

Please sign in to comment.