Skip to content

Commit

Permalink
Remove LocalPhotoCalib from PreSource
Browse files Browse the repository at this point in the history 
CalibrateImageTask writes calibrated flux fields, so we don't need to
do the LocalNanojanksy functor any more.
  • Loading branch information
@parejkoj
parejkoj committed Dec 16, 2024
1 parent 599934f commit 08f9f1b
Showing 1 changed file with 52 additions and 133 deletions.
185 changes: 52 additions & 133 deletions schemas/PreSource.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,205 +51,133 @@ funcs:
functor: RADecCovColumn
# One calibrated Calib flux is important:
calibFlux:
functor: LocalNanojansky
functor: Column
args:
- slot_CalibFlux_instFlux
- slot_CalibFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- slot_CalibFlux_flux
calibFluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- slot_CalibFlux_instFlux
- slot_CalibFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- slot_CalibFlux_fluxErr
# Not in DPDD. Used for QA
ap03Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_3_0_instFlux
- base_CircularApertureFlux_3_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_3_0_flux
ap03FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_3_0_instFlux
- base_CircularApertureFlux_3_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_3_0_fluxErr
ap03Flux_flag:
functor: Column
args: base_CircularApertureFlux_3_0_flag
# if we need to add decimal apertures call them e.g. ap04p5Flux
ap06Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_6_0_instFlux
- base_CircularApertureFlux_6_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_6_0_flux
ap06FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_6_0_instFlux
- base_CircularApertureFlux_6_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_6_0_fluxErr
ap06Flux_flag:
functor: Column
args: base_CircularApertureFlux_6_0_flag
ap09Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_9_0_instFlux
- base_CircularApertureFlux_9_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_9_0_flux
ap09FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_9_0_instFlux
- base_CircularApertureFlux_9_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_9_0_fluxErr
ap09Flux_flag:
functor: Column
args: base_CircularApertureFlux_9_0_flag
ap12Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_12_0_instFlux
- base_CircularApertureFlux_12_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_12_0_flux
ap12FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_12_0_instFlux
- base_CircularApertureFlux_12_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_12_0_fluxErr
ap12Flux_flag:
functor: Column
args: base_CircularApertureFlux_12_0_flag
ap17Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_17_0_instFlux
- base_CircularApertureFlux_17_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_17_0_flux
ap17FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_17_0_instFlux
- base_CircularApertureFlux_17_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_17_0_fluxErr
ap17Flux_flag:
functor: Column
args: base_CircularApertureFlux_17_0_flag
ap25Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_25_0_instFlux
- base_CircularApertureFlux_25_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_25_0_flux
ap25FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_25_0_instFlux
- base_CircularApertureFlux_25_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_25_0_fluxErr
ap25Flux_flag:
functor: Column
args: base_CircularApertureFlux_25_0_flag
ap35Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_35_0_instFlux
- base_CircularApertureFlux_35_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_35_0_flux
ap35FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_35_0_instFlux
- base_CircularApertureFlux_35_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_35_0_fluxErr
ap35Flux_flag:
functor: Column
args: base_CircularApertureFlux_35_0_flag
ap50Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_50_0_instFlux
- base_CircularApertureFlux_50_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_50_0_flux
ap50FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_50_0_instFlux
- base_CircularApertureFlux_50_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_50_0_fluxErr
ap50Flux_flag:
functor: Column
args: base_CircularApertureFlux_50_0_flag
ap70Flux:
functor: LocalNanojansky
functor: Column
args:
- base_CircularApertureFlux_70_0_instFlux
- base_CircularApertureFlux_70_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_70_0_flux
ap70FluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_CircularApertureFlux_70_0_instFlux
- base_CircularApertureFlux_70_0_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_CircularApertureFlux_70_0_fluxErr
ap70Flux_flag:
functor: Column
args: base_CircularApertureFlux_70_0_flag
# 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
functor: Column
args:
- base_LocalBackground_instFlux
- base_LocalBackground_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_LocalBackground_flux
skyErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_LocalBackground_instFlux
- base_LocalBackground_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_LocalBackground_fluxErr
psfFlux:
functor: LocalNanojansky
functor: Column
args:
- slot_PsfFlux_instFlux
- slot_PsfFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- slot_PsfFlux_flux
psfFluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- slot_PsfFlux_instFlux
- slot_PsfFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- slot_PsfFlux_fluxErr

# These PS columns do not make sense anymore as named
# psX
Expand Down Expand Up @@ -304,29 +232,20 @@ funcs:
# DPDD does not include gaussianFluxes, however they are used for
# the single frame extendedness column which is used for QA.
gaussianFlux:
functor: LocalNanojansky
functor: Column
args:
- base_GaussianFlux_instFlux
- base_GaussianFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_GaussianFlux_flux
gaussianFluxErr:
functor: LocalNanojanskyErr
functor: Column
args:
- base_GaussianFlux_instFlux
- base_GaussianFlux_instFluxErr
- base_LocalPhotoCalib
- base_LocalPhotoCalibErr
- base_GaussianFlux_fluxErr
extendedness:
functor: Column
args: base_ClassificationExtendedness_value
sizeExtendedness:
functor: Column
args: base_ClassificationSizeExtendedness_value
flags:
- base_LocalPhotoCalib
- base_LocalPhotoCalib_flag
- base_LocalPhotoCalibErr
- base_LocalWcs_flag
- base_LocalWcs_CDMatrix_2_1
- base_LocalWcs_CDMatrix_1_1
Expand Down

0 comments on commit 08f9f1b

Please sign in to comment.