Merge ead2986 into ed4e8bb

desihub · Mar 26, 2019 · 4728882 · 4728882
2 parents ed4e8bb + ead2986
commit 4728882
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/py/desitarget/mock/mockmaker.py b/py/desitarget/mock/mockmaker.py
@@ -50,10 +50,10 @@ def empty_targets_table(nobj=1):
 
     targets = Table()
 
-    targets.add_column(Column(name='RELEASE', length=nobj, dtype='i4'))
+    targets.add_column(Column(name='RELEASE', length=nobj, dtype='i2'))
     targets.add_column(Column(name='BRICKID', length=nobj, dtype='i4'))
     targets.add_column(Column(name='BRICKNAME', length=nobj, dtype='U8'))
-    targets.add_column(Column(name='BRICK_OBJID', length=nobj, dtype='i4'))
+    targets.add_column(Column(name='BRICK_OBJID', length=nobj, dtype='<i4'))
     targets.add_column(Column(name='TYPE', length=nobj, dtype='S4'))
     targets.add_column(Column(name='RA', length=nobj, dtype='f8', unit='degree'))
     targets.add_column(Column(name='DEC', length=nobj, dtype='f8', unit='degree'))
@@ -117,14 +117,15 @@ def empty_targets_table(nobj=1):
     targets.add_column(Column(name='SHAPEEXP_E2', length=nobj, dtype='f4'))
     targets.add_column(Column(name='SHAPEEXP_E2_IVAR', length=nobj, dtype='f4'))
 
-    targets.add_column(Column(name='FIBERFLUX_G', length=nobj, dtype='f4'))
-    targets.add_column(Column(name='FIBERFLUX_R', length=nobj, dtype='f4'))
-    targets.add_column(Column(name='FIBERFLUX_Z', length=nobj, dtype='f4'))
-    targets.add_column(Column(name='FIBERTOTFLUX_G', length=nobj, dtype='f4'))
-    targets.add_column(Column(name='FIBERTOTFLUX_R', length=nobj, dtype='f4'))
-    targets.add_column(Column(name='FIBERTOTFLUX_Z', length=nobj, dtype='f4'))
+    targets.add_column(Column(name='FIBERFLUX_G', length=nobj, dtype='>f4'))
+    targets.add_column(Column(name='FIBERFLUX_R', length=nobj, dtype='>f4'))
+    targets.add_column(Column(name='FIBERFLUX_Z', length=nobj, dtype='>f4'))
+    targets.add_column(Column(name='FIBERTOTFLUX_G', length=nobj, dtype='>f4'))
+    targets.add_column(Column(name='FIBERTOTFLUX_R', length=nobj, dtype='>f4'))
+    targets.add_column(Column(name='FIBERTOTFLUX_Z', length=nobj, dtype='>f4'))
 
     # Gaia columns
+    targets.add_column(Column(name='REF_CAT', length=nobj, dtype='U2'))
     targets.add_column(Column(name='REF_ID', data=np.repeat(-1, nobj).astype('int64'))) # default is -1
     targets.add_column(Column(name='GAIA_PHOT_G_MEAN_MAG', length=nobj, dtype='f4'))
     targets.add_column(Column(name='GAIA_PHOT_G_MEAN_FLUX_OVER_ERROR', length=nobj, dtype='f4'))
@@ -141,7 +142,9 @@ def empty_targets_table(nobj=1):
     targets.add_column(Column(name='PMDEC', length=nobj, dtype='f4'))
     targets.add_column(Column(name='PMDEC_IVAR', data=np.ones(nobj, dtype='f4'))) # default is unity
 
-    targets.add_column(Column(name='BRIGHTSTARINBLOB', length=nobj, dtype=bool)) # default is False
+    targets.add_column(Column(name='WISEMASK_W1', length=nobj, dtype='|u1'))
+    targets.add_column(Column(name='WISEMASK_W2', length=nobj, dtype='|u1'))
+    targets.add_column(Column(name='BRIGHTINBLOB', length=nobj, dtype='>i2'))
 
     targets.add_column(Column(name='EBV', length=nobj, dtype='f4'))
     targets.add_column(Column(name='PHOTSYS', length=nobj, dtype='|S1'))
@@ -482,7 +485,8 @@ def read_GMM(self, target=None):
                 if getattr(self, 'GMM_{}'.format(target.upper())) is not None:
                     return
             except:
-                return
+                pass
+                #return
 
             gmmdir = resource_filename('desitarget', 'mock/data/dr7.1')
             if not os.path.isdir:
@@ -510,7 +514,7 @@ def read_GMM(self, target=None):
             gmmcols = [info[1] for info in gmm]
             GMM = [info[2] for info in gmm]
 
-            setattr(SelectTargets, 'GMM_{}'.format(target.upper()), (morph, fractype, gmmcols, GMM))
+            setattr(self, 'GMM_{}'.format(target.upper()), (morph, fractype, gmmcols, GMM))
 
     def sample_GMM(self, nobj, isouth=None, target=None, seed=None, morph=None,
                    prior_mag=None, prior_redshift=None):
@@ -3706,7 +3710,7 @@ def __init__(self, seed=None, nside_chunk=128, **kwargs):
 
         if self.GMM_ELG is None:
             self.read_GMM(target='ELG')
-        
+
     def read(self, mockfile=None, mockformat='gaussianfield', healpixels=None,
              nside=None, only_coords=False, mock_density=False, **kwargs):
         """Read the catalog.