Repository navigation
Let a colour flag pick the channels of -re instead of running step 3 - #182
Merged
Merged
Conversation
A colour flag without a step runs step 3 with the LED fits. The guard against that checked -s3_fast only, so -re -r, -re -g and -re -rgb first ran the full step 3 on every image, which overwrote the partial results, and the restart then found nothing left to analyse. Plain -re resumes the red channel only, so an interrupted green, blue or RGB run could not be resumed at all. The guard now also leaves out -re, and the colour flags only select the channels of the restart. -re alone, an explicit -s3 next to -re and a colour flag next to -s1, -s2 or -coord behave as before. The CLI documentation listed --r, which argparse rejects as ambiguous, and no channel flags for -s3_fast and -re. The help of -re now says to give the channel flags of the interrupted run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kriboe90
added a commit
that referenced
this pull request
Nov 9, 2026
Brings the fixes of the step 3 flags and the restart into develop: #180 (-s3_fast with -r, -g or -b no longer also runs the full step 3), #182 (a colour flag picks the channels of -re instead of running step 3) and #183 (-re resumes in the fit mode and in all channels of the interrupted run). They are merged before the v0.13.0 cleanup (#181) lands on master, so that develop takes the fixes without the removals. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kriboe90
added a commit
that referenced
this pull request
Nov 9, 2026
…-0-cleanup-cea6d8 Brings the fixes of the step 3 flags and the restart (#180, #182, #183) into the cleanup. Two conflicts, both from changes on adjacent lines: - doc/cli_documentation.rst: the -s3_fast row keeps the description without the background-corrected sums and takes the channel flags. - ledsa/data_extraction/step_3_functions.py: find_fit_leds_for_restart goes before _generate_led_analysis_data, which keeps the signature without the noise, side band and background floor parameters. The restart reads the fit mode from the header line of the column names, which still starts with id and lists fit_success only with the fits, so it works with the shorter header of the cleanup. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
A colour flag without a step runs step 3 with the LED fits. #180 keeps
-s3_fastfrom triggering that, but-restill did.ledsa/core/parser_arguments_run.py: the implied step 3 now also leaves out-re, so-re -gresumes the green channel instead of first running the full step 3. A comment states the rule.ledsa/tests/UnitTests/test_parser_arguments_run.py:-realone and with-r,-g,-b,-rgbor-g -bbuilds a single restart extractor for those channels and never sets up step 3.doc/cli_documentation.rst: the channel flags are-r,-g,-band-rgb(the table listed--r, which argparse rejects as ambiguous) and apply to-s3_fastand-reas well. The--helpof-resays to give the channel flags of the interrupted run.Why
-re -r,-re -gand-re -rgbran step 3 with fits on every image before the restart. That overwrote the partial results using the slowest variant of step 3, and the restart then found nothing left to analyse. Without a colour flag the restart resumes the red channel only, so an interrupted green, blue or RGB run could not be resumed at all.For the reviewer
-realone resumes the red channel, an explicit-s3next to-restill runs both, and a colour flag next to-s1,-s2or-coordstill implies step 3.fit_leds=False). After an interrupted-s3run, the resumed images get the-s3_fastcolumn layout, and the analysis refuses the channel with its column-layout error. With a colour flag, the full rerun used to hide this; plain-realready ran into it. The restart also takes the images still to do from the first selected channel only.Tests
-re.-rewith a colour flag (03_test_s3.robotruns plain-re).🤖 Generated with Claude Code