Skip to content

Commit a279cd4

Browse files
committed
Merge branch 'develop' into release/6.1.19
2 parents 191c002 + 65f854c commit a279cd4

4 files changed

Lines changed: 4 additions & 11 deletions

File tree

codecov.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
coverage:
22
status:
33
patch: false
4-
project:
5-
default:
6-
target: false
4+
project: false
5+
changes: false
76
comment: false

python/Ganga/GPIDev/Lib/Registry/RegistrySlice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def __call__(self, this_id):
321321
return addProxy(self.objects[this_id])
322322
except KeyError as err:
323323
logger.debug('Object id=%d not found' % this_id)
324-
logger.deubg("%s" % err)
324+
logger.debug("%s" % err)
325325
raise RegistryKeyError('Object id=%d not found' % this_id)
326326

327327
def __iter__(self):

python/GangaLHCb/Lib/RTHandlers/RTHUtils.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ def lhcbdiracAPI_script_template():
5757
def is_gaudi_child(app):
5858
if isType(app, Gaudi):
5959
return True
60-
61-
if isType(app, TaskApplication):
62-
from GangaLHCb.Lib.Applications import GaudiPythonTask, BenderTask
63-
if not isType(app, GaudiPythonTask) and not isType(app, BenderTask):
64-
return True
65-
6660
return False
6761

6862

python/GangaLHCb/Lib/Tasks/LHCbUnit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def createNewJob(self):
4848
if isType(trf.splitter, GaussSplitter):
4949
events_per_unit = j.splitter.eventsPerJob * \
5050
j.splitter.numberOfJobs
51-
j.splitter.firstEventNumber = self.getID() * events_per_unit
51+
j.splitter.firstEventNumber += self.getID() * events_per_unit
5252

5353
else:
5454
j.splitter = SplitByFiles()

0 commit comments

Comments
 (0)