Switch to using __file__ to reference other configs.

See https://community.lsst.org/t/pex-config-configs-now-know-where-they-are/4023.

config/apPipe.py

@@ -1,7 +1,6 @@
 # Config override for lsst.ap.pipe.ApPipeTask
 import os.path
-from lsst.utils import getPackageDir
 
-subaruConfigDir = os.path.join(getPackageDir('obs_subaru'), 'config')
+subaruConfigDir = os.path.dirname(__file__)
 
 config.ccdProcessor.load(os.path.join(subaruConfigDir, "processCcd.py"))

config/assembleCoadd.py

@@ -1,8 +1,7 @@
 import os.path
-from lsst.utils import getPackageDir
 
 # Load configs shared between assembleCoadd and makeCoaddTempExp
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "coaddBase.py"))
+config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py"))
 
 config.doSigmaClip = False
 config.subregionSize = (10000, 200) # 200 rows (since patch width is typically < 10k pixels)

config/calibrate.py

@@ -1,9 +1,8 @@
 import os.path
 
-from lsst.utils import getPackageDir
 from lsst.meas.algorithms import ColorLimit
 
-ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config")
+ObsConfigDir = os.path.dirname(__file__)
 
 bgFile = os.path.join(ObsConfigDir, "background.py")
 
@@ -14,7 +13,7 @@
 for refObjLoader in (config.astromRefObjLoader,
                      config.photoRefObjLoader,
                      ):
-    refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))
+    refObjLoader.load(os.path.join(ObsConfigDir, "filterMap.py"))
     # This is the Gen2 configuration option.
     refObjLoader.ref_dataset_name = "ps1_pv3_3pi_20170110"
 

config/charImage.py

@@ -1,9 +1,8 @@
 import os.path
 
-from lsst.utils import getPackageDir
 from lsst.meas.algorithms import ColorLimit
 
-ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config")
+ObsConfigDir = os.path.dirname(__file__)
 
 bgFile = os.path.join(ObsConfigDir, "background.py")
 
@@ -28,7 +27,7 @@
     config.measurePsf.psfDeterminer.name = "pca"
 
 # Astrometry
-config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))
+config.refObjLoader.load(os.path.join(ObsPackageDir, "filterMap.py"))
 config.refObjLoader.ref_dataset_name = "ps1_pv3_3pi_20170110"
 
 # Set to match defaults curretnly used in HSC production runs (e.g. S15B)

config/characterizeImage.py

@@ -1,9 +1,8 @@
 import os.path
 
-from lsst.utils import getPackageDir
 from lsst.meas.algorithms import ColorLimit
 
-ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config")
+ObsConfigDir = os.path.dirname(__file__)
 
 charImFile = os.path.join(ObsConfigDir, "charImage.py")
 config.load(charImFile)

config/coaddDriver.py

@@ -1,7 +1,6 @@
 # Load from sub-configurations
 import os.path
 
-from lsst.utils import getPackageDir
 
 from lsst.pipe.tasks.assembleCoadd import CompareWarpAssembleCoaddTask
 config.assembleCoadd.retarget(CompareWarpAssembleCoaddTask)
@@ -10,7 +9,7 @@
                       ("backgroundReference", "backgroundReference"),
                       ("assembleCoadd", "compareWarpAssembleCoadd"),
                       ("detectCoaddSources", "detectCoaddSources")):
-    path = os.path.join(getPackageDir("obs_subaru"), "config", filename + ".py")
+    path = os.path.join(os.path.dirname(__file__), filename + ".py")
     if os.path.exists(path):
         getattr(config, sub).load(path)
 

config/compareWarpAssembleCoadd.py

@@ -1,8 +1,7 @@
 import os.path
-from lsst.utils import getPackageDir
 
-# Load configs from base assembleCoadd 
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "assembleCoadd.py"))
+# Load configs from base assembleCoadd
+config.load(os.path.join(os.path.dirname(__file__), "assembleCoadd.py"))
 
 # 200 rows (since patch width is typically < 10k pixels
 config.assembleStaticSkyModel.subregionSize = (10000, 200)

config/deblendCoaddSources.py

@@ -1,7 +1,6 @@
 """Subaru-specific overrides for DeblendCoaddSourcesTask"""
 
 import os.path
-from lsst.utils import getPackageDir
 
-config.singleBandDeblend.load(os.path.join(getPackageDir("obs_subaru"), "config", "singleBandDeblend.py"))
-config.multiBandDeblend.load(os.path.join(getPackageDir("obs_subaru"), "config", "multiBandDeblend.py"))
+config.singleBandDeblend.load(os.path.join(os.path.dirname(__file__), "singleBandDeblend.py"))
+config.multiBandDeblend.load(os.path.join(os.path.dirname(__file__), "multiBandDeblend.py"))

config/forcedPhotCcd.py

@@ -1,8 +1,7 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "apertures.py"))
-config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "kron.py"))
+config.measurement.load(os.path.join(os.path.dirname(__file__), "apertures.py"))
+config.measurement.load(os.path.join(os.path.dirname(__file__), "kron.py"))
 
 config.measurement.slots.gaussianFlux = None

config/forcedPhotCoadd.py

@@ -1,12 +1,11 @@
 import os.path
 
-from lsst.utils import getPackageDir
 from lsst.meas.base import CircularApertureFluxAlgorithm
 
-config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "apertures.py"))
-config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "kron.py"))
-config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "convolvedFluxes.py"))
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "cmodel.py"))
+config.measurement.load(os.path.join(os.path.dirname(__file__), "apertures.py"))
+config.measurement.load(os.path.join(os.path.dirname(__file__), "kron.py"))
+config.measurement.load(os.path.join(os.path.dirname(__file__), "convolvedFluxes.py"))
+config.load(os.path.join(os.path.dirname(__file__), "cmodel.py"))
 
 config.measurement.slots.gaussianFlux = None
 

config/fringe.py

@@ -1,7 +1,6 @@
-from lsst.utils import getPackageDir
 import os
 
-configDir = os.path.join(getPackageDir("obs_subaru"), "config")
+configDir = os.path.dirname(__file__)
 bgFile = os.path.join(configDir, "background.py")
 
 config.detection.background.load(bgFile)

config/hsc/apPipe.py

@@ -1,7 +1,6 @@
 # Config override for lsst.ap.pipe.ApPipeTask
 import os.path
-from lsst.utils import getPackageDir
 
-hscConfigDir = os.path.join(getPackageDir('obs_subaru'), 'config', 'hsc')
+hscConfigDir = os.path.dirname(__file__)
 
 config.ccdProcessor.load(os.path.join(hscConfigDir, "processCcd.py"))

config/hsc/assembleCoadd.py

@@ -1,8 +1,7 @@
 import os.path
-from lsst.utils import getPackageDir
 
 # Load configs shared between assembleCoadd and makeCoaddTempExp
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "coaddBase.py"))
+config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py"))
 
 config.doAttachTransmissionCurve = True
 config.interpImage.transpose = True  # Saturation trails are usually oriented east-west, so along rows

config/hsc/bias.py

@@ -1,7 +1,6 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.isr.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "isr.py"))
+config.isr.load(os.path.join(os.path.dirname(__file__), "isr.py"))
 config.isr.doBrighterFatter = False
 config.isr.doStrayLight = False

config/hsc/calibrate.py

@@ -4,11 +4,10 @@
 """
 import os.path
 
-from lsst.utils import getPackageDir
 
 from lsst.meas.astrom import MatchOptimisticBConfig
 
-ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc")
+ObsConfigDir = os.path.dirname(__file__)
 
 config.photoCal.colorterms.load(os.path.join(ObsConfigDir, 'colorterms.py'))
 for refObjLoader in (config.astromRefObjLoader,

config/hsc/charImage.py

@@ -4,11 +4,10 @@
 """
 import os.path
 
-from lsst.utils import getPackageDir
 
 from lsst.meas.astrom import MatchOptimisticBConfig
 
-ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc")
+ObsConfigDir = os.path.join(os.path.dirname(__file__))
 
 config.measurePsf.starSelector["objectSize"].widthMin = 0.9
 config.measurePsf.starSelector["objectSize"].fluxMin = 4000

config/hsc/characterizeImage.py

@@ -1,9 +1,8 @@
 import os.path
 
-from lsst.utils import getPackageDir
 from lsst.meas.algorithms import ColorLimit
 
-ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc")
+ObsConfigDir = os.path.join(os.path.dirname(__file__))
 
 charImFile = os.path.join(ObsConfigDir, "charImage.py")
 config.load(charImFile)

config/hsc/coaddAnalysis.py

@@ -1,7 +1,6 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.colorterms.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "colorterms.py"))
-config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "filterMap.py"))
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "srcSchemaMap.py"))
+config.colorterms.load(os.path.join(os.path.dirname(__file__), "colorterms.py"))
+config.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py"))
+config.load(os.path.join(os.path.dirname(__file__), "srcSchemaMap.py"))

config/hsc/coaddDriver.py

@@ -1,12 +1,11 @@
 # Load from sub-configurations
 import os.path
 
-from lsst.utils import getPackageDir
 
 for sub, filename in (("makeCoaddTempExp", "makeCoaddTempExp"),
                       ("backgroundReference", "backgroundReference"),
                       ("assembleCoadd", "compareWarpAssembleCoadd"),
                       ("detectCoaddSources", "detectCoaddSources")):
-    path = os.path.join(getPackageDir("obs_subaru"), "config", "hsc", filename + ".py")
+    path = os.path.join(os.path.dirname(__file__), filename + ".py")
     if os.path.exists(path):
         getattr(config, sub).load(path)

config/hsc/colorAnalysis.py

@@ -1,6 +1,5 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "srcSchemaMap.py"))
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "extinctionCoeffs.py"))
+config.load(os.path.join(os.path.dirname(__file__), "srcSchemaMap.py"))
+config.load(os.path.join(os.path.dirname(__file__), "extinctionCoeffs.py"))

config/hsc/compareCoaddAnalysis.py

@@ -1,7 +1,6 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.colorterms.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "colorterms.py"))
-config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "filterMap.py"))
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "srcSchemaMap.py"))
+config.colorterms.load(os.path.join(os.path.dirname(__file__), "colorterms.py"))
+config.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py"))
+config.load(os.path.join(os.path.dirname(__file__), "srcSchemaMap.py"))

config/hsc/compareVisitAnalysis.py

@@ -1,7 +1,6 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))
-config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "filterMap.py"))
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "srcSchemaMap.py"))
+config.refObjLoader.load(os.path.join(os.path.dirname(__file__), "..", "filterMap.py"))
+config.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py"))
+config.load(os.path.join(os.path.dirname(__file__), "srcSchemaMap.py"))

config/hsc/compareWarpAssembleCoadd.py

@@ -1,8 +1,7 @@
 import os.path
-from lsst.utils import getPackageDir
 
 # Load configs shared between assembleCoadd and makeCoaddTempExp
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "assembleCoadd.py"))
+config.load(os.path.join(os.path.dirname(__file__), "assembleCoadd.py"))
 
 config.assembleStaticSkyModel.doApplyExternalPhotoCalib = True
 config.assembleStaticSkyModel.doApplyExternalSkyWcs = True

config/hsc/convertRepo.py

@@ -1,5 +1,4 @@
 import os.path
-from lsst.utils import getPackageDir
 from lsst.obs.base.gen2to3 import ConvertRepoSkyMapConfig
 
 # Register translators for data IDs.  This is unfortunately a bit fragile; it
@@ -9,16 +8,14 @@
 config.runs["raw"] = "raw/hsc"
 config.runs["brightObjectMask"] = "masks/hsc"
 config.skyMaps["hsc_rings_v1"] = ConvertRepoSkyMapConfig()
-config.skyMaps["hsc_rings_v1"].load(os.path.join(getPackageDir("obs_subaru"), "config",
-                                                 "makeSkyMap.py"))
-config.skyMaps["hsc_rings_v1"].load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc",
-                                                 "makeSkyMap.py"))
+config.skyMaps["hsc_rings_v1"].load(os.path.join(os.path.dirname(__file__), "..", "makeSkyMap.py"))
+config.skyMaps["hsc_rings_v1"].load(os.path.join(os.path.dirname(__file__), "makeSkyMap.py"))
 # If there's no skymap in the root repo, but some dataset defined on
 # tracts/patches is present there (i.e. brightObjectMask), assume this
 # skymap.
 config.rootSkyMapName = "hsc_rings_v1"
 
-config.raws.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "ingest-gen3.py"))
+config.raws.load(os.path.join(os.path.dirname(__file__), "ingest-gen3.py"))
 config.refCats.append("ps1_pv3_3pi_20170110")
 config.runs["ps1_pv3_3pi_20170110"] = "refcats"
 

config/hsc/dark.py

@@ -1,8 +1,7 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.isr.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "isr.py"))
+config.isr.load(os.path.join(os.path.dirname(__file__), "isr.py"))
 
 config.isr.doBias = True
 config.repair.cosmicray.nCrPixelMax = 1000000

config/hsc/displayCatalog.py

@@ -1,5 +1,4 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "srcSchemaMap.py"))
+config.load(os.path.join(os.path.dirname(__file__), "srcSchemaMap.py"))

config/hsc/fgcmBuildStars.py

@@ -4,7 +4,6 @@
 
 import os.path
 
-from lsst.utils import getPackageDir
 
 config.minPerBand = 2
 config.densityCutMaxPerPixel = 2000
@@ -21,7 +20,7 @@
                                                 'N387': 'g', 'N816': 'i', 'N921': 'z',
                                                 'N1010': 'y'}
 config.fgcmLoadReferenceCatalog.applyColorTerms = True
-hscConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc")
+hscConfigDir = os.path.join(os.path.dirname(__file__))
 config.fgcmLoadReferenceCatalog.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
 config.fgcmLoadReferenceCatalog.referenceSelector.doSignalToNoise = True
 config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.fluxField = 'i_flux'

config/hsc/fgcmCalibrateTract.py

@@ -1,18 +1,10 @@
 import os.path
 
-from lsst.utils import getPackageDir
-
-config.fgcmBuildStars.load(os.path.join(getPackageDir('obs_subaru'),
-                                        'config',
-                                        'hsc',
+config.fgcmBuildStars.load(os.path.join(os.path.dirname(__file__),
                                         'fgcmBuildStars.py'))
-config.fgcmFitCycle.load(os.path.join(getPackageDir('obs_subaru'),
-                                      'config',
-                                      'hsc',
+config.fgcmFitCycle.load(os.path.join(os.path.dirname(__file__),
                                       'fgcmFitCycle.py'))
-config.fgcmOutputProducts.load(os.path.join(getPackageDir('obs_subaru'),
-                                            'config',
-                                            'hsc',
+config.fgcmOutputProducts.load(os.path.join(os.path.dirname(__file__),
                                             'fgcmOutputProducts.py'))
 config.fgcmFitCycle.aperCorrFitNBins = 0
 config.fgcmFitCycle.useRepeatabilityForExpGrayCutsDict = {'N387': True,

config/hsc/flat.py

@@ -1,12 +1,11 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.isr.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "isr.py"))
+config.isr.load(os.path.join(os.path.dirname(__file__), "isr.py"))
 
 from lsst.obs.hsc.calibs import HscFlatCombineTask
 config.combination.retarget(HscFlatCombineTask)
-config.combination.vignette.load(os.path.join(getPackageDir("obs_subaru"), 'config', 'hsc', 'vignette.py'))
+config.combination.vignette.load(os.path.join(os.path.dirname(__file__), 'vignette.py'))
 
 config.isr.doBrighterFatter = False
 config.isr.doStrayLight = False

config/hsc/fringe.py

@@ -1,7 +1,6 @@
 import os.path
 
-from lsst.utils import getPackageDir
 
-config.isr.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "isr.py"))
+config.isr.load(os.path.join(os.path.dirname(__file__), "isr.py"))
 
 config.isr.doBrighterFatter = False

config/hsc/isr.py

@@ -3,7 +3,6 @@
 """
 import os.path
 
-from lsst.utils import getPackageDir
 from lsst.obs.subaru.strayLight import SubaruStrayLightTask
 
 config.datasetType = "raw"