X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Fjobfiles.py;h=d9b8c7c0ba884a32ad7f6f9896148e30105ee32c;hb=87aa2f76c91baef63391400d7df4a7ca72cd3fb4;hp=e9a2ffca372263d1ee4e3da0b9c1e121c809d582;hpb=12bc5dc9b23bec16fa93124aec28f76c02d54759;p=django_unres.git

diff --git a/django_simple/todo/jobfiles.py b/django_simple/todo/jobfiles.py
index e9a2ffc..d9b8c7c 100644
--- a/django_simple/todo/jobfiles.py
+++ b/django_simple/todo/jobfiles.py
@@ -84,7 +84,7 @@ def write_on_task_save(sender, instance, **kwargs):
 #wrapper = textwrap.TextWrapper(width=70)
 #word_list = wrapper.wrap(text=md.substitute(nstep=str(nstep)))
 
-     if  instance.unres_ff =='E0LL2Y':
+     if  instance.unres_ff =='FF2':
       w="""WSC=1.00000 WSCP=1.23315 WELEC=0.84476 WBOND=1.00000 WANG=0.62954              &
 WSCLOC=0.10554 WTOR=1.34316 WTORD=1.26571 WCORRH=0.19212 WCORR5=0.00000        &
 WCORR6=0.00000 WEL_LOC=0.37357 WTURN3=1.40323 WTURN4=0.64673 WTURN6=0.00000    &
@@ -221,6 +221,10 @@ CUTOFF=7.00000 WCORR4=0.00000"""
        f.write(word_list[-1]+'\n')
           
        if instance.md_start == 'pdbstart':
+        if instance.type == 'remd' :
+         f.write('print_min_ini print_min_res print_min_stat maxfun='+
+           str(instance.min_maxfun)+'\n')
+        else:
          f.write('print_min_ini print_min_res print_min_stat\n')
 
        
@@ -295,7 +299,7 @@ CUTOFF=7.00000 WCORR4=0.00000"""
         
      if instance.type == 'min':
       os.chdir(instance.jobdirname)
-      if  instance.unres_ff =='E0LL2Y':
+      if  instance.unres_ff =='FF2':
         shutil.copy('../files/pbs.csh','.')
       else:
         shutil.copy('../files/pbs_new.csh','pbs.csh')
@@ -303,7 +307,7 @@ CUTOFF=7.00000 WCORR4=0.00000"""
       os.chdir('..')
      elif instance.type == 'md':
       os.chdir(instance.jobdirname)
-      if  instance.unres_ff =='E0LL2Y':
+      if  instance.unres_ff =='FF2':
         f1 = open('../files/pbs_md.csh', 'r')
       else:
         f1 = open('../files/pbs_md_new.csh', 'r') 
@@ -316,6 +320,7 @@ CUTOFF=7.00000 WCORR4=0.00000"""
       f1 = open('file.seq', 'w')
       for i in range(0,len(seq),80):
              f1.write(seq[i:i+80]+'\n')
+      f1.write('\n')       
       f1.close()
 
       ret_code = subprocess.Popen(' /opt/torque/bin/qsub pbs.csh', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)      
@@ -348,7 +353,7 @@ CUTOFF=7.00000 WCORR4=0.00000"""
         tmp_ss=' '.join(map(str,l))
 
       os.chdir(instance.jobdirname)
-      if  instance.unres_ff =='E0LL2Y':
+      if  instance.unres_ff =='FF2':
         f1 = open('../files/pbs8.csh', 'r')
       else:
         f1 = open('../files/pbs8_new.csh', 'r')
@@ -393,13 +398,20 @@ CUTOFF=7.00000 WCORR4=0.00000"""
              f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
 
           if instance.saxs_data != '':
+             saxs_r=[]
+             saxs_P=[]
+             saxs_norm=0
              fsaxs = open(instance.jobdirname+'/saxs.data', 'w')
              lines=instance.saxs_data.split('\n')
              for line in lines:
               tmp=line.split()
               if len(tmp)==2:
                f.write(tmp[0]+' '+tmp[1]+'\n')
-               fsaxs.write(tmp[0]+' '+tmp[1]+'\n') 
+               saxs_r.append(tmp[0])
+               saxs_P.append(float(tmp[1]))
+               saxs_norm += float(tmp[1])
+             for r,p in zip(saxs_r,saxs_P):
+               fsaxs.write('{} {}\n'.format(r,p/saxs_norm)) 
              fsaxs.close()
 
           f.write(w+'\n')