mailr24145 - in /branches/disp_spin_speed/lib/dispersion: ns_cpmg_2site_3d.py ns_cpmg_2site_star.py ns_mmq_3site.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by tlinnet on June 18, 2014 - 20:32:
Author: tlinnet
Date: Wed Jun 18 20:32:40 2014
New Revision: 24145

URL: http://svn.gna.org/viewcvs/relax?rev=24145&view=rev
Log:
Fix for spaces aroung "=" outside functions.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
    branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
    branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py?rev=24145&r1=24144&r2=24145&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py Wed Jun 18 
20:32:40 2014
@@ -134,8 +134,8 @@
         for mi in range(NM):
 
             # Extract the values from the higher dimensional arrays.
-            R2A_si_mi=r20a[0, si, mi, 0, 0]
-            R2B_si_mi=r20b[0, si, mi, 0, 0]
+            R2A_si_mi = r20a[0, si, mi, 0, 0]
+            R2B_si_mi = r20b[0, si, mi, 0, 0]
             dw_si_mi = dw[0, si, mi, 0, 0]
             num_points_si_mi = int(num_points[0, si, mi, 0])
 

Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py?rev=24145&r1=24144&r2=24145&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py       
(original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py       Wed 
Jun 18 20:32:40 2014
@@ -142,8 +142,8 @@
         # Loop over the spectrometer frequencies.
         for mi in range(NM):
             # Extract the values from the higher dimensional arrays.
-            R2A_si_mi=r20a[0, si, mi, 0, 0]
-            R2B_si_mi=r20b[0, si, mi, 0, 0]
+            R2A_si_mi = r20a[0, si, mi, 0, 0]
+            R2B_si_mi = r20b[0, si, mi, 0, 0]
             dw_si_mi = dw[0, si, mi, 0, 0]
             num_points_si_mi = int(num_points[0, si, mi, 0])
 

Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py?rev=24145&r1=24144&r2=24145&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py     Wed Jun 18 
20:32:40 2014
@@ -199,10 +199,10 @@
                 r20b_i = R20B[si, mi, oi, 0]
                 r20c_i = R20C[si, mi, oi, 0]
 
-                dw_AB_i=dw_AB[si, mi, oi, 0]
-                dw_AC_i=dw_AC[si, mi, oi, 0]
-                dwH_AB_i=dwH_AB[si, mi, oi, 0]
-                dwH_AC_i=dwH_AC[si, mi, oi, 0]
+                dw_AB_i = dw_AB[si, mi, oi, 0]
+                dw_AC_i = dw_AC[si, mi, oi, 0]
+                dwH_AB_i =d wH_AB[si, mi, oi, 0]
+                dwH_AC_i = dwH_AC[si, mi, oi, 0]
                 num_points_i = num_points[si, mi, oi]
 
                 # Populate the m1 and m2 matrices (only once per function 
call for speed).
@@ -377,10 +377,10 @@
                 r20b_i = R20B[si, mi, oi, 0]
                 r20c_i = R20C[si, mi, oi, 0]
 
-                dw_AB_i=dw_AB[si, mi, oi, 0]
-                dw_AC_i=dw_AC[si, mi, oi, 0]
-                dwH_AB_i=dwH_AB[si, mi, oi, 0]
-                dwH_AC_i=dwH_AC[si, mi, oi, 0]
+                dw_AB_i = dw_AB[si, mi, oi, 0]
+                dw_AC_i = dw_AC[si, mi, oi, 0]
+                dwH_AB_i = dwH_AB[si, mi, oi, 0]
+                dwH_AC_i = dwH_AC[si, mi, oi, 0]
                 num_points_i = num_points[si, mi, oi]
 
                 # Populate the m1 and m2 matrices (only once per function 
call for speed).




Related Messages


Powered by MHonArc, Updated Wed Jun 18 21:00:03 2014