Skip to content

Commit 4ab8e26

Browse files
Enable change of observer and shift for ephemerides (#183)
1 parent 676e144 commit 4ab8e26

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

fink_utils/sso/ephem.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def expand_columns(df, col_to_expand="ephem"):
108108

109109

110110
@pandas_udf(MapType(StringType(), ArrayType(FloatType())), PandasUDFType.SCALAR)
111-
def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
111+
def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, observer, shift, uid, method):
112112
"""Extract ephemerides for ZTF from Miriade
113113
114114
Parameters
@@ -117,6 +117,11 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
117117
ZTF ssnamenr
118118
cjd: pd.Series of list of floats
119119
List of JD values
120+
observer: pd.Series of str
121+
IAU code for the observer. ZTF is I41.
122+
shift: pd.Series of float
123+
Shift for the JD values, in seconds.
124+
Only required for ZTF (15 seconds).
120125
uid: pd.Series of int
121126
Unique ID for each object
122127
method: pd.Series of str
@@ -141,6 +146,8 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
141146
... extract_ztf_ephemerides_from_miriade(
142147
... "ssnamenr",
143148
... "cjd",
149+
... F.lit("I41"),
150+
... F.lit(15.0),
144151
... F.expr("uuid()"),
145152
... F.lit("rest")))
146153
@@ -159,6 +166,8 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
159166
... extract_ztf_ephemerides_from_miriade(
160167
... "ssnamenr",
161168
... "cjd",
169+
... F.lit("I41"),
170+
... F.lit(15.0),
162171
... F.expr("uuid()"),
163172
... F.lit("rest")))
164173
>>> df_new_ephem = expand_columns(df_new_ephem)
@@ -173,6 +182,8 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
173182
... extract_ztf_ephemerides_from_miriade(
174183
... "ssnamenr",
175184
... "cjd",
185+
... F.lit("I41"),
186+
... F.lit(15.0),
176187
... F.expr("uuid()"),
177188
... F.lit("rest")))
178189
>>> df_join_ephem = expand_columns(df_join_ephem)
@@ -196,10 +207,10 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
196207
ephems = query_miriade_ephemcc(
197208
ssname,
198209
cjd.to_numpy()[index],
199-
observer="I41",
210+
observer=observer.to_numpy()[index],
200211
rplane="1",
201212
tcoor=5,
202-
shift=15.0,
213+
shift=shift.to_numpy()[index],
203214
parameters=parameters,
204215
uid=uid.to_numpy()[index],
205216
return_json=True,
@@ -208,10 +219,10 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
208219
ephems = query_miriade(
209220
ssname,
210221
cjd.to_numpy()[index],
211-
observer="I41",
222+
observer=observer.to_numpy()[index],
212223
rplane="1",
213224
tcoor=5,
214-
shift=15.0,
225+
shift=shift.to_numpy()[index],
215226
timeout=30,
216227
return_json=True,
217228
)

0 commit comments

Comments
 (0)