Skip to content

Commit

Permalink
Merge branch 'tickets/DM-24349'
Browse files Browse the repository at this point in the history
  • Loading branch information
yalsayyad committed Dec 16, 2020
2 parents 61239df + 492e779 commit a4a3ff7
Show file tree
Hide file tree
Showing 3 changed files with 283 additions and 0 deletions.
4 changes: 4 additions & 0 deletions config/imsim/transformSourceTable.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import os
from lsst.utils import getPackageDir

config.functorFile = os.path.join(getPackageDir('obs_lsst'), 'policy', 'imsim', 'Source.yaml')
273 changes: 273 additions & 0 deletions policy/imsim/Source.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,273 @@
funcs:
sourceId:
functor: Index
coord_ra:
# reference position required by db. Not in DPDD
functor: CoordColumn
args: coord_ra
coord_dec:
# Reference position required by db. Not in DPDD
functor: CoordColumn
args: coord_dec
ccdVisitId:
functor: Column
args: ccdVisitId
# objectId: not avaliable
# ssObjectId: not avaliable
parentSourceId:
functor: Column
args: parent
#htmId20: not avaliable
x:
functor: Column
args: slot_Centroid_x
y:
functor: Column
args: slot_Centroid_y
xErr:
functor: Column
args: slot_Centroid_xErr
yErr:
functor: Column
args: slot_Centroid_yErr
# x_y_Cov: not available
ra:
functor: RAColumn
# raErr: not available yet DM-15180
decl:
functor: DecColumn
# declErr: not available yet DM-15180
# ra_decl_Cov: not available yet
# One calibrated Calib flux is important:
ApFlux:
functor: LocalNanojansky
args:
- slot_CalibFlux_instFlux
- slot_CalibFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
ApFluxErr:
functor: LocalNanojanskyErr
args:
- slot_CalibFlux_instFlux
- slot_CalibFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
# TODO: When DM-25019 is complete, these should be
# changed to use the local value of the background
# model, rather than the residual of the background
sky:
functor: LocalNanojansky
args:
- base_LocalBackground_instFlux
- base_LocalBackground_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
skyErr:
functor: LocalNanojanskyErr
args:
- base_LocalBackground_instFlux
- base_LocalBackground_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
PsFlux:
functor: LocalNanojansky
args:
- slot_PsfFlux_instFlux
- slot_PsfFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
PsFluxErr:
functor: LocalNanojanskyErr
args:
- slot_PsfFlux_instFlux
- slot_PsfFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr

# These PS columns do not make sense anymore as named
# psX
# psXSigma
# psY
# psYSigma
# psFlux_psX_Cov
# psFlux_psY_Cov
# psX_Y_Cov
# psLnL
# psChi2
# psN
# psRa
# psRaSigma
# psDecl
# psDeclSigma
# psFlux_psRa_Cov
# psFlux_psDecl_Cov


Ixx:
functor: Column
args: slot_Shape_xx
Iyy:
functor: Column
args: slot_Shape_yy
Ixy:
functor: Column
args: slot_Shape_xy
# DPDD should include Psf Shape
IxxPsf:
functor: Column
args: slot_PsfShape_xx
IyyPsf:
functor: Column
args: slot_PsfShape_yy
IxyPsf:
functor: Column
args: slot_PsfShape_xy
# apNann: Replaced by raw Aperture instFluxes in flags section below
# apMeanSb: Replaced by raw Aperture instFluxes in flags section below
# apMeanSbErr: Replaced by raw Aperture instFluxes in flags section below
extendedness:
functor: Column
args: base_ClassificationExtendedness_value
flags:
- base_LocalPhotoCalib
- base_LocalPhotoCalib_flag
- base_LocalPhotoCalibErr
- base_LocalWcs_flag
- base_LocalWcs_CDMatrix_2_1
- base_LocalWcs_CDMatrix_1_1
- base_LocalWcs_CDMatrix_1_2
- base_LocalWcs_CDMatrix_2_2
- base_Blendedness_abs
- base_Blendedness_flag
- base_Blendedness_flag_noCentroid
- base_Blendedness_flag_noShape
- base_CircularApertureFlux_12_0_flag
- base_CircularApertureFlux_12_0_flag_apertureTruncated
- base_CircularApertureFlux_12_0_flag_sincCoeffsTruncated
- base_CircularApertureFlux_12_0_instFlux
- base_CircularApertureFlux_12_0_instFluxErr
- base_CircularApertureFlux_17_0_flag
- base_CircularApertureFlux_17_0_flag_apertureTruncated
- base_CircularApertureFlux_17_0_instFlux
- base_CircularApertureFlux_17_0_instFluxErr
- base_CircularApertureFlux_25_0_flag
- base_CircularApertureFlux_25_0_flag_apertureTruncated
- base_CircularApertureFlux_25_0_instFlux
- base_CircularApertureFlux_25_0_instFluxErr
- base_CircularApertureFlux_35_0_flag
- base_CircularApertureFlux_35_0_flag_apertureTruncated
- base_CircularApertureFlux_35_0_instFlux
- base_CircularApertureFlux_35_0_instFluxErr
- base_CircularApertureFlux_3_0_flag
- base_CircularApertureFlux_3_0_flag_apertureTruncated
- base_CircularApertureFlux_3_0_flag_sincCoeffsTruncated
- base_CircularApertureFlux_3_0_instFlux
- base_CircularApertureFlux_3_0_instFluxErr
- base_CircularApertureFlux_4_5_flag
- base_CircularApertureFlux_4_5_flag_apertureTruncated
- base_CircularApertureFlux_4_5_flag_sincCoeffsTruncated
- base_CircularApertureFlux_4_5_instFlux
- base_CircularApertureFlux_4_5_instFluxErr
- base_CircularApertureFlux_50_0_flag
- base_CircularApertureFlux_50_0_flag_apertureTruncated
- base_CircularApertureFlux_50_0_instFlux
- base_CircularApertureFlux_50_0_instFluxErr
- base_CircularApertureFlux_6_0_flag
- base_CircularApertureFlux_6_0_flag_apertureTruncated
- base_CircularApertureFlux_6_0_flag_sincCoeffsTruncated
- base_CircularApertureFlux_6_0_instFlux
- base_CircularApertureFlux_6_0_instFluxErr
- base_CircularApertureFlux_70_0_flag
- base_CircularApertureFlux_70_0_flag_apertureTruncated
- base_CircularApertureFlux_70_0_instFlux
- base_CircularApertureFlux_70_0_instFluxErr
- base_CircularApertureFlux_9_0_flag
- base_CircularApertureFlux_9_0_flag_apertureTruncated
- base_CircularApertureFlux_9_0_flag_sincCoeffsTruncated
- base_CircularApertureFlux_9_0_instFlux
- base_CircularApertureFlux_9_0_instFluxErr
- base_ClassificationExtendedness_flag
- base_FootprintArea_value
- base_Jacobian_flag
- base_Jacobian_value
- base_LocalBackground_instFlux
- base_LocalBackground_instFluxErr
- base_LocalBackground_flag
- base_LocalBackground_flag_noGoodPixels
- base_LocalBackground_flag_noPsf
- base_PixelFlags_flag
- base_PixelFlags_flag_bad
- base_PixelFlags_flag_cr
- base_PixelFlags_flag_crCenter
- base_PixelFlags_flag_edge
- base_PixelFlags_flag_interpolated
- base_PixelFlags_flag_interpolatedCenter
- base_PixelFlags_flag_offimage
- base_PixelFlags_flag_saturated
- base_PixelFlags_flag_saturatedCenter
- base_PixelFlags_flag_suspect
- base_PixelFlags_flag_suspectCenter
- base_PsfFlux_apCorr
- base_PsfFlux_apCorrErr
- base_PsfFlux_area
- base_PsfFlux_flag
- base_PsfFlux_flag_apCorr
- base_PsfFlux_flag_edge
- base_PsfFlux_flag_noGoodPixels
- base_SdssCentroid_flag
- base_SdssCentroid_flag_almostNoSecondDerivative
- base_SdssCentroid_flag_badError
- base_SdssCentroid_flag_edge
- base_SdssCentroid_flag_noSecondDerivative
- base_SdssCentroid_flag_notAtMaximum
- base_SdssCentroid_flag_resetToPeak
- base_Variance_flag
- base_Variance_flag_emptyFootprint
- base_Variance_value
- calib_astrometry_used
- calib_detected
- calib_photometry_reserved
- calib_photometry_used
- calib_psf_candidate
- calib_psf_reserved
- calib_psf_used
- deblend_deblendedAsPsf
- deblend_hasStrayFlux
- deblend_masked
- deblend_nChild
- deblend_parentTooBig
- deblend_patchedTemplate
- deblend_rampedTemplate
- deblend_skipped
- deblend_tooManyPeaks
- ext_shapeHSM_HsmPsfMoments_flag
- ext_shapeHSM_HsmPsfMoments_flag_no_pixels
- ext_shapeHSM_HsmPsfMoments_flag_not_contained
- ext_shapeHSM_HsmPsfMoments_flag_parent_source
- ext_shapeHSM_HsmShapeRegauss_flag
- ext_shapeHSM_HsmShapeRegauss_flag_galsim
- ext_shapeHSM_HsmShapeRegauss_flag_no_pixels
- ext_shapeHSM_HsmShapeRegauss_flag_not_contained
- ext_shapeHSM_HsmShapeRegauss_flag_parent_source
- sky_source
- detect_isPrimary

flag_rename_rules:
# Taken from db-meas-forced
- ['ext_photometryKron_', '']
- ['base_PixelFlags_flag', 'PixelFlags']
- ['base_Classification', '']
- ['base_Sdss', '']
- ['base_CircularApertureFlux', 'ApFlux']
- ['ext_shapeHSM_', '']
- ['ext_convolved_', '']
- ['undeblended_base', 'undeblended']
- ['undeblended_ext_photometryKron', 'undeblended']
- ['ext_photometryKron_', '']
- ['base_', '']
- ['slot_', '']
- ['calib_', 'Calib_']
- ['deblend_', 'Deblend_']
- ['blendedness', 'Blendedness']

6 changes: 6 additions & 0 deletions policy/imsim/imsimMapper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ datasets:
template: raw/%(run)s/%(raftName)s/%(visit)08d-%(raftName)s-%(detectorName)s-det%(detector)03d.fits[0]
src:
template: src/%(visit)08d-%(filter)s/%(raftName)s/src_%(visit)08d-%(filter)s-%(raftName)s-%(detectorName)s-det%(detector)03d.fits
source:
template: src/%(visit)08d-%(filter)s/%(raftName)s/source_%(visit)08d-%(filter)s-%(raftName)s-%(detectorName)s-det%(detector)03d.parq
sourceTable:
template: src/%(visit)08d-%(filter)s/%(raftName)s/sourceTable_%(visit)08d-%(filter)s-%(raftName)s-%(detectorName)s-det%(detector)03d.parq
sourceTable_visit:
template: src/%(visit)08d-%(filter)s/sourceTable_%(visit)08d-%(filter)s.parq
srcMatch:
template: srcMatch/%(visit)08d-%(filter)s/%(raftName)s/srcMatch_%(visit)08d-%(filter)s-%(raftName)s-%(detectorName)s-det%(detector)03d.fits
transformSrcMeasurement_metadata:
Expand Down

0 comments on commit a4a3ff7

Please sign in to comment.