Changeset 2d8018f in sasview

Timestamp:

Mar 14, 2013 10:20:13 AM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

98b12205

Parents:

b4fdf0d

Message:

better time estimation for Debye computation

Files:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (5 diffs)
• sanscalculator/src/sans/calculator/sans_gen.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -130 +130 @@
         self.reader = None
         self.ext = None
-        self.id = 'Generic Scattering'
+        self.id = 'GenSANS'
         self.file_name = ''
         self.time_text = None
@@ -369 +369 @@
             Do the layout for the button widgets
         """ 
-        self.est_time = '*Estimated Computation time : %s'
+        self.est_time = '*Estimated Computation time :\n  %s'
         self.time_text = wx.StaticText(self, -1, self.est_time% str('2 sec') )
         self.orient_combo = self._fill_orient_combo()
@@ -384 +384 @@
         Calculation time estimation
         """
+        # magic equation: not very accurate
+        factor = 1
         n_qbins = float(self.npt_ctl.GetValue())
         n_qbins *= n_qbins
         n_pixs = float(self.parent.get_npix())
         if self.is_avg:
+            factor = 6
             n_pixs *= (n_pixs / 200)
         x_in = n_qbins * n_pixs / 100000
-        # magic equation: not very accurate
-        etime = 1.0 + 0.085973 * x_in
+        etime = factor + 0.085973 * x_in 
         return int(etime)
         
@@ -939 +941 @@
         """
         out = numpy.empty(0)
-        s = time.time()
+        #s = time.time()
         for ind in range(len(input[0])):
             if self.is_avg:
@@ -956 +958 @@
                 outi = self.model.runXY(inputi)
                 out = numpy.append(out, outi)
-        print time.time() - s
+        #print time.time() - s
         if self.is_avg or self.is_avg == None:
             self._draw1D(out)

sanscalculator/src/sans/calculator/sans_gen.py

@@ -172 +172 @@
                 raise ValueError, msg
             i_out = numpy.zeros_like(x[0])
-            #import time
-            #s = time.time()
             # 1D I is found at y =0 in the 2D pattern
             out = self._gen(x[0], [], i_out )
-            #print "i_out_time", time.time() - s
             return out
         else:
@@ -191 +188 @@
         if x.__class__.__name__ == 'list':
             i_out = numpy.zeros_like(x[0])
-            #import time
-            #s = time.time()
             out = self._gen(x[0], x[1], i_out)
-            #print "i_out_time", time.time() - s
             return out
         else: