Changeset 1063 for trunk/GSASIImath.py

Timestamp:

Sep 21, 2013 9:27:08 AM (10 years ago)

Author:

vondreele

Message:

change sf calc timing for MC/SA

File:

• trunk/GSASIImath.py (modified) (3 diffs)

trunk/GSASIImath.py

@@ -2170 +2170 @@
         self.__dict__.update(options)
         
-#    def update_guess(self,x0):
-#        return np.squeeze(np.random.uniform(0.,1.,size=self.dims))*(self.upper-self.lower)+self.lower
+    def update_guess(self,x0):     #same as default
+        return np.squeeze(np.random.uniform(0.,1.,size=self.dims))*(self.upper-self.lower)+self.lower
         
     def update_temp(self):
@@ -2647 +2647 @@
         '''       
         global tsum
+        t0 = time.time()
         parmDict.update(dict(zip(varyList,values)))             #update parameter tables
-        t0 = time.time()
         Xdata = GetAtomX(RBdata,parmDict)                   #get new atom coords from RB
-        tsum += (time.time()-t0)
         allX = getAllX(Xdata,SGM,SGT)                           #fill unit cell - dups. OK
         MDval = parmDict['0:MDval']                             #get March-Dollase coeff
@@ -2667 +2666 @@
         refList[6] = refList[4]-refList[5]
         M = np.inner(refList[6],np.inner(rcov,refList[6]))
+        tsum += (time.time()-t0)
         return M/np.sum(refList[4]**2)