@@ -209,52 +209,47 @@ def query_neocc(
209
209
# Clean object ID so that there are no spaces
210
210
object_id = object_id .replace (" " , "" )
211
211
212
- try :
213
- params = {"file" : f"{ object_id } .{ orbit_type } { orbit_epoch } " }
214
-
215
- response = requests .get (base_url , params = params )
216
- response .raise_for_status ()
217
-
218
- data = _parse_oef (response .text )
219
- if orbit_type == "ke" :
220
-
221
- time_scale = data ["time_system" ]
222
- if time_scale == "TDT" :
223
- time_scale = "TT"
224
- else :
225
- raise ValueError (f"Unsupported time scale: { time_scale } " )
226
-
227
- if data ["header" ]["refsys" ] != "ECLM J2000" :
228
- raise ValueError (
229
- f"Unsupported reference system: { data ['header' ]['refsys' ]} "
230
- )
231
-
232
- orbit = Orbits .from_kwargs (
233
- orbit_id = [data ["object_id" ]],
234
- object_id = [data ["object_id" ]],
235
- coordinates = KeplerianCoordinates .from_kwargs (
236
- a = [data ["elements" ]["a" ]],
237
- e = [data ["elements" ]["e" ]],
238
- i = [data ["elements" ]["i" ]],
239
- raan = [data ["elements" ]["node" ]],
240
- ap = [data ["elements" ]["peri" ]],
241
- M = [data ["elements" ]["M" ]],
242
- time = Timestamp .from_mjd ([data ["epoch" ]], scale = time_scale ),
243
- covariance = CoordinateCovariances .from_matrix (
244
- data ["covariance" ].reshape (
245
- 1 ,
246
- 6 ,
247
- 6 ,
248
- )
249
- ),
250
- frame = "ecliptic" ,
251
- origin = Origin .from_kwargs (code = ["SUN" ]),
252
- ).to_cartesian (),
212
+ params = {"file" : f"{ object_id } .{ orbit_type } { orbit_epoch } " }
213
+
214
+ response = requests .get (base_url , params = params )
215
+ response .raise_for_status ()
216
+
217
+ data = _parse_oef (response .text )
218
+ if orbit_type == "ke" :
219
+
220
+ time_scale = data ["time_system" ]
221
+ if time_scale == "TDT" :
222
+ time_scale = "TT"
223
+ else :
224
+ raise ValueError (f"Unsupported time scale: { time_scale } " )
225
+
226
+ if data ["header" ]["refsys" ] != "ECLM J2000" :
227
+ raise ValueError (
228
+ f"Unsupported reference system: { data ['header' ]['refsys' ]} "
253
229
)
254
- orbits = qv .concatenate ([orbits , orbit ])
255
230
256
- except requests .RequestException as e :
257
- print (f"Error querying NEOCC database: { e } " )
258
- return None
231
+ orbit = Orbits .from_kwargs (
232
+ orbit_id = [data ["object_id" ]],
233
+ object_id = [data ["object_id" ]],
234
+ coordinates = KeplerianCoordinates .from_kwargs (
235
+ a = [data ["elements" ]["a" ]],
236
+ e = [data ["elements" ]["e" ]],
237
+ i = [data ["elements" ]["i" ]],
238
+ raan = [data ["elements" ]["node" ]],
239
+ ap = [data ["elements" ]["peri" ]],
240
+ M = [data ["elements" ]["M" ]],
241
+ time = Timestamp .from_mjd ([data ["epoch" ]], scale = time_scale ),
242
+ covariance = CoordinateCovariances .from_matrix (
243
+ data ["covariance" ].reshape (
244
+ 1 ,
245
+ 6 ,
246
+ 6 ,
247
+ )
248
+ ),
249
+ frame = "ecliptic" ,
250
+ origin = Origin .from_kwargs (code = ["SUN" ]),
251
+ ).to_cartesian (),
252
+ )
253
+ orbits = qv .concatenate ([orbits , orbit ])
259
254
260
255
return orbits
0 commit comments