linting

Author: Gerenjie

python/lsst/pipe/tasks/drpAssociationPipe.py

@@ -270,7 +270,6 @@ def visitDetectorPair(dataRef):
                                                    innerTractSkyRegion,
                                                    skyInfo.wcs)
                 associatedSsSources = associatedSsSources[ssInTractPatch]
-                print('masked', len(ssInTractPatch), 'ssSources to', sum(ssInTractPatch), 'in tract-patch')
                 assocDiaSrcIds = set(associatedSsSources['diaSourceId'])
                 diaSrcMask = [diaId in assocDiaSrcIds for diaId in associatedSsDiaSources['diaSourceId']]
                 associatedSsDiaSources = associatedSsDiaSources[np.array(diaSrcMask)]

python/lsst/pipe/tasks/generateEphemerides.py

@@ -32,12 +32,12 @@
 ephemerides from a csv. While awkward and un-pipetask-like, it works and takes
 advantage of Sorcha's as-designed speed.
 
-Eventually, this should be replaced with adam_core's ephemeris generation 
+Eventually, this should be replaced with adam_core's ephemeris generation
 tools which propagate forward orbital uncertainty into on-sky ellipses.
 Doing so will require re-implementing the healpix binning method described
 in https://arxiv.org/abs/2506.02140. Doing so will not only improve this code
 but also allow on-sky uncertainties to be used during association. When this is
-done, mpsky should be modified to do the same. 
+done, mpsky should be modified to do the same.
 """
 
 __all__ = ["GenerateEphemeridesConfig", "GenerateEphemeridesTask"]
@@ -47,30 +47,28 @@
 import os
 import pandas as pd
 from importlib import resources
-import sqlite3
-import subprocess
-import tempfile
+from sqlite3 import connect as sqlite_connect
+from subprocess import run, PIPE
+from tempfile import TemporaryDirectory
+from textwrap import dedent
 
 
-import lsst.daf.butler as dafButler
-from lsst.geom import SpherePoint, degrees
-import lsst.pex.config as pexConfig
+from lsst.pex.config import Field
 from lsst.pipe.base import connectionTypes, NoWorkFound, PipelineTask, \
     PipelineTaskConfig, PipelineTaskConnections, Struct
 import lsst.pipe.tasks
-from lsst.pipe.tasks.associationUtils import obj_id_to_ss_object_id
-from lsst.sphgeom import ConvexPolygon
 from lsst.utils.timer import timeMethod
 
+
 class GenerateEphemeridesConnections(PipelineTaskConnections,
-                                        dimensions=("instrument",)):
+                                     dimensions=("instrument",)):
 
     visitSummaries = connectionTypes.Input(
         doc="Summary of visit information including ra, dec, and time",
         name="preliminary_visit_summary",
         storageClass="ExposureCatalog",
         dimensions={"instrument", "visit"},
-        multiple = True
+        multiple=True
     )
     mpcorb = connectionTypes.Input(
         doc="Minor Planet Center orbit table used for association",
@@ -142,19 +140,18 @@ class GenerateEphemeridesConnections(PipelineTaskConnections,
         dimensions=("instrument", "visit"),
         multiple=True,
     )
-    
 
 
 class GenerateEphemeridesConfig(
         PipelineTaskConfig,
         pipelineConnections=GenerateEphemeridesConnections):
-    observatoryCode = pexConfig.Field(
+    observatoryCode = Field(
         dtype=str,
         doc="IAU Minor Planet Center observer code for queries "
             "(default is X05 for Rubin Obs./LSST)",
         default='X05'
     )
-    observatoryFOVRadius = pexConfig.Field(
+    observatoryFOVRadius = Field(
         dtype=float,
         doc="The field of view of the observatory (degrees)",
         default=2.06,
@@ -202,7 +199,6 @@ def runQuantum(
             ephemeris_visit = outputs.ssObjects[dataId['visit']]
             butlerQC.put(ephemeris_visit, ref)
 
-
     @timeMethod
     def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2650, pck00010,
             earth_latest_high_prec, earth_620120_250826, earth_2025_250826_2125_predict, naif0012):
@@ -214,6 +210,11 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
         visitSummary : `lsst.afw.table.ExposureCatalog`
             Has rows with .getVisitInfo, which give the center and time of exposure
 
+        mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2650, pck00010,
+            earth_latest_high_prec, earth_620120_250826, earth_2025_250826_2125_predict,
+            naif0012 : `lsst.pipe.tasks.sspAuxiliaryFile.SSPAuxiliaryFile`s
+            Minor Planet Center orbit table used for association
+
         Returns
         -------
         result : `lsst.pipe.base.Struct`
@@ -229,7 +230,7 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
                     RA in decimal degrees (`float`)
                 ``dec``
                     DEC in decimal degrees (`float`)
-                
+
         """
         if len(visitSummaries) == 0:
             raise NoWorkFound("No visits input!")
@@ -247,7 +248,7 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
             "fieldRA": fieldRA,
             "fieldDec": fieldDec,
             "observationId": visits,
-            "visitTime" : np.ones(n) * visitTime,
+            "visitTime": np.ones(n) * visitTime,
             "observationStartMJD": epochMJD - (visitTime / 2) / 86400.0,
             "visitExposureTime": visitTime,
 
@@ -258,38 +259,39 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
             "fiveSigmaDepth": [-1] * n,
             "rotSkyPos": [-1] * n,
         })
-        mpcorb = mpcorb.iloc[:10_000] # TODO: remove
 
         inputOrbits = mpcorb[
-            ['packed_primary_provisional_designation', 'q', 'e', 'i', 'node','argperi','peri_time','epoch_mjd']
+            ['packed_primary_provisional_designation', 'q', 'e', 'i',
+             'node', 'argperi', 'peri_time', 'epoch_mjd']
         ].rename(columns={'packed_primary_provisional_designation': 'ObjID', 'epoch_mjd': 'epochMJD_TDB',
                           'i': 'inc', 'argperi': 'argPeri', 'peri_time': 't_p_MJD_TDB'})
         inputOrbits['FORMAT'] = 'COM'
         # Colors exactly like jake's prep_input_colors
         inputColors = inputOrbits[["ObjID"]].copy()
         inputColors["H_r"] = mpcorb['h']
-        inputColors["GS"] = 0.15 # Traditional
+        inputColors["GS"] = 0.15  # Traditional
 
         eph_str = resources.files(lsst.pipe.tasks).parents[3].joinpath("data/eph.ini").read_text()
         eph_str = eph_str.replace("{OBSCODE}", self.config.observatoryCode)
         eph_str = eph_str.replace("{FOV}", str(self.config.observatoryFOVRadius))
 
-        with tempfile.TemporaryDirectory() as tmpdirname:
+        with TemporaryDirectory() as tmpdirname:
             self.log.info(f'temp dir: {tmpdirname}')
-            
+
             # Orbits
             inputOrbits.to_csv(f'{tmpdirname}/orbits.csv', index=False)
             # Observations SQLite
-            conn = sqlite3.connect(f'{tmpdirname}/pointings.db')
+            conn = sqlite_connect(f'{tmpdirname}/pointings.db')
             inputVisits.to_sql('observations', conn, if_exists='replace', index=False)
             conn.close()
 
-            open(f'{tmpdirname}/eph.ini', 'w').write(eph_str)
+            with open(f'{tmpdirname}/eph.ini', 'w') as ephFile:
+                ephFile.write(eph_str)
+
             inputColors.to_csv(f'{tmpdirname}/colors.csv', index=False)
 
-            
             cache = f'{tmpdirname}/sorcha_cache/'
-            self.log.info(f'making cache')
+            self.log.info('making cache')
             os.mkdir(cache)
             # DONE
             for filename, fileref in [
@@ -304,28 +306,32 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
                 ('naif0012.tls', naif0012),
             ]:
                 self.log.info(f'writing {filename}')
-                open(cache + filename, 'wb').write(fileref.fileContents.read())
-            meta_kernel_text = f"""\\begindata
+                with open(cache + filename, 'wb') as file:
+                    file.write(fileref.fileContents.read())
 
-PATH_VALUES = ('{tmpdirname}/sorcha_cache/')
+            meta_kernel_text = dedent(f"""\
+                                      \\begindata
 
-PATH_SYMBOLS = ('A')
+                                      PATH_VALUES = ('{tmpdirname}/sorcha_cache/')
 
-KERNELS_TO_LOAD=(
-    '$A/naif0012.tls',
-    '$A/earth_620120_250826.bpc',
-    '$A/earth_2025_250826_2125_predict.bpc',
-    '$A/pck00010.pck',
-    '$A/de440s.bsp',
-    '$A/earth_latest_high_prec.bpc',
-)
+                                      PATH_SYMBOLS = ('A')
 
-\\begintext
-"""
-            open(f'{tmpdirname}/sorcha_cache/meta_kernel.txt', 'w').write(meta_kernel_text)
+                                      KERNELS_TO_LOAD=(
+                                          '$A/naif0012.tls',
+                                          '$A/earth_620120_250826.bpc',
+                                          '$A/earth_2025_250826_2125_predict.bpc',
+                                          '$A/pck00010.pck',
+                                          '$A/de440s.bsp',
+                                          '$A/earth_latest_high_prec.bpc',
+                                      )
+
+                                      \\begintext
+                                      """)
+            with open(f'{tmpdirname}/sorcha_cache/meta_kernel.txt', 'w') as meta_kernel_file:
+                meta_kernel_file.write(meta_kernel_text)
             self.log.info('Sorcha process begun')
 
-            result = subprocess.run(
+            result = run(
                 [
                     "sorcha",
                     "run",
@@ -337,18 +343,19 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
                     "--ew", f"{tmpdirname}/ephemeris",
                     "--ar", f"{tmpdirname}/sorcha_cache/"
                 ],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
+                stdout=PIPE,
+                stderr=PIPE,
                 text=True
             )
 
             self.log.info(f"Sorcha STDOUT:\n {result.stdout}")
             self.log.info(f"Sorcha STDERR:\n {result.stderr}")
-            
+
             eph_path = f'{tmpdirname}/ephemeris.csv'
             if not os.path.exists(eph_path):
                 raise FileNotFoundError(
-                    f" Sorcha did not create ephemeris. Check STDOUT/STDERR above. Directory contents:\n{os.listdir(tmpdirname)}"
+                    " Sorcha did not create ephemeris. Check STDOUT/STDERR above. "
+                    f"Directory contents:\n{os.listdir(tmpdirname)}"
                 )
 
             # Return Sorcha output directly
@@ -358,7 +365,3 @@ def run(self, visitSummaries, mpcorb, de440s, sb441_n16, obsCodes, linux_p1550p2
             if v not in perVisitSsObjects:
                 perVisitSsObjects[v] = ephemeris.iloc[:0]
         return Struct(ssObjects=perVisitSsObjects)
-
-
-    
-