Changeset 0900627 in sasview for src/sas/sasgui/perspectives/fitting


Ignore:
Timestamp:
Aug 25, 2017 7:04:52 AM (7 years ago)
Author:
lewis
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
968d67e
Parents:
25bc5c8
Message:

Add comment

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/fitting.py

    rc4170068 r0900627  
    13261326 
    13271327                is_data2d = issubclass(data.__class__, Data2D) 
    1328                 #check consistency of arrays 
     1328                # Check consistency of arrays 
    13291329                if not is_data2d: 
    13301330                    if len(res.theory) == len(res.index[res.index]) and \ 
     
    13371337                    new_theory[res.index == False] = np.nan 
    13381338                    correct_result = True 
    1339                 #get all fittable parameters of the current model 
     1339                # Get all fittable parameters of the current model 
    13401340                param_list = model.getParamList() 
    13411341                for param in model.getDispParamList(): 
    13421342                    if '.' in param and param in param_list: 
     1343                        # Ensure polydispersity results are displayed 
    13431344                        p1, p2 = param.split('.') 
    13441345                        if not model.is_fittable(p1) and not (p2 == 'width' and param in res.param_list)\ 
     
    13661367                    batch_outputs["Chi2"].append(ERROR) 
    13671368                    for param in param_list: 
    1368                         # save value of  fixed parameters 
     1369                        # Save value of  fixed parameters 
    13691370                        if param not in res.param_list: 
    13701371                            batch_outputs[str(param)].append(ERROR) 
    13711372                        else: 
    1372                             #save only fitted values 
     1373                            # Save only fitted values 
    13731374                            batch_outputs[param].append(ERROR) 
    13741375                            batch_inputs["error on %s" % str(param)].append(ERROR) 
Note: See TracChangeset for help on using the changeset viewer.