X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=files%2Fmatplotlib_hist.py;h=69bf5b07ef3f54a2d00b16a82064119145027de3;hb=d03bf58e6dc3d690486f8eb7a8f18ad34938c71f;hp=c37a5f6b7bc379f7bce3717b629960f609564d39;hpb=4edf019d31293b50d5003ea7ea02dba7f4959596;p=django_unres.git

diff --git a/files/matplotlib_hist.py b/files/matplotlib_hist.py
index c37a5f6..69bf5b0 100755
--- a/files/matplotlib_hist.py
+++ b/files/matplotlib_hist.py
@@ -13,13 +13,15 @@ with open('remd_all.stat','r') as f:
   ncolumns=len(line.split())
 
 if ncolumns==14:  
- x,y,s,r,ek,rms= np.loadtxt('remd_all.stat',usecols=(11,3,0,13,2,5),unpack=True)
- x0,s0,r0,rms0= np.loadtxt('remd_all0.stat',usecols=(11,0,13,5),unpack=True) 
+ x,y,s,r,ek,rms= np.loadtxt('remd_all.stat',usecols=(11,3,1,13,2,5),unpack=True)
+ x0,s0,r0,rms0= np.loadtxt('remd_all0.stat',usecols=(11,1,13,5),unpack=True) 
 else:
- x,y,s,r= np.loadtxt('remd_all.stat',usecols=(7,3,0,9),unpack=True)
- x0,s0,r0= np.loadtxt('remd_all0.stat',usecols=(7,0,9),unpack=True) 
+ x,y,s,r= np.loadtxt('remd_all.stat',usecols=(7,3,1,9),unpack=True)
+ x0,s0,r0= np.loadtxt('remd_all0.stat',usecols=(7,1,9),unpack=True) 
 
-hall,binall=np.histogram(y,bins='auto',density=False)
+s=s*0.0489
+s0=s0*0.0489
+hall,binall=np.histogram(y,bins=40,density=False)
 
 plt.xlim(min(binall), max(binall[hall>4]))
 #plt.ylim(0,max(hall)/4)
@@ -34,7 +36,7 @@ Tremd=map(float,sys.argv[1].split())
 colors = cm.rainbow(np.linspace(0, 1, len(Tremd)))
 for T,c in zip(Tremd,colors):
  yt=y[x==T]
- h,bin=np.histogram(yt,bins='auto',density=False)
+ h,bin=np.histogram(yt,bins=40,range=(min(binall),max(binall[hall>4])),density=False)
  center = (bin[:-1] + bin[1:]) / 2
  plt.plot(center,h,'-',color=c)
 # plt.bar(bin[:-1], h, width = bin[2]-bin[1],color=c)
@@ -59,10 +61,12 @@ plt.savefig('remd_Tene.png')
 
 plt.clf()
 plt.ylabel('bath temperature [K]')
-plt.xlabel('step*replica')
+plt.xlabel('time*replica')
 
 replica=range(int(sys.argv[2]))
-colors = cm.rainbow(np.linspace(0, 1, len(replica)))
+#colors = cm.rainbow(np.linspace(0, 1, len(replica)))
+cmap = plt.get_cmap('hot')
+colors = cmap(np.linspace(0, 1, len(replica)*1.4))
 for i,c in zip(replica,colors):
  yt=x0[r0==i]
  xt=(s0+r0*max(s0))[r0==i]
@@ -86,7 +90,7 @@ if ncolumns==14:
   plt.savefig('remd_ene_rms.png')
 
   plt.clf()
-  plt.xlabel('step*replica')
+  plt.xlabel('time*replica')
   plt.ylabel('rmsd')
   for i in replica:
     yt=rms0[r0==i]