Merge branch 'feature/SIM-1230/separate_utils_and_mixins'

lsst-sims · Jul 21, 2015 · 630110f · 630110f
2 parents 87604ac + e9831a9
commit 630110f
Show file tree

Hide file tree

Showing 47 changed files with 6,240 additions and 1,679 deletions.
diff --git a/examples/catalogsExamples.py b/examples/catalogsExamples.py
@@ -1,5 +1,6 @@
 import math
-from lsst.sims.catalogs.generation.db import CatalogDBObject, ObservationMetaData, SpatialBounds
+from lsst.sims.catalogs.generation.db import CatalogDBObject
+from lsst.sims.utils import ObservationMetaData, SpatialBounds
 #The following is to get the object ids in the registry
 import lsst.sims.catUtils.baseCatalogModels as bcm
 from lsst.sims.catUtils.exampleCatalogDefinitions import RefCatalogGalaxyBase, PhoSimCatalogPoint,\

diff --git a/examples/exampleSDSScatalogs.py b/examples/exampleSDSScatalogs.py
@@ -1,9 +1,10 @@
 import os
 
-from lsst.sims.photUtils.Photometry import PhotometryStars, PhotometryGalaxies
-from lsst.sims.photUtils.EBV import EBVmixin
+from lsst.sims.catUtils.mixins import PhotometryStars, PhotometryGalaxies
+from lsst.sims.catUtils.mixins import EBVmixin
 from lsst.sims.catalogs.measures.instance import compound, InstanceCatalog
-from lsst.sims.catalogs.generation.db import CatalogDBObject, ObservationMetaData
+from lsst.sims.catalogs.generation.db import CatalogDBObject
+from lsst.sims.utils import ObservationMetaData
 
 from lsst.sims.catUtils.baseCatalogModels import *
 

diff --git a/examples/findChipNameExample.py b/examples/findChipNameExample.py
@@ -7,7 +7,7 @@
 import os
 from collections import OrderedDict
 from lsst.sims.utils import arcsecFromRadians
-from lsst.sims.coordUtils import CameraCoords, calculatePupilCoordinates, \
+from lsst.sims.coordUtils import calculatePupilCoordinates, \
                                  observedFromICRS, findChipName
 from lsst.sims.catUtils.baseCatalogModels import OpSim3_61DBObject
 from lsst.obs.lsstSim import LsstSimMapper

diff --git a/examples/generatePhosimInput.py b/examples/generatePhosimInput.py
@@ -5,7 +5,8 @@
 
 from __future__ import with_statement
 from lsst.sims.catalogs.measures.instance import InstanceCatalog
-from lsst.sims.catalogs.generation.db import ObservationMetaData, CatalogDBObject
+from lsst.sims.catalogs.generation.db import CatalogDBObject
+from lsst.sims.utils import ObservationMetaData
 from lsst.sims.catUtils.baseCatalogModels import OpSim3_61DBObject
 from lsst.sims.catUtils.exampleCatalogDefinitions.phoSimCatalogExamples import \
         PhoSimCatalogPoint, PhoSimCatalogSersic2D, PhoSimCatalogZPoint

diff --git a/examples/makeGalaxyPhotCat.py b/examples/makeGalaxyPhotCat.py
@@ -1,4 +1,5 @@
-from lsst.sims.catalogs.generation.db import CatalogDBObject, ObservationMetaData
+from lsst.sims.catalogs.generation.db import CatalogDBObject
+from lsst.sims.utils import ObservationMetaData
 #The following is to get the object ids in the registry
 import lsst.sims.catUtils.baseCatalogModels as bcm
 from lsst.sims.catUtils.exampleCatalogDefinitions import RefCatalogGalaxyBase