Ignore:
Timestamp:
Mar 16, 2018 2:05:42 PM (7 years ago)
Author:
krzywon
Branches:
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
Children:
47bf906
Parents:
477c473 (diff), e4c475b7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ESS_GUI' into ESS_GUI_Pr

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Perspectives/Inversion/InversionLogic.py

    r5fba4c4 rd744767  
    7373            except: 
    7474                err[i] = 1.0 
    75                 print("Error getting error", value, x[i]) 
     75                print(("Error getting error", value, x[i])) 
    7676 
    7777        new_plot = Data1D(x, y) 
    … …  
    9999                except: 
    100100                    err[i] = 1.0 
    101                     print("Error getting error", value, x[i]) 
     101                    print(("Error getting error", value, x[i])) 
    102102 
    103103            new_plot = Data1D(x, y) 
    … …  
    143143            except: 
    144144                err[i] = 1.0 
    145                 print("Error getting error", value, x[i]) 
     145                print(("Error getting error", value, x[i])) 
    146146 
    147147        plot.x = x 
    … …  
    160160                except: 
    161161                    err[i] = 1.0 
    162                     print("Error getting error", value, x[i]) 
     162                    print(("Error getting error", value, x[i])) 
    163163 
    164164            plot.x = x 
    … …  
    272272                msg = "Unable to find min/max/length of \n data named %s" % \ 
    273273                            self.data.filename 
    274                 raise ValueError, msg 
     274                raise ValueError(msg) 
    275275 
    276276        else: 
    … …  
    282282                msg = "Unable to find min/max of \n data named %s" % \ 
    283283                            self.data.filename 
    284                 raise ValueError, msg 
     284                raise ValueError(msg) 
    285285            qmax = np.sqrt(x * x + y * y) 
    286286        return qmin, qmax 
Note: See TracChangeset for help on using the changeset viewer.