Skip to content

Commit f3e3414

Browse files
taranutaranu
committed
Merge branch 'tickets/DM-52462'
2 parents 9d5c6a2 + 655a6b7 commit f3e3414

File tree

3 files changed

+188
-2
lines changed

3 files changed

+188
-2
lines changed

‎python/lsst/pipe/tasks/postprocess.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,15 @@ class TransformObjectCatalogConnections(pipeBase.PipelineTaskConnections,
805805
name="{coaddName}Coadd_ref",
806806
deferLoad=True,
807807
)
808+
inputCatalogExpMultiprofit = connectionTypes.Input(
809+
doc="Catalog of multiband Exponential fits.",
810+
dimensions=("tract", "patch", "skymap"),
811+
storageClass="ArrowAstropy",
812+
name="{coaddName}Coadd_Exp_multiprofit",
813+
deferLoad=True,
814+
)
808815
inputCatalogSersicMultiprofit = connectionTypes.Input(
809-
doc="Catalog of source measurements on the deepCoadd.",
816+
doc="Catalog of multiband Sersic fits.",
810817
dimensions=("tract", "patch", "skymap"),
811818
storageClass="ArrowAstropy",
812819
name="{coaddName}Coadd_Sersic_multiprofit",
@@ -906,7 +913,7 @@ class TransformObjectCatalogTask(TransformCatalogBaseTask):
906913
_DefaultName = "transformObjectCatalog"
907914
ConfigClass = TransformObjectCatalogConfig
908915

909-
datasets_multiband = ("epoch", "ref", "Sersic_multiprofit")
916+
datasets_multiband = ("epoch", "ref", "Exp_multiprofit", "Sersic_multiprofit")
910917

911918
def runQuantum(self, butlerQC, inputRefs, outputRefs):
912919
inputs = butlerQC.get(inputRefs)
@@ -917,6 +924,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
917924
dataId=dict(outputRefs.outputCatalog.dataId.mapping),
918925
handle_epoch=inputs["inputCatalogEpoch"],
919926
handle_ref=inputs["inputCatalogRef"],
927+
handle_Exp_multiprofit=inputs["inputCatalogExpMultiprofit"],
920928
handle_Sersic_multiprofit=inputs["inputCatalogSersicMultiprofit"],
921929
)
922930
butlerQC.put(result, outputRefs)

‎schemas/Object.yaml‎

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,179 @@ funcs:
867867
functor: Column
868868
args: TwoGaussianPsf_no_inputs_flag
869869
dataset: psfs_multiprofit
870+
# MultiProFit multiband single exponential object model fit parameters
871+
exponential_x:
872+
functor: Column
873+
args: cen_x
874+
dataset: Exp_multiprofit
875+
exponential_y:
876+
functor: Column
877+
args: cen_y
878+
dataset: Exp_multiprofit
879+
exponential_ra:
880+
functor: Column
881+
args: cen_ra
882+
dataset: Exp_multiprofit
883+
exponential_dec:
884+
functor: Column
885+
args: cen_dec
886+
dataset: Exp_multiprofit
887+
exponential_reff_x:
888+
functor: SinglePrecisionFloatColumn
889+
args: reff_x
890+
dataset: Exp_multiprofit
891+
exponential_reff_y:
892+
functor: SinglePrecisionFloatColumn
893+
args: reff_y
894+
dataset: Exp_multiprofit
895+
exponential_rho:
896+
functor: SinglePrecisionFloatColumn
897+
args: rho
898+
dataset: Exp_multiprofit
899+
g_exponentialFlux:
900+
functor: MultibandSinglePrecisionFloatColumn
901+
args:
902+
- g_Flux
903+
- g
904+
dataset: Exp_multiprofit
905+
i_exponentialFlux:
906+
functor: MultibandSinglePrecisionFloatColumn
907+
args:
908+
- i_Flux
909+
- i
910+
dataset: Exp_multiprofit
911+
r_exponentialFlux:
912+
functor: MultibandSinglePrecisionFloatColumn
913+
args:
914+
- r_Flux
915+
- r
916+
dataset: Exp_multiprofit
917+
u_exponentialFlux:
918+
functor: MultibandSinglePrecisionFloatColumn
919+
args:
920+
- u_Flux
921+
- u
922+
dataset: Exp_multiprofit
923+
y_exponentialFlux:
924+
functor: MultibandSinglePrecisionFloatColumn
925+
args:
926+
- y_Flux
927+
- y
928+
dataset: Exp_multiprofit
929+
z_exponentialFlux:
930+
functor: MultibandSinglePrecisionFloatColumn
931+
args:
932+
- z_Flux
933+
- z
934+
dataset: Exp_multiprofit
935+
N540_exponentialFlux:
936+
functor: MultibandSinglePrecisionFloatColumn
937+
args:
938+
- N540_Flux
939+
- N540
940+
dataset: Exp_multiprofit
941+
N708_exponentialFlux:
942+
functor: MultibandSinglePrecisionFloatColumn
943+
args:
944+
- N708_Flux
945+
- N708
946+
dataset: Exp_multiprofit
947+
exponential_xErr:
948+
functor: SinglePrecisionFloatColumn
949+
args: cen_xErr
950+
dataset: Exp_multiprofit
951+
exponential_yErr:
952+
functor: SinglePrecisionFloatColumn
953+
args: cen_yErr
954+
dataset: Exp_multiprofit
955+
exponential_raErr:
956+
functor: SinglePrecisionFloatColumn
957+
args: cen_raErr
958+
dataset: Exp_multiprofit
959+
exponential_decErr:
960+
functor: SinglePrecisionFloatColumn
961+
args: cen_decErr
962+
dataset: Exp_multiprofit
963+
exponential_reff_xErr:
964+
functor: SinglePrecisionFloatColumn
965+
args: reff_xErr
966+
dataset: Exp_multiprofit
967+
exponential_reff_yErr:
968+
functor: SinglePrecisionFloatColumn
969+
args: reff_yErr
970+
dataset: Exp_multiprofit
971+
exponential_rhoErr:
972+
functor: SinglePrecisionFloatColumn
973+
args: rhoErr
974+
dataset: Exp_multiprofit
975+
g_exponentialFluxErr:
976+
functor: MultibandSinglePrecisionFloatColumn
977+
args:
978+
- g_FluxErr
979+
- g
980+
dataset: Exp_multiprofit
981+
i_exponentialFluxErr:
982+
functor: MultibandSinglePrecisionFloatColumn
983+
args:
984+
- i_FluxErr
985+
- i
986+
dataset: Exp_multiprofit
987+
r_exponentialFluxErr:
988+
functor: MultibandSinglePrecisionFloatColumn
989+
args:
990+
- r_FluxErr
991+
- r
992+
dataset: Exp_multiprofit
993+
u_exponentialFluxErr:
994+
functor: MultibandSinglePrecisionFloatColumn
995+
args:
996+
- u_FluxErr
997+
- u
998+
dataset: Exp_multiprofit
999+
y_exponentialFluxErr:
1000+
functor: MultibandSinglePrecisionFloatColumn
1001+
args:
1002+
- y_FluxErr
1003+
- y
1004+
dataset: Exp_multiprofit
1005+
z_exponentialFluxErr:
1006+
functor: MultibandSinglePrecisionFloatColumn
1007+
args:
1008+
- z_FluxErr
1009+
- z
1010+
dataset: Exp_multiprofit
1011+
N540_exponentialFluxErr:
1012+
functor: MultibandSinglePrecisionFloatColumn
1013+
args:
1014+
- N540_FluxErr
1015+
- N540
1016+
dataset: Exp_multiprofit
1017+
N708_exponentialFluxErr:
1018+
functor: MultibandSinglePrecisionFloatColumn
1019+
args:
1020+
- N708_FluxErr
1021+
- N708
1022+
dataset: Exp_multiprofit
1023+
exponential_n_eval_jac:
1024+
functor: Column
1025+
args: n_eval_jac
1026+
dataset: Exp_multiprofit
1027+
exponential_n_iter:
1028+
functor: Column
1029+
args: n_iter
1030+
dataset: Exp_multiprofit
1031+
exponential_chisq_reduced:
1032+
functor: SinglePrecisionFloatColumn
1033+
args: chisq_reduced
1034+
dataset: Exp_multiprofit
1035+
exponential_unknown_flag:
1036+
functor: Column
1037+
args: unknown_flag
1038+
dataset: Exp_multiprofit
1039+
exponential_no_data_flag:
1040+
functor: Column
1041+
args: no_data_flag
1042+
dataset: Exp_multiprofit
8701043
# MultiProFit multiband single Sersic object model fit parameters
8711044
sersic_x:
8721045
functor: Column

‎tests/test_transformObject.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def setUp(self):
4949
n_rows = len(df)
5050
tab_epoch = astropy.table.Table({df.index.name: df.index, "r_epoch": [0.]*n_rows})
5151
tab_ref = astropy.table.Table({df.index.name: df.index, "refBand": ["r"]*n_rows})
52+
tab_exp = astropy.table.Table({df.index.name: df.index, "exp_n_iter": [0] * n_rows})
5253
tab_sersic = astropy.table.Table({df.index.name: df.index, "sersic_n_iter": [0] * n_rows})
5354
self.kwargs_task = {
5455
"handle_epoch": InMemoryDatasetHandle(
@@ -57,13 +58,17 @@ def setUp(self):
5758
"handle_ref": InMemoryDatasetHandle(
5859
tab_ref, storageClass="ArrowAstropy", dataId=self.dataId,
5960
),
61+
"handle_Exp_multiprofit": InMemoryDatasetHandle(
62+
tab_exp, storageClass="ArrowAstropy", dataId=self.dataId,
63+
),
6064
"handle_Sersic_multiprofit": InMemoryDatasetHandle(
6165
tab_sersic, storageClass="ArrowAstropy", dataId=self.dataId,
6266
),
6367
}
6468
self.funcs_multi = {
6569
"epoch": Column("r_epoch", dataset="epoch"),
6670
"refBand": Column("refBand", dataset="ref"),
71+
"exp_n_iter": Column("exp_n_iter", dataset="Exp_multiprofit"),
6772
"sersic_n_iter": Column("sersic_n_iter", dataset="Sersic_multiprofit"),
6873
}
6974

0 commit comments

Comments
 (0)