Convert getTargetList to a classmethod

Author: isullivan

python/lsst/pipe/drivers/coaddDriver.py

@@ -64,8 +64,8 @@ def __init__(self, TaskClass, parsedCmd, doReturnResults=False):
     def makeTask(self, parsedCmd=None, args=None):
         return self.TaskClass(config=self.config, log=self.log, reuse=self.reuse)
 
-    @staticmethod
-    def getTargetList(parsedCmd, **kwargs):
+    @classmethod
+    def getTargetList(cls, parsedCmd, **kwargs):
         """!Get bare butler into Task
 
         @param parsedCmd results of parsing command input

python/lsst/pipe/drivers/constructCalibs.py

@@ -350,8 +350,8 @@ def setDefaults(self):
 
 class CalibTaskRunner(TaskRunner):
     """Get parsed values into the CalibTask.run"""
-    @staticmethod
-    def getTargetList(parsedCmd, **kwargs):
+    @classmethod
+    def getTargetList(cls, parsedCmd, **kwargs):
         return [dict(expRefList=parsedCmd.id.refList, butler=parsedCmd.butler, calibId=parsedCmd.calibId)]
 
     def __call__(self, args):
@@ -409,8 +409,7 @@ def __init__(self, *args, **kwargs):
     @classmethod
     def batchWallTime(cls, time, parsedCmd, numCores):
         numCcds = len(parsedCmd.butler.get("camera"))
-        numExps = len(cls.RunnerClass.getTargetList(
-            parsedCmd)[0]['expRefList'])
+        numExps = len(cls.getTargetList(parsedCmd)[0]['expRefList'])
         numCycles = int(numCcds/float(numCores) + 0.5)
         return time*numExps*numCycles
 

python/lsst/pipe/drivers/skyCorrection.py

@@ -90,7 +90,7 @@ def batchWallTime(cls, time, parsedCmd, numCores):
         numCores : `int`
             Number of cores.
         """
-        numTargets = len(cls.RunnerClass.getTargetList(parsedCmd))
+        numTargets = len(cls.getTargetList(parsedCmd))
         return time*numTargets
 
     def runDataRef(self, expRef):

python/lsst/pipe/drivers/utils.py

@@ -8,8 +8,8 @@
 
 class ButlerTaskRunner(TaskRunner):
     """Get a butler into the Task scripts"""
-    @staticmethod
-    def getTargetList(parsedCmd, **kwargs):
+    @classmethod
+    def getTargetList(cls, parsedCmd, **kwargs):
         """Task.runDataRef should receive a butler in the kwargs"""
         return TaskRunner.getTargetList(parsedCmd, butler=parsedCmd.butler, **kwargs)
 

python/lsst/pipe/drivers/visualizeVisit.py

@@ -103,7 +103,7 @@ def batchWallTime(cls, time, parsedCmd, numCores):
         numCores : `int`
             Number of cores.
         """
-        numTargets = len(cls.RunnerClass.getTargetList(parsedCmd))
+        numTargets = len(cls.getTargetList(parsedCmd))
         return time*numTargets
 
     def runDataRef(self, expRef):