X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Fjobfiles.py;h=df2ce65255ab133a3aab81c816de99888dca2968;hb=a2e1f491fcf3227562136b78a511676b7b8f14d4;hp=400a2f7e6e995b8b640219eb290251acc95093c5;hpb=a2c993a7a81332719ecb024a7727f9de1dd04d8b;p=django_unres.git

diff --git a/django_simple/todo/jobfiles.py b/django_simple/todo/jobfiles.py
index 400a2f7..df2ce65 100644
--- a/django_simple/todo/jobfiles.py
+++ b/django_simple/todo/jobfiles.py
@@ -13,6 +13,47 @@ import textwrap
 logging.basicConfig()
 logger = logging.getLogger(__name__)
 
+def seq_2d_xx(line,seq):
+   line=line.replace(" ","")
+   lista=list(line)
+   for ii in range(0,len(line)):
+    if seq[ii]=='X':
+      if ii>0:
+            lista[ii-1]='-'
+      if ii+1<len(line):
+            lista[ii+1]='-'
+   return("".join(lista)) 
+
+def seq_2d_write(line):
+   line=line.replace(" ", "")
+   out='{:d}\n{:6.1f}\n'.format(len(line),50.0)
+   for i in range(1,4):
+     out=out+'{:5d}{:8.3f}{:8.3f}\n'.format(i,0.0,180.0)
+   for ii in range(1,len(line)-2):
+     i+=1
+     if line[ii:ii+2]=='HH':
+       out=out+'{:5d}{:8.3f}{:8.3f}\n'.format(i,50.0,20.0)
+     elif line[ii:ii+2]=='EE':
+       out=out+'{:5d}{:8.3f}{:8.3f}\n'.format(i,180.0,40.0)
+     else:
+       out=out+'{:5d}{:8.3f}{:8.3f}\n'.format(i,0.0,180.0)
+   return(out)
+
+def seq_2d_write_50(line):
+   line=line.replace(" ", "")
+   out='{:d}\n'.format(len(line))
+   for i in range(1,4):
+     out=out+'{:5d}{:8.3f}{:8.3f}{:8.3f}\n'.format(i,0.0,180.0,50.0)
+   for ii in range(1,len(line)-2):
+     i+=1
+     if line[ii:ii+2]=='HH':
+       out=out+'{:5d}{:8.3f}{:8.3f}{:8.3f}\n'.format(i,50.0,20.0,50.0)
+     elif line[ii:ii+2]=='EE':
+       out=out+'{:5d}{:8.3f}{:8.3f}{:8.3f}\n'.format(i,180.0,40.0,50.0)
+     else:
+       out=out+'{:5d}{:8.3f}{:8.3f}{:8.3f}\n'.format(i,0.0,180.0,50.0)     
+   return(out)
+
 def write_ssbond(ssbond):
    list=[]
    if ssbond!='':
@@ -43,20 +84,18 @@ 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    &
 WVDWPP=0.23173 WHPB=1.00000 WSCCOR=0.25                                        &
-CUTOFF=7.00000 WCORR4=0.00000
-"""
+CUTOFF=7.00000 WCORR4=0.00000"""
      else:
       w="""WSC=0.82686 WSCP=0.96947 WELEC=0.79373 WBOND=1.00000 WANG=0.46542              &
 WSCLOC=0.07969 WTOR=0.81684 WTORD=0.67806 WCORRH=0.00000 WCORR5=0.00000        &
 WCORR6=0.00000 WEL_LOC=0.71100 WTURN3=2.30298 WTURN4=0.86517 WTURN6=0.00000    &
 WSCCOR=0.14577 WVDWPP=0.17781 WHPB=1.00000 WSCP14=0.00000                      &
-CUTOFF=7.00000 WCORR4=0.00000
-"""
+CUTOFF=7.00000 WCORR4=0.00000"""
      
 
      with open(instance.jobdirname+'/file.inp','w') as f:
@@ -66,7 +105,10 @@ CUTOFF=7.00000 WCORR4=0.00000
 
           control_line = 'SEED='+str(instance.md_seed)+' ' \
              + instance.min_choice \
-             + ' pdbstart pdbref BOXX=1000. BOXY=1000. BOXZ=1000. '
+             + ' pdbstart pdbref ' \
+             + ' BOXX='+str(instance.boxx) \
+             + ' BOXY='+str(instance.boxy) \
+             + ' BOXZ='+str(instance.boxz) +' '
           if not instance.min_overlap:
             control_line = control_line+'overlap '
           if not instance.min_searchsc:
@@ -89,7 +131,7 @@ CUTOFF=7.00000 WCORR4=0.00000
           if seq[-1]=='X':
             dimen3-=1
   
-       nogly ='CDSQKIPTFNHLRWAVEYM'
+       nogly ='CDSQKIPTFNHLRWAVEYMcdsqkiptfnhlrwaveym'
        seq2 = ''.join([c for c in seq if c in nogly])
   
        dimen3=(dimen3+len(seq2))*3
@@ -97,7 +139,11 @@ CUTOFF=7.00000 WCORR4=0.00000
             
        if instance.type == 'md' :
           control_line = 'SEED='+str(instance.md_seed)+' '\
-           +instance.md_start +' md one_letter BOXX=1000. BOXY=1000. BOXZ=1000. '
+           +instance.md_start +' md one_letter'\
+           + ' BOXX='+str(instance.boxx) \
+           + ' BOXY='+str(instance.boxy) \
+           + ' BOXZ='+str(instance.boxz) +' '
+
           if instance.md_pdbref:
              control_line = control_line+'pdbref '
             
@@ -120,10 +166,23 @@ CUTOFF=7.00000 WCORR4=0.00000
 
        if instance.type == 'remd' :
           control_line = 'SEED='+str(instance.md_seed)+' '\
-           +instance.md_start +' re one_letter BOXX=1000. BOXY=1000. BOXZ=1000. '
+           +instance.md_start +' re one_letter'\
+           + ' BOXX='+str(instance.boxx) \
+           + ' BOXY='+str(instance.boxy) \
+           + ' BOXZ='+str(instance.boxz) +' '
+           
           if instance.md_pdbref:
              control_line = control_line+'pdbref '
-           
+          
+          cntrl_saxs=''
+          if instance.saxs_data != '':
+             lines=instance.saxs_data.split('\n')
+             nsaxs=0
+             for line in lines:
+              if len(line.split())==2:
+               nsaxs+=1 
+             cntrl_saxs=' nsaxs='+str(nsaxs)+' scal_rad='+str(instance.scal_rad) 
+             control_line += cntrl_saxs             
             
           type_line = 'reset_vel='+ str(instance.remd_nstex)\
              +' nstep='+str(instance.md_nstep)\
@@ -162,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')
 
        
@@ -184,15 +247,19 @@ CUTOFF=7.00000 WCORR4=0.00000
           for element in word_list[:-1]:
               f.write('{:79}'.format(element)+'&\n')
           f.write(word_list[-1]+'\n')
-
-       f.write(w)
+       
+       if instance.saxs_data != '':
+         w+=' wsaxs='+str(instance.wsaxs)
+       f.write(w+'\n')
 
 
        if instance.type == 'min' or instance.md_start == 'pdbstart':
           f.write('plik.pdb\n')
           f.write(write_ssbond(instance.ssbond))
-          f.write('0\n')
-
+          if instance.md_2d == '':
+            f.write('0\n')
+          else:
+            f.write(seq_2d_write(seq_2d_xx(instance.md_2d,seq)))
 
        if instance.type == 'md' and instance.md_start != 'pdbstart':
 
@@ -201,7 +268,12 @@ CUTOFF=7.00000 WCORR4=0.00000
           f.write(str(len(seq))+'\n')
           for i in range(0,len(seq),80):
              f.write(seq[i:i+80]+'\n')
-          f.write('0\n0\n')
+          f.write('0\n')
+          if instance.md_2d == '':
+            f.write('0\n')
+          else:
+            f.write(seq_2d_write(seq_2d_xx(instance.md_2d,seq)))
+
 
        if instance.type == 'remd' and instance.md_start != 'pdbstart':
 
@@ -210,14 +282,24 @@ CUTOFF=7.00000 WCORR4=0.00000
           f.write(str(len(seq))+'\n')
           for i in range(0,len(seq),80):
              f.write(seq[i:i+80]+'\n')
-          f.write('0\n0\n')
+          f.write('0\n')
+          if instance.md_2d == '':
+            f.write('0\n')
+          else:
+            f.write(seq_2d_write(seq_2d_xx(instance.md_2d,seq)))
 
 
+       if instance.saxs_data != '':
+             lines=instance.saxs_data.split('\n')
+             for line in lines:
+              tmp=line.split()
+              if len(tmp)==2:
+               f.write(tmp[0]+' '+tmp[1]+'\n') 
        
         
      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')
@@ -225,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') 
@@ -238,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)      
@@ -270,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')
@@ -297,19 +380,34 @@ CUTOFF=7.00000 WCORR4=0.00000
           if instance.md_pdbref:
             f.write('{:79}'.format('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
                ' einicheck=1 rescale=2 delta=0.02 cxfile classify')+'&\n')
-            f.write('BOXX=1000. BOXY=1000. BOXZ=1000. \n')
           else:    
             f.write('{:79}'.format('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
               ' einicheck=1 rescale=2 delta=0.02 cxfile')+'&\n')
-            f.write('BOXX=1000. BOXY=1000. BOXZ=1000. \n')
+          if instance.md_2d != '':
+               f.write('{:79}'.format(' WITH_DIHED_CONSTR')+'&\n')
+          f.write('BOXX='+str(instance.boxx)+' BOXY='+str(instance.boxy)+
+                    ' BOXZ='+str(instance.boxz)+cntrl_saxs +'\n')
+                 
           f.write('nres='+str(len(seq))+' one_letter\n')
           for i in range(0,len(seq),80):
              f.write(seq[i:i+80]+'\n')
 
           f.write(write_ssbond(instance.ssbond))
 
+          if instance.md_2d != '':
+             f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
+
+          if instance.saxs_data != '':
+             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') 
+             fsaxs.close()
 
-          f.write(w)
+          f.write(w+'\n')
           f.write('\n')
           f.write('nt='+str(instance.remd_nrep)+' replica read_iset\n')
           tmp1=json.loads(instance.remd_multi_t)
@@ -330,11 +428,22 @@ CUTOFF=7.00000 WCORR4=0.00000
           f.write('{:79}'.format('nres='+str(len(seq))
              +' one_letter rescale=2 PRINT_CART PDBOUT=1 iopt=1'
              +' temper='+str(instance.remd_cluter_temp))+'&\n')
-          f.write('BOXX=1000. BOXY=1000. BOXZ=1000. \n')
-          f.write(w)
+          if instance.md_2d != '':
+               f.write('{:79}'.format(' WITH_DIHED_CONSTR')+'&\n')
+          f.write('BOXX='+str(instance.boxx)+' BOXY='+str(instance.boxy)+
+                  ' BOXZ='+str(instance.boxz)+cntrl_saxs +'\n')
+          f.write(w+'\n')
           for i in range(0,len(seq),80):
              f.write(seq[i:i+80]+'\n')
           f.write(write_ssbond(instance.ssbond))
+          if instance.md_2d != '':
+             f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
+          if instance.saxs_data != '':
+             lines=instance.saxs_data.split('\n')
+             for line in lines:
+              tmp=line.split()
+              if len(tmp)==2:
+               f.write(tmp[0]+' '+tmp[1]+'\n') 
       
       os.chdir(instance.jobdirname)  
       ret_code = subprocess.Popen(' /opt/torque/bin/qsub pbs8.csh', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)