提交: 8e109aa327bf8f6c67138bb0334d9710cfeec326 - myprojects-hg-reborn (hg)

Commit MetaInfo

• 修訂: 8e109aa327bf8f6c67138bb0334d9710cfeec326 (tree)
• 時間: 2011-03-11 22:27:46
• 作者: lorenzo
• Commiter: lorenzo

Log Message

Minor modifications to these codes.

Change Summary

• modified: Python-codes/read_and_plot_aggregates.py
• modified: Python-codes/read_and_save_distances.py

差異

diff -r 24010637384d -r 8e109aa327bf Python-codes/read_and_plot_aggregates.py
--- a/Python-codes/read_and_plot_aggregates.py	Thu Mar 10 17:09:59 2011 +0000
+++ b/Python-codes/read_and_plot_aggregates.py	Fri Mar 11 13:27:46 2011 +0000
@@ -7,8 +7,8 @@
 
 import sys
 
-kf=1.3
-df= 2.3   # 1.8
+kf=1.
+df= 1.78   # 1.8
 
 print sys.argv
 

diff -r 24010637384d -r 8e109aa327bf Python-codes/read_and_save_distances.py
--- a/Python-codes/read_and_save_distances.py	Thu Mar 10 17:09:59 2011 +0000
+++ b/Python-codes/read_and_save_distances.py	Fri Mar 11 13:27:46 2011 +0000
@@ -7,7 +7,7 @@
 
 import sys
 
-kf=1.3
+kf=1.
 df= 1.78   # 1.8
 
 print sys.argv
@@ -115,8 +115,8 @@
 n.savetxt("distance_distribution.dat", s.ravel(dist_mat))
 
 
-
-print "s.shape(dist_mat) is, ", s.shape(dist_mat)
+my_dim=s.shape(dist_mat)
+print "s.shape(dist_mat) is, ", my_dim
 
 threshold=2.1
 
@@ -127,11 +127,14 @@
 
 k=s.sum(adjacency, axis=1)-1
 
+n.savetxt("degree_list.dat", k)
+
+
 print "k is, ", k
 
-x=final_cluster[:,0]
-y=final_cluster[:,1]
-z=final_cluster[:,2]
+# x=final_cluster[:,0]
+# y=final_cluster[:,1]
+# z=final_cluster[:,2]
 
 
 # mlab.clf()
@@ -166,7 +169,7 @@
 print "R1agg is, ", R1_agg
 
 
-N_tot=len(x)
+N_tot=my_dim[1]
 
 print "the total number of monomers is, ", N_tot