-
Notifications
You must be signed in to change notification settings - Fork 41
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.
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
SasData 66: Ensure realistic resolution values loaded from data #2839
Conversation
…ngle level of checks, and fix logic related to dQ where nothing is greater than 0
…after a model is selected, plus clean up of duplicate code
…S for funtional reasons)
Functionally this seems to fix the issue reported in SasView/sasdata#66. However I don't think it really addresses the #2095 issue since it still requires one to click compute before being able to apply the smearing (as was always the case). However there may be more urgency to fix this based on new conversation in #2095? |
…pdate GUI elements as soon as the smearing combo box changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revisions look good and the resolution selection operates as described. I tested the Windows installer but could be good to have someone check the Mac installer?
I noted that the last change does now address #2095. Although I noticed that when smearing is applied to theoretical data, the data will be plotted immediately after the compute button is pressed. It will also briefly flash the theoretical data without smearing before showing the smeared data. When smearing is not applied to theoretical data, the compute button needs to be pressed followed by Compute/Plot in order to plot the data. |
Pursuant to @caitwolf review and some more testing with the latest installer on windows, there is indeed a discrepancy in behavior during the initial calculation of newly selected model between doing so with vs without resolution. I would however argue, and I think there is a ticket somewhere asking for this, that the correct behavior should be the one seen when resolution is requested. Thus the change should be to the non-resolution functionality which is not part of this PR. So I thinks we should merge this. On the other hand, I was unable to see the "flash" of the first non smeared calculation plotted as suggested by @caitwolf. That may be because my computer is too fast. Alternatively, if @caitwolf was testing from the development environment maybe it is not present in the windows installer? That said, doing some more careful testing I note that there are a couple of small subtleties that I suspect should not be part of this PR?
I also note that the polydispersity tab is active even though the polydispersity checkbox was not checked. However, I believe that was addressed in another PR? |
I'm seeing this in the installed Windows version, but not every time. A click is required to remove the focus from the dQ/Q box for some reason.
I see this in the installed version for times where Clicking the Calculate button the first time works.
Correct. This branch is a bit behind the release branch. Should I push a merge commit? |
Description
This ensures the data resolution is not used when all resolution values loaded from a data set are 0.0. A bug was also fixed where the selected resolution was blank instead of None after selecting a model. In addition, custom pinhole and slit smeared resolutions can be applied to theory data once a model has been selected. This does NOT allow the Hankel transform to be applied to theory data due to differences inhow resolution functions are applied for SESANS data.
Fixes SasView/sasdata#66
Fixes #2095 (does not touch SESANS-specific #2229)
Review Checklist:
Documentation (check at least one)
Installers
Licencing (untick if necessary)