Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace eups.productDir() calls with lsst.utils.getPackageDir() #5

Merged
merged 1 commit into from
Jun 8, 2015
Merged

replace eups.productDir() calls with lsst.utils.getPackageDir() #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/genDefectRegistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@

import pyfits

import eups
import lsst.utils

if len(sys.argv) < 2:
raise RuntimeError("Must provide a phosim version against which these defects are valid")

phosimVersion = sys.argv[1]
baseDir = eups.productDir("obs_lsstSim")
baseDir = lsst.utils.getPackageDir('obs_lsstsim')
registryDir = os.path.join(os.path.normpath(baseDir), "description", "defects")
registryPath = os.path.join(registryDir, "defectRegistry.sqlite3")

Expand Down
4 changes: 2 additions & 2 deletions bin/makeLsstCameraRepository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import re
import shutil

import eups
import lsst.utils
import lsst.afw.geom as afwGeom
import lsst.afw.table as afwTable
from lsst.afw.cameraGeom import (DetectorConfig, CameraConfig, PUPIL, FOCAL_PLANE, PIXELS)
Expand Down Expand Up @@ -247,7 +247,7 @@ def makeDetectorConfigs(detectorLayoutFile, phosimVersion):
DetectorLayoutFile -- https://dev.lsstcorp.org/cgit/LSST/sims/phosim.git/plain/data/lsst/focalplanelayout.txt?h=dev
SegmentsFile -- https://dev.lsstcorp.org/cgit/LSST/sims/phosim.git/plain/data/lsst/segmentation.txt?h=dev
"""
baseDir = eups.productDir("obs_lsstSim")
baseDir = lsst.utils.getPackageDir('obs_lsstsim')
defaultOutDir = os.path.join(os.path.normpath(baseDir), "description", "camera")

parser = argparse.ArgumentParser()
Expand Down
1 change: 1 addition & 0 deletions ups/obs_lsstSim.table
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ setupRequired(meas_algorithms)
setupRequired(ip_isr)
setupRequired(pipe_tasks)
setupRequired(mysqlpython)
setupRequired(utils)

envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
envPrepend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
Expand Down