Commitdcca2d2

committed

Now shunting through the input rv if it's valid but there is no parallax.

1 parent2d246be commitdcca2d2Copy full SHA for dcca2d2

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SET extra_float_digits=2;`
	`1`	`+SET extra_float_digits = 1;`
`2`	`2`	`SELECT`
`3`	`3`	`to_char(DEGREES(tp[1]), '999D9999999999'),`
`4`	`4`	`to_char(DEGREES(tp[2]), '999D9999999999'),`
`@@ -45,9 +45,9 @@ FROM (`
`45`	`45`	`NULL,`
`46`	`46`	`RADIANS(-801.551/3.6e6), RADIANS(10362/3.6e6), -110,`
`47`	`47`	`-100) AS tp) AS q;`
`48`		`- to_char \| to_char \| to_char \| to_char \| to_char \| to_char`
`49`		`------------------+-----------------+---------+----------+------------+---------`
`50`		`- 269.4744079540 \| 4.4055337210 \| \| -801.210 \| 10361.762 \|`
	`48`	`+ to_char \| to_char \| to_char \| to_char \| to_char \| to_char`
	`49`	`+-----------------+-----------------+---------+----------+------------+----------`
	`50`	`+ 269.4744079540 \| 4.4055337210 \| \| -801.210 \| 10361.762 \|-110.000`
`51`	`51`	`(1 row)`
`52`	`52`
`53`	`53`	`SELECT`

Lines changed: 1 addition & 1 deletion

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -184,14 +184,23 @@ epoch_prop(PG_FUNCTION_ARGS) {`
`184`	`184`
`185`	`185`	`propagate_phasevec(&input,delta_t,&output);`
`186`	`186`
	`187`	`+/* If we have a null parallax but a good RV, preserve the original,`
	`188`	`+untransformed RV on output. See`
	`189`	`+https://github.com/ivoa-std/udf-catalogue/pull/20#issuecomment-2115053757`
	`190`	`+for the rationale. */`
	`191`	`+if (!PG_ARGISNULL(4)&&PG_ARGISNULL(1)) {`
	`192`	`+output_null[5]=0;`
	`193`	`+output.rv=input.rv;`
	`194`	`+}`
	`195`	`+`
`187`	`196`	`/* change to internal units: rad, rad/yr, mas, and km/s */`
`188`	`197`	`retvals[0]=Float8GetDatum(output.pos.lng);`
`189`	`198`	`retvals[1]=Float8GetDatum(output.pos.lat);`
`190`	`199`	`retvals[2]=Float8GetDatum(output.parallax);`
`191`	`200`	`retvals[3]=Float8GetDatum(output.pm[0]);`
`192`	`201`	`retvals[4]=Float8GetDatum(output.pm[1]);`
`193`	`202`	`retvals[5]=Float8GetDatum(output.rv);`
`194`		`-`
	`203`	`+`
`195`	`204`	`{`
`196`	`205`	`intlower_bounds[1]= {1};`
`197`	`206`	`intdims[1]= {6};`

Comments

(0)