Changeset 3187 for trunk/GSASIImath.py

Timestamp:

Dec 10, 2017 10:14:04 AM (5 years ago)

Author:

toby

Message:

misc docs cleanups; add 1-ID metadata reader & new config variable

File:

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

trunk/GSASIImath.py

@@ -88 +88 @@
 
     References: 
-    .. [1] G. Strang, *Linear Algebra and Its Applications*, 2nd Ed., Orlando,
-           FL, Academic Press, Inc., 1980, pp. 139-142.
+    .. [1] G. Strang, *Linear Algebra and Its Applications*, 2nd Ed., Orlando, FL, Academic Press, Inc., 1980, pp. 139-142.
 
     """
@@ -874 +873 @@
     :param array Y: normalized vector
     
-    :returns: array M: transformation matrix 
+    :returns: array M: transformation matrix
+    
     use as XYZ' = np.inner(M,XYZ) where XYZ are Cartesian
     
@@ -4127 +4127 @@
            lower=-100, upper=100, dwell=50, slope=0.9,ranStart=False,
            ranRange=0.10,autoRan=False,dlg=None):
-    ''' Scipy license:
-        Copyright (c) 2001, 2002 Enthought, Inc.
-    All rights reserved.
-    
-    Copyright (c) 2003-2016 SciPy Developers.
-    All rights reserved.
-    
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    
-      a. Redistributions of source code must retain the above copyright notice,
-         this list of conditions and the following disclaimer.
-      b. Redistributions in binary form must reproduce the above copyright
-         notice, this list of conditions and the following disclaimer in the
-         documentation and/or other materials provided with the distribution.
-      c. Neither the name of Enthought nor the names of the SciPy Developers
-         may be used to endorse or promote products derived from this software
-         without specific prior written permission.
-    '''
-
     """Minimize a function using simulated annealing.
 
@@ -4238 +4218 @@
         T_new = T0 * exp(-c * k**quench)
 
-
     """
+    
+    ''' Scipy license:
+        Copyright (c) 2001, 2002 Enthought, Inc.
+    All rights reserved.
+    
+    Copyright (c) 2003-2016 SciPy Developers.
+    All rights reserved.
+    
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+    
+      a. Redistributions of source code must retain the above copyright notice,
+         this list of conditions and the following disclaimer.
+      b. Redistributions in binary form must reproduce the above copyright
+         notice, this list of conditions and the following disclaimer in the
+         documentation and/or other materials provided with the distribution.
+      c. Neither the name of Enthought nor the names of the SciPy Developers
+         may be used to endorse or promote products derived from this software
+         without specific prior written permission.
+    '''
     x0 = asarray(x0)
     lower = asarray(lower)