Changeset 9d6d5ba in sasview for src

Timestamp:

Apr 4, 2014 5:22:38 PM (11 years ago)

Author:

pkienzle

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

49d019c

Parents:

da5d8e8

Message:

code cleanup

Location:

src/sans

Files:

• fit/ParkFitting.py (modified) (1 diff)
• guiframe/data_manager.py (modified) (1 diff)

src/sans/fit/ParkFitting.py

@@ -20 +20 @@
 from park.fitmc import FitSimplex 
 import park.fitmc
-from park.fitmc import FitMC
 from park.fit import Fitter
 from park.formatnum import format_uncertainty
-#from Loader import Load
 from sans.fit.AbstractFitEngine import FitEngine
 from sans.fit.AbstractFitEngine import FResult

src/sans/guiframe/data_manager.py

@@ -65 +65 @@
             new_plot = Data1D(x=[], y=[], dx=None, dy=None)
            
-        new_plot.copy_from_datainfo(data) 
-        data.clone_without_data(clone=new_plot)  
+        new_plot.copy_from_datainfo(data)
+        data.clone_without_data(clone=new_plot)
         #creating a name for data
-        name = ""
         title = ""
-        file_name = ""
-        if path is not None:
-            file_name = os.path.basename(path)
-        if file_name == "":
-            file_name = data.filename
-        if data.run:
-            run_num = data.run[0]
-        name = file_name
-        if name == "":
-            name = run_num
+        file_name = os.path.basename(path) if path is not None else data.filename
+        if file_name:
+            name = file_name
+        elif data.run:
+            name = data.run[0]
+        else:
+            name = "data"
         name = self.rename(name)
         #find title