-
Notifications
You must be signed in to change notification settings - Fork 43
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
WIP. DONT MERGE. Allow polydisperse parameters to be constrained #1373
Conversation
Now, editing the constraint on a poly param is possible.
Do a better check for polydisp. parameters.
constraint getter.
Built this 5.0 branch locally, previous project saved above did not work when loaded, so pulled in my core, shell, drop data sets to start from scratch. Added some constraints, why are they showing as M3:scale=M2.scale ? (i.e. a mix of use of : and . ), then added one on M3.radius_width = M1.radius_width, this failed to operate properly and the constraint disappeared when I added another one, meanwhile getting error messages as below. Likely several things going on, if my build is OK ???? 17:10:06 - ERROR: SasView threw exception: must be str, not NoneType |
Started afresh, trying to add even simple constraints is not working for me in this branch, and getting more of the error messages. Have you a suitable windows build that I could install instead? (Though I may not be back in until Weds 28th.) |
5.0 ready for testing on Win |
@RichardHeenan: there is an intsaller at https://jenkins.esss.dk/sasview-beta/job/SasView-Windows10-ghprb/20/ |
Installed the windows version for this branch. Not getting very far with testing constraints yet, as just doing a simple fit on one data set, as soon as I try to fit a polydispersity, the fit to radius and radius_pd go completely mad (e.g. radius drops from 30 to 0.3 Ang and pd goes very large, fit gets much worse). The fit results for _pd are also ignoring the max & min values. e.g. try fitting the microemulsion drop or shell contrast to polydisp sphere or core-shell sphere respectively. With three data sets (core,s hell & drop microemulsions) loaded and models set up, adding constraints did not work properly. I tried to do M1.radius = M3.radius, clicked "add" but M1.scale = M3.radius appeared in the table, after which only one data set appeared at the top instead of three, and I started to get error messages ... |
Something is broken in "polydispersity", this likely needs a new ticket. |
Created a dictionary within the FittingWidget class, named model_dict, to contain the main models of SasView. The keys are “standard”, “poly” and “magnet” relating to the main model, polydisperse model and magnet model respectively. Many functions in the code have been refactored to accept an argument, called model_key, which corresponds to a key in model_dict. This allows the model to be passed to a function without having to pass the bumps object, which can lead to the code misbehaving.
…training or removing a constraint on right click.
Required updating the getSymbolDict function in line with previous commits on this branch
Small edit to the getActiveConstraintList function
What's the status of this, is it being actively worked on? |
This needs a bit (a lot?) more love so closing the PR but keeping the branch for more work |
Reopening, as I'm working on it, and this pages doesn't seem to update without being open |
What exactly is remaining here? Happy to chat about it @rozyczko (though I'll be away after today for 3 weeks) |
Going to close this again for now - its just hanging around. |
good. I think it was originally created to enable creation of artifacts on Jenkins, where we had them only on PR commits |
When you say 3 weeks @lucas-wilkins, I assume that the 2nd week is because you'll be at code camp ... with @rozyczko and the rest of us? Maybe you can sort out what needs doing then? |
When I said 3 weeks it was 4 months ago! |
This is a fix to Richard's issue from #1376