Merge branch 'feature/SIM-1230/separate_utils_and_mixins'

lsst-sims · Jul 21, 2015 · 7b5f72c · 7b5f72c
2 parents ed35465 + 8a24244
commit 7b5f72c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/examples/galSimCompoundGenerator.py b/examples/galSimCompoundGenerator.py
@@ -5,7 +5,8 @@
 
 import os
 import galsim
-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 StarObj, GalaxyBulgeObj, GalaxyDiskObj, GalaxyAgnObj, \
                                                  OpSim3_61DBObject
 from lsst.sims.GalSimInterface import SNRdocumentPSF, GalSimStars, GalSimGalaxies, \

diff --git a/examples/galSimGalaxyBulgeGenerator.py b/examples/galSimGalaxyBulgeGenerator.py
@@ -4,7 +4,8 @@
 """
 
 import os
-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 GalaxyBulgeObj, OpSim3_61DBObject
 from lsst.sims.GalSimInterface import GalSimGalaxies, SNRdocumentPSF
 

diff --git a/examples/galSimGalaxyBulgeWithNoise.py b/examples/galSimGalaxyBulgeWithNoise.py
@@ -3,7 +3,8 @@
 """
 
 import os
-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 GalaxyBulgeObj, OpSim3_61DBObject
 from lsst.sims.GalSimInterface import GalSimGalaxies, ExampleCCDNoise, \
                                                SNRdocumentPSF

diff --git a/examples/galSimStarGenerator.py b/examples/galSimStarGenerator.py
@@ -4,7 +4,8 @@
 
 import os
 import galsim
-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 StarObj, OpSim3_61DBObject
 from lsst.sims.GalSimInterface import SNRdocumentPSF, GalSimStars
 

diff --git a/examples/galSimStarsWithNoise.py b/examples/galSimStarsWithNoise.py
@@ -4,7 +4,8 @@
 
 import os
 import galsim
-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 StarObj, OpSim3_61DBObject
 from lsst.sims.GalSimInterface import GalSimStars, SNRdocumentPSF, ExampleCCDNoise
 from lsst.sims.photUtils import LSSTdefaults

diff --git a/python/lsst/sims/GalSimInterface/galSimCatalogs.py b/python/lsst/sims/GalSimInterface/galSimCatalogs.py
@@ -16,9 +16,10 @@
 import copy
 from lsst.sims.utils import arcsecFromRadians
 from lsst.sims.catalogs.measures.instance import InstanceCatalog, cached, is_null
-from lsst.sims.coordUtils import CameraCoords, AstrometryGalaxies, AstrometryStars
+from lsst.sims.catUtils.mixins import CameraCoords, AstrometryGalaxies, AstrometryStars, \
+                                      EBVmixin
 from lsst.sims.GalSimInterface import GalSimInterpreter, GalSimDetector
-from lsst.sims.photUtils import EBVmixin, Sed, Bandpass, PhotometryHardware, \
+from lsst.sims.photUtils import Sed, Bandpass, PhotometryHardware, \
                                 PhotometricParameters, LSSTdefaults
 import lsst.afw.cameraGeom.testUtils as camTestUtils
 import lsst.afw.geom as afwGeom

diff --git a/tests/testGalSimInterface.py b/tests/testGalSimInterface.py
@@ -10,7 +10,7 @@
 from lsst.sims.photUtils import Bandpass, calcSkyCountsPerPixelForM5, LSSTdefaults, PhotometricParameters
 from lsst.sims.catalogs.measures.instance import InstanceCatalog
 from lsst.sims.catalogs.generation.utils import makePhoSimTestDB
-from lsst.sims.catalogs.generation.db import ObservationMetaData
+from lsst.sims.utils import ObservationMetaData
 from lsst.sims.GalSimInterface import GalSimGalaxies, GalSimStars, GalSimAgn, \
                                                SNRdocumentPSF, ExampleCCDNoise
 from lsst.sims.catUtils.utils import calcADUwrapper, testGalaxyBulgeDBObj, testGalaxyDiskDBObj, \

diff --git a/ups/sims_GalSimInterface.table b/ups/sims_GalSimInterface.table
@@ -1,4 +1,8 @@
 setupRequired(GalSim)
+setupRequired(sims_utils)
+setupRequired(sims_coordUtils)
+setupRequired(sims_catalogs_generation)
+setupRequired(sims_catalogs_measures)
 setupRequired(sims_catUtils)
 
 setupOptional(obs_lsstSim)