Skip to content

Commit

Permalink
Small fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dsanmartim committed Dec 12, 2023
1 parent 4588d6c commit 57f9903
Showing 1 changed file with 15 additions and 24 deletions.
39 changes: 15 additions & 24 deletions python/lsst/ts/observatory/control/base_tcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -861,11 +861,9 @@ async def slew_to_planet(
# implemented.
async def slew_ephem_target(
self,
ephemFile: str,
targetName: str,
ephem_file: str,
target_name: str,
trackId: int,
dRA: float = 0.0,
dDec: float = 0.0,
rot_sky: float = 0.0,
slew_timeout: float = 1200.0,
) -> None:
Expand All @@ -875,22 +873,15 @@ async def slew_ephem_target(
Parameters
----------
ephemFile : str
ephem_file : str
Name of the file containing ephemeris data.
targetName : str
target_name : str
Target name.
dRA : float, optional
Differential Track Rate in RA (arcsec/s), default is 0.0.
dDec : float, optional
Differential Track Rate in Dec (arcsec/s), default is 0.0.
trackId : int
Target identifier.
rot_sky : `float`
Desired instrument position angle (degree), Eastwards from North.
Default is 0.0.
validateOnly : bool, optional
If True, validate the target without changing the current
demand, default is False.
slew_timeout : float, optional
Timeout for the slew command in seconds, default is 1200
seconds (20 minutes).
Expand All @@ -902,10 +893,10 @@ async def slew_ephem_target(
# First, validate the parameters by issuing the command
# with validateOnly=True
await ptg.cmd_ephemTarget.set_start(
ephemFile=ephemFile,
targetName=targetName,
dRA=dRA,
dDec=dDec,
ephemFile=ephem_file,
targetName=target_name,
dRA=0.0,
dDec=0.0,
trackId=trackId,
rotPA=Angle(rot_sky, unit=u.deg).deg,
validateOnly=True,
Expand All @@ -919,21 +910,21 @@ async def slew_ephem_target(

if not validated_target.isValid:
raise RuntimeError(
f"Validation failed for target {targetName}: Target is not "
f"Validation failed for target {target_name}: Target is not "
f"observable."
)
else:
self.log.info(
f"Validation successful for target {targetName}. "
f"Validation successful for target {target_name}. "
f"Az: {validated_target.az}, El: {validated_target.el}, "
f"Rot: {validated_target.rot}"
)

await ptg.cmd_ephemTarget.set_start(
ephemFile=ephemFile,
targetName=targetName,
dRA=dRA,
dDec=dDec,
ephemFile=ephem_file,
targetName=target_name,
dRA=0.0,
dDec=0.0,
trackId=trackId,
rotPA=Angle(rot_sky, unit=u.deg).deg,
validateOnly=False, # Now set validateOnly to False
Expand All @@ -942,7 +933,7 @@ async def slew_ephem_target(

await self._slew_to(ptg.cmd_ephemTarget, slew_timeout=slew_timeout)
self.log.info(
f"Telescope slewed to target {targetName} using ephemeris data."
f"Telescope slewed to target {target_name} using ephemeris data."
)

async def offset_radec(self, ra: float, dec: float) -> None:
Expand Down

0 comments on commit 57f9903

Please sign in to comment.