lsst-dm · r-owen · Sep 2, 2017 · Aug 10, 2017 · Aug 14, 2017
diff --git a/bin.src/makeLsstCameraRepository.py b/bin.src/makeLsstCameraRepository.py
@@ -37,7 +37,8 @@
 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, NullLinearityType
+from lsst.afw.cameraGeom import DetectorConfig, CameraConfig, \
+    TransformMapConfig, FIELD_ANGLE, FOCAL_PLANE, PIXELS, NullLinearityType
 from lsst.obs.lsstSim import LsstSimMapper
 
 
@@ -325,16 +326,16 @@ def getPhosimVersion(defaultDataDir):
     # camConfig.boresiteOffset_y = 0.
     tConfig = afwGeom.TransformConfig()
     tConfig.transform.name = 'inverted'
-    radialClass = afwGeom.xyTransformRegistry['radial']
+    radialClass = afwGeom.transformRegistry['radial']
     tConfig.transform.active.transform.retarget(radialClass)
     # According to Dave M. the simulated LSST transform is well approximated (1/3 pix)
     # by a scale and a pincusion.
     tConfig.transform.active.transform.coeffs = [0., 1./pScaleRad, 0., pincushion/pScaleRad]
     # tConfig.transform.active.boresiteOffset_x = camConfig.boresiteOffset_x
     # tConfig.transform.active.boresiteOffset_y = camConfig.boresiteOffset_y
-    tmc = afwGeom.TransformMapConfig()
+    tmc = TransformMapConfig()
     tmc.nativeSys = FOCAL_PLANE.getSysName()
-    tmc.transforms = {PUPIL.getSysName(): tConfig}
+    tmc.transforms = {FIELD_ANGLE.getSysName(): tConfig}
     camConfig.transformDict = tmc
 
     def makeDir(dirPath, doClobber=False):

diff --git a/tests/testEdgeRolloffFunctor.py → tests/test_edgeRolloffFunctor.py b/tests/testEdgeRolloffFunctor.py → tests/test_edgeRolloffFunctor.py
diff --git a/tests/getBias.py → tests/test_getBias.py b/tests/getBias.py → tests/test_getBias.py
diff --git a/tests/getCamera.py → tests/test_getCamera.py b/tests/getCamera.py → tests/test_getCamera.py
diff --git a/tests/getDefects.py → tests/test_getDefects.py b/tests/getDefects.py → tests/test_getDefects.py
diff --git a/tests/testGetEimage.py → tests/test_getEimage.py b/tests/testGetEimage.py → tests/test_getEimage.py
diff --git a/tests/getFlat.py → tests/test_getFlat.py b/tests/getFlat.py → tests/test_getFlat.py
diff --git a/tests/getId.py → tests/test_getId.py b/tests/getId.py → tests/test_getId.py
diff --git a/tests/getMD.py → tests/test_getMD.py b/tests/getMD.py → tests/test_getMD.py
diff --git a/tests/getRaw.py → tests/test_getRaw.py b/tests/getRaw.py → tests/test_getRaw.py
diff --git a/tests/testLsstSimIsrTask.py → tests/test_lsstSimIsrTask.py b/tests/testLsstSimIsrTask.py → tests/test_lsstSimIsrTask.py
diff --git a/tests/testSelectFluxMag0.py → tests/test_selectFluxMag0.py b/tests/testSelectFluxMag0.py → tests/test_selectFluxMag0.py
diff --git a/tests/testSelectLsstImages.py → tests/test_selectLsstImages.py b/tests/testSelectLsstImages.py → tests/test_selectLsstImages.py
diff --git a/tests/validate.py → tests/test_validate.py b/tests/validate.py → tests/test_validate.py