Skip to content

Commit

Permalink
Improvements to FVC loop (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
albireox committed Dec 9, 2021
1 parent 3a05f7f commit 7533459
Show file tree
Hide file tree
Showing 9 changed files with 220 additions and 80 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

* [#166](https://github.com/sdss/jaeger/issues/166) During `BaseConfiguration.decollide_and_get_paths()` the paths are decollided and deadlocks resolved while trying to maintain as many robots on target as possible. The fibre table is updated.
* [#168](https://github.com/sdss/jaeger/issues/168) Functional version of design loading. Collisions are solved by first attempting to remove unassigned targets. Deadlock resolution uses the same logic as the random configuration creation. ``fiberId`` is not added to the summary file. Snapshots for each configuration are created.
* [#172](https://github.com/sdss/jaeger/issues/172) The FVC centroids are now derotated according to the rotator angle, allowing to run the FVC loop at any rotator position.
* Snapshots are run in a process pool executor and are saved automatically at the end of a trajectory or when `TrajectoryError` is raised.
* `jaeger.commands.goto.goto()` generates `kaiju`-valid trajectories by default.
* FVC RMS fit only takes assigned robots into account.

### 🔧 Fixed

Expand Down
55 changes: 31 additions & 24 deletions poetry.lock

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

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ packages = [
include = ["python/jaeger/etc/*"]

[tool.poetry.dependencies]
python = "^3.7.1,<4.0"
python = "^3.7.1,<3.11"
numpy = "^1.21.0"
progressbar2 = "^3.39.3"
sdss-drift = "^0.3.1a0"
Expand All @@ -38,6 +38,7 @@ sdss-coordio = "^1.1.4a1"
pydl = "^0.7.0"
sep = "^1.2.0"
"zc.lockfile" = "^2.0"
scipy = "^1.7.3"

[tool.poetry.dev-dependencies]
ipython = ">=7.9.0"
Expand Down Expand Up @@ -86,7 +87,7 @@ sections = ["FUTURE", "STDLIB", "TYPING", "THIRDPARTY", "SDSS", "FIRSTPARTY", "L
default_section = "THIRDPARTY"
known_first_party = "jaeger"
known_typing = ["typing"]
known_sdss = ["sdsstools", "clu", "sdssdb", "drift", "coordio", "kaiju"]
known_sdss = ["sdsstools", "clu", "sdssdb", "drift", "coordio", "kaiju", "fps_calibrations"]
lines_after_imports = 2

[tool.pytest.ini_options]
Expand Down
3 changes: 1 addition & 2 deletions python/jaeger/actor/commands/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@

from __future__ import annotations

from fps_calibrations import get_version

from coordio import __version__ as coordio_version
from fps_calibrations import get_version
from kaiju import __version__ as kaiju_version

from jaeger import __version__ as jaeger_version
Expand Down
5 changes: 5 additions & 0 deletions python/jaeger/etc/jaeger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ fvc:
fbi_level: 6.
background_sigma: 3.5
centroid_min_npix: 100
max_rough_fit_distance: 10.
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

0 comments on commit 7533459

Please sign in to comment.