diff --git a/docs/RUGNUX_CLI.md b/docs/RUGNUX_CLI.md index 8c09f27c7..f263db765 100644 --- a/docs/RUGNUX_CLI.md +++ b/docs/RUGNUX_CLI.md @@ -162,7 +162,7 @@ With the input already on disk, the URL is ignored. | `-t, --stride ` | Process every *n*-th image (default: 1) | | `-v, --verbose` | Show the whole log on the terminal in place of the steps; `_log.txt` is written either way | | `--simulate-live ` | Read a stored input as the collection it was while being written: image *i* becomes readable (*i*+1)·`ms` ms after the start (0: all at once). The run takes the live path a broker URL takes, with the same result; for testing the live workflow without a broker. `--mode mx` only | -| `--fast-live` | With `--simulate-live` or a broker URL: run as the broker's rugnux live mode does — every decision stands where it was first taken, nothing is re-checked or run again once the sweep is in, the integration radius is fixed, and SIGINT cuts the run to what it has established. A difficult crystal can come out worse | +| `--fast-live` | With `--simulate-live` or a broker URL: run as the broker's rugnux live mode does — every decision stands where it was first taken, nothing is re-checked or run again once the sweep is in (the integration radius from the spot width stays where the pre-pass frames put it), and SIGINT cuts the run to what it has established. A difficult crystal can come out worse | | `--sweeps joint\|separate` | Several rotation sweeps (see Inputs): `joint` (the default) merges them as one dataset into `.*`; `separate` processes each alone into `_s_*` | | `--no-gpu` | Run on the CPU only, as on a machine without a GPU, even where one is present: CUDA is not touched (nor, on macOS, the Apple GPU that Bragg integration, the model density and the molecular-replacement rotation function otherwise run on) and every GPU step takes its CPU path (`-X FFT` indexes with FFTW and `-X FFBIDX` with its CPU implementation; `-X cuFFT` is refused) | diff --git a/rugnux/RugnuxLive.cpp b/rugnux/RugnuxLive.cpp index 1732e781c..ec93ee2e3 100644 --- a/rugnux/RugnuxLive.cpp +++ b/rugnux/RugnuxLive.cpp @@ -59,8 +59,10 @@ RugnuxLiveSetup MakeRugnuxLiveSetup(const JFJochReaderDataset &dataset, int nthr c.refine = true; c.live = true; c.fast_live = true; - // Decided late, on the whole sweep, as it re-checks its radius there - which fast_live does not. - c.adaptive_integration_radius = false; + // The signal radius from the spot width of the pre-scan frames, as in `rugnux`; where the pre-pass + // counts the widened radius crowding the background rings the canonical pass keeps the default, and + // a near tie stays where it was decided (fast_live re-checks nothing on the whole sweep). + c.adaptive_integration_radius = true; return s; } diff --git a/rugnux/rugnux_cli.cpp b/rugnux/rugnux_cli.cpp index 1f113a7ed..5d1cb6a2a 100644 --- a/rugnux/rugnux_cli.cpp +++ b/rugnux/rugnux_cli.cpp @@ -3723,8 +3723,6 @@ int RugnuxInputRun::PrepareRugnuxInput() { config.finalist_ledger = finalist_ledger_flag; config.live = broker_feed || simulate_live; config.fast_live = fast_live && config.live; - if (config.fast_live) - config.adaptive_integration_radius = false; // as MakeRugnuxLiveSetup if (simulate_live) logger.Info("Simulated live collection: image i readable (i+1) x {:.1f} ms after the run starts", simulated_frame_time.count() / 1000.0);