DM-7741: Fix missed logging update to lsst.log

bin.src/processCalibLsstSim.py

@@ -58,5 +58,5 @@
         try:
             task.run(sensorDataRefLists[k], type)
         except Exception, e:
-            task.log.log(task.log.FATAL, "Failed on dataId=%s: %s" % (k, e))
+            task.log.fatal("Failed on dataId=%s: %s", k, e)
             traceback.print_exc(file=sys.stderr)

python/lsst/obs/lsstSim/ingest.py

@@ -18,14 +18,14 @@ def run(self, args):
         with context as registry:
             for infile in filenameList:
                 if self.isBadFile(infile, args.badFile):
-                    self.log.info("Skipping declared bad file %s" % infile)
+                    self.log.info("Skipping declared bad file %s", infile)
                     continue
                 fileInfo, hduInfoList = self.parse.getInfo(infile)
                 if self.isBadId(fileInfo, args.badId.idList):
-                    self.log.info("Skipping declared bad file %s: %s" % (infile, fileInfo))
+                    self.log.info("Skipping declared bad file %s: %s", infile, fileInfo)
                     continue
                 if self.register.check(registry, fileInfo):
-                    self.log.warn("%s: already ingested: %s" % (infile, fileInfo))
+                    self.log.warn("%s: already ingested: %s", infile, fileInfo)
                 outfile = self.parse.getDestination(args.butler, fileInfo, infile)
                 self.ingest(infile, outfile, mode=args.mode, dryrun=args.dryrun)
                 for info in hduInfoList:

python/lsst/obs/lsstSim/processCalibLsstSim.py

@@ -74,12 +74,12 @@ def run(self, sensorRefList, calibType):
         for amp in referenceAmps:
             if amp.dataId['snap'] == 1:
                 continue
-            self.log.log(self.log.INFO, "Amp: Processing %s" % (amp.dataId))
+            self.log.info("Amp: Processing %s", amp.dataId)
             print "dataid %s"%(amp.dataId)
             butler = amp.butlerSubset.butler
             ampMIList = afwImage.vectorMaskedImageF()
             for sRef in sensorRefList:
-                self.log.log(self.log.INFO, "Sensor: Processing %s" % (sRef.dataId))
+                self.log.info("Sensor: Processing %s", sRef.dataId)
                 ampSnapMIList = afwImage.vectorMaskedImageF()
                 dataId = eval(amp.dataId.__repr__())
                 dataId['visit'] = sRef.dataId['visit']
@@ -200,6 +200,6 @@ def combineMIList(self, miList, method='MEANCLIP'):
             else:
                 raise ValueError("Method %s is not supported for combining frames"%(method))
         except Exception as e:
-            self.log.log(self.log.WARN, "Could not combine the frames. %s" % (e,))
+            self.log.warn("Could not combine the frames. %s", e)
 
         return combinedFrame

python/lsst/obs/lsstSim/selectFluxMag0.py

@@ -99,7 +99,7 @@ def run(self, dataId):
             runArgDict = self.runArgDictFromDataId(dataId)
             visit = runArgDict["visit"]
         except Exception:
-            self.log.fatal("dataId does not contain mandatory visit key: dataId: %s"%dataId)
+            self.log.fatal("dataId does not contain mandatory visit key: dataId: %s", dataId)
 
         if self._display:
             self.log.info(self.config.database)
@@ -127,14 +127,13 @@ def run(self, dataId):
         dataTuple += tuple(wd[1] for wd in whereDataList)
 
         if self._display:
-            self.log.info("queryStr=%r; dataTuple=%s" % (queryStr, dataTuple))
+            self.log.info("queryStr=%r; dataTuple=%s", queryStr, dataTuple)
 
         cursor.execute(queryStr, dataTuple)
         result = cursor.fetchall()
         fluxMagInfoList = [FluxMagInfo(r) for r in result]
         if self._display:
-            self.log.info("Found %d exposures" % \
-                      (len(fluxMagInfoList)))
+            self.log.info("Found %d exposures", len(fluxMagInfoList))
 
         return pipeBase.Struct(
             fluxMagInfoList = fluxMagInfoList,

python/lsst/obs/lsstSim/selectLsstImages.py

@@ -164,7 +164,7 @@ def run(self, coordList, filter):
 
         dataTuple = (filter, self.config.maxFwhm)
 
-        self.log.info("queryStr=%r; dataTuple=%s" % (queryStr, dataTuple))
+        self.log.info("queryStr=%r; dataTuple=%s", queryStr, dataTuple)
 
         cursor.execute(queryStr, dataTuple)
         exposureInfoList = [ExposureInfo(result) for result in cursor]