Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update FVC code #179

Merged
merged 4 commits into from
Feb 9, 2022
Merged

Update FVC code #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9551efe
Adapt to using coordio FVCTransformAPO
albireox Feb 8, 2022
01f39c7
Fix implementation of new FVC transforms
albireox Feb 8, 2022
e2fff99
Update sdss-coordio version
albireox Feb 9, 2022
5a21447
Remove unused import
albireox Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 35 additions & 30 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sdssdb = "^0.4.11"
pandas = "^1.3.4"
astropy = "^4.3.1"
sdss-kaiju = ">=1.2.1"
sdss-coordio = ">=1.2.0"
sdss-coordio = {version = ">=1.2.0", allow-prereleases = true}
pydl = "^0.7.0"
sep = "^1.2.0"
"zc.lockfile" = "^2.0"
Expand Down
12 changes: 9 additions & 3 deletions python/jaeger/actor/commands/fvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,13 @@ async def loop(
command.debug(fvc_filename=str(filename))

# 2. Process the new image.
await run_in_executor(fvc.process_fvc_image, filename, plot=plot)
positioner_coords = fps.get_positions_dict()
await run_in_executor(
fvc.process_fvc_image,
filename,
positioner_coords,
plot=plot,
)

# 3. Set current RMS and delta.
new_rms = fvc.fitrms * 1000.0
Expand Down Expand Up @@ -278,8 +284,8 @@ async def loop(
else:
command.warning("Cannot write processed image.")

# FVC loop always succeeds.
return command.finish()
# FVC loop always succeeds.
return command.finish()


@fvc_parser.command()
Expand Down
8 changes: 0 additions & 8 deletions python/jaeger/etc/jaeger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,8 @@ configuration:
clip_scale: 300

fvc:
zb_polids: [0, 1, 2, 3, 4, 5, 6, 9, 20, 28, 29]
exposure_time: 5.
fbi_level: 6.
background_sigma: 3.5
centroid_min_npix: 100
max_rough_fit_distance: 20.
max_fiducial_fit_distance: 5.
max_final_fit_distance: 1.
reference_rotator_position: 135.4
centre_rotation: [4115., 3092.]
target_rms: 5
target_delta_rms: 1
max_fvc_iterations: 5
Expand Down