Rafal's code for NMR restraints
[django_unres.git] / django_simple / todo / jobfiles.py
index e9a2ffc..c6ab414 100644 (file)
@@ -72,7 +72,7 @@ def write_ssbond(ssbond):
 
 @receiver(post_save, sender=Task)
 def write_on_task_save(sender, instance, **kwargs):
-   if instance.ready and not instance.done and instance.running==0:
+   if instance.ready and not instance.done and instance.running==0 and instance.pbsjob=='':
      if (not os.path.isdir(instance.jobdirname)):
         os.mkdir(instance.jobdirname)
 #     os.chdir(instance.jobdirname)
@@ -84,12 +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"""
+     elif  instance.unres_ff =='NEWCT-9P':
+      w="""WSC=0.81230 WSCP=1.20420 WELEC=0.87690 WBOND=1.00000 WANG=1.97730              &
+WSCLOC=0.063657 WTOR=1.41540 WTORD=0.00000 WCORRH=0.00000 WCORR5=0.00000       &
+WCORR6=0.00000 WEL_LOC=0.036638 WTURN3=1.45110 WTURN4=0.00000 WTURN6=0.00000   &
+WSCCOR=0.00000 WVDWPP=0.33393 WHPB=1.00000 WSCP14=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        &
@@ -117,6 +123,8 @@ CUTOFF=7.00000 WCORR4=0.00000"""
             control_line = control_line+'pdbout '
           if instance.min_unres_pdb:
             control_line = control_line+'unres_pdb '
+          if instance.unres_ff =='NEWCT-9P':
+            control_line = control_line+'tormode=2 '
             
           type_line = 'print_min_ini print_min_res print_min_stat'\
             +' MAXMIN='+str(instance.min_maxmin)\
@@ -146,8 +154,15 @@ CUTOFF=7.00000 WCORR4=0.00000"""
 
           if instance.md_pdbref:
              control_line = control_line+'pdbref '
+             
+#---v
+          if instance.use_nmr:
+            control_line = control_line+' constr_dist=12 '
+#---^
+          if instance.unres_ff =='NEWCT-9P':
+            control_line = control_line+'tormode=2 cart'
             
-          type_line = 'reset_vel=0'\
+          type_line = '        reset_vel=0'\
              +' t_bath='+str(instance.md_temp)\
              +' nstep='+str(instance.md_nstep)\
              +' ntwe='+str(instance.md_ntwe)\
@@ -164,15 +179,25 @@ CUTOFF=7.00000 WCORR4=0.00000"""
           if instance.md_mdpdb:
             type_line = type_line + ' mdpdb '
 
-       if instance.type == 'remd' :
+       if instance.type == 'remd' or instance.type == 'dock':
           control_line = 'SEED='+str(instance.md_seed)+' '\
            +instance.md_start +' re one_letter'\
            + ' BOXX='+str(instance.boxx) \
            + ' BOXY='+str(instance.boxy) \
            + ' BOXZ='+str(instance.boxz) +' '
+          
+          if instance.type == 'dock':
+             control_line = control_line+'CONSTR_HOMOL=24 '             
            
           if instance.md_pdbref:
              control_line = control_line+'pdbref '
+             
+          if instance.unres_ff =='NEWCT-9P':
+            control_line = control_line+'tormode=2 cart'
+#---v
+         if instance.use_nmr:
+           control_line = control_line+' constr_dist=12 '
+#---^
           
           cntrl_saxs=''
           if instance.saxs_data != '':
@@ -184,7 +209,7 @@ CUTOFF=7.00000 WCORR4=0.00000"""
              cntrl_saxs=' nsaxs='+str(nsaxs)+' scal_rad='+str(instance.scal_rad) 
              control_line += cntrl_saxs             
             
-          type_line = 'reset_vel='+ str(instance.remd_nstex)\
+          type_line = '        reset_vel='+ str(instance.remd_nstex)\
              +' nstep='+str(instance.md_nstep)\
              +' ntwe='+str(instance.md_ntwe)\
              +' ntwx='+str(instance.md_ntwx)\
@@ -197,8 +222,8 @@ CUTOFF=7.00000 WCORR4=0.00000"""
             type_line = type_line + 'tau_bath='+str(instance.md_tau)
           if instance.md_respa:
             type_line = type_line + ' respa '
-          if instance.md_mdpdb:
-            type_line = type_line + ' mdpdb '
+#          if instance.md_mdpdb:
+#            type_line = type_line + ' mdpdb '
           
           type_line2 = 'nrep='+str(instance.remd_nrep) \
              +' nstex='+str(instance.remd_nstex) \
@@ -220,11 +245,15 @@ CUTOFF=7.00000 WCORR4=0.00000"""
            f.write('{:79}'.format(element)+'&\n')
        f.write(word_list[-1]+'\n')
           
-       if instance.md_start == 'pdbstart':
+       if instance.md_start == 'pdbstart' and instance.unres_ff !='NEWCT-9P':
+        if instance.type == 'remd' or instance.type == 'dock':
+         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')
 
        
-       if instance.type == 'remd' :
+       if instance.type == 'remd' or instance.type == 'dock':
           word_list = wrapper.wrap(text=type_line2)
           for element in word_list[:-1]:
               f.write('{:79}'.format(element)+'&\n')
@@ -250,12 +279,26 @@ CUTOFF=7.00000 WCORR4=0.00000"""
 
 
        if instance.type == 'min' or instance.md_start == 'pdbstart':
-          f.write('plik.pdb\n')
+          if instance.type == 'dock':
+            f.write('plik1ter.pdb\n')
+          else:  
+            f.write('plik.pdb\n')
           f.write(write_ssbond(instance.ssbond))
           if instance.md_2d == '':
             f.write('0\n')
           else:
+           if instance.unres_ff =='NEWCT-9P':
+            f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
+           else:
             f.write(seq_2d_write(seq_2d_xx(instance.md_2d,seq)))
+        
+       if instance.type == 'dock':
+          f.write('HOMOL_DIST=0.1    HOMOL_ANGLE=1.0 HOMOL_THETA=1.0 HOMOL_SCD=1.0 DIST_CUT=15.0  &\n')
+          f.write('READ2SIGMA START_FROM_MODELS\n')
+          for i in range(1,10):
+           f.write('model0'+str(i)+'.pdb\n')
+          for i in range(10,25):
+           f.write('model'+str(i)+'.pdb\n')
 
        if instance.type == 'md' and instance.md_start != 'pdbstart':
 
@@ -268,7 +311,26 @@ CUTOFF=7.00000 WCORR4=0.00000"""
           if instance.md_2d == '':
             f.write('0\n')
           else:
+           if instance.unres_ff =='NEWCT-9P':
+            f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
+           else:
             f.write(seq_2d_write(seq_2d_xx(instance.md_2d,seq)))
+#---v
+          if instance.use_nmr:
+            f.write('ndist='+repr(instance.linijek_nmr)+' restr_type=12 scal_peak=')
+            f.write(repr(instance.nmr_scal)+' fordepth_peak='+repr(instance.nmr_fordepth))
+            f.write(' slope_peak='+repr(instance.nmr_slope)+'\n')
+            if (instance.myfile3=='files/N1008_AmbiR-trunc.txt'):
+              fnmr = open(instance.jobdirname+'/../files/N1008_AmbiR-trunc.txt', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+            else:
+              fnmr = open(instance.jobdirname+'/plik3.nmr', 'r')
+              for linmr in fnmr:
+                  f.write(linmr)
+              fnmr.close()
+#---^
 
 
        if instance.type == 'remd' and instance.md_start != 'pdbstart':
@@ -282,7 +344,26 @@ CUTOFF=7.00000 WCORR4=0.00000"""
           if instance.md_2d == '':
             f.write('0\n')
           else:
+           if instance.unres_ff =='NEWCT-9P':
+            f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
+           else:
             f.write(seq_2d_write(seq_2d_xx(instance.md_2d,seq)))
+#---v
+          if instance.use_nmr:
+            f.write('ndist='+repr(instance.linijek_nmr)+' restr_type=12 scal_peak=')
+            f.write(repr(instance.nmr_scal)+' fordepth_peak='+repr(instance.nmr_fordepth))
+            f.write(' slope_peak='+repr(instance.nmr_slope)+'\n')
+            if (instance.myfile3=='files/N1008_AmbiR-trunc.txt'):
+              fnmr = open(instance.jobdirname+'/../files/N1008_AmbiR-trunc.txt', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+            else:
+              fnmr = open(instance.jobdirname+'/plik3.nmr', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+#---^
 
 
        if instance.saxs_data != '':
@@ -295,16 +376,20 @@ 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','.')
+      elif instance.unres_ff =='NEWCT-9P':
+        shutil.copy('../files/pbs_newct-9p.csh','pbs.csh')
       else:
         shutil.copy('../files/pbs_new.csh','pbs.csh')
       ret_code = subprocess.Popen(' /opt/torque/bin/qsub pbs.csh', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       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')
+      elif instance.unres_ff =='NEWCT-9P':
+        f1 = open('../files/pbs_md_newct-9p.csh', 'r')
       else:
         f1 = open('../files/pbs_md_new.csh', 'r') 
       f2 = open('pbs.csh', 'w')
@@ -316,6 +401,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,8 +434,10 @@ 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')
+      elif instance.unres_ff =='NEWCT-9P':
+        f1 = open('../files/pbs8_newct-9p.csh', 'r')
       else:
         f1 = open('../files/pbs8_new.csh', 'r')
       f2 = open('pbs8.csh', 'w')
@@ -358,11 +446,38 @@ CUTOFF=7.00000 WCORR4=0.00000"""
            f2.write(line.replace('#PBS -l nodes=4:ppn=4', pbs))
           elif '$ssbond' in line:
            f2.write(line.replace('$ssbond',tmp_ss))
+          elif 'cd $PBS_O_WORKDIR' in line and instance.type == 'dock':
+            f2.write(line)
+            if instance.md_seq2 !='':
+             f2.write("""setenv FGPROCS 2
+setenv POT GB
+setenv PREFIX file2
+setenv OUT1FILE YES
+/users2/local/mpich2-1.4.1p1_intel/bin/mpirun -machinefile $PBS_NODEFILE -np 2 $UNRES_BIN
+/users2/local/pulchra306/pulchra -q -g file2_MD000.pdb
+cat file2_MD000.rebuilt.pdb |grep -v TER |grep -v END > tmp_plik2.pdb
+/users2/local/mmtsb/perl/convpdb.pl -renumber 1 -out generic tmp_plik2.pdb > act.rebuilt.pdb
+/users2/local/scwrl4/Scwrl4 -h -i act.rebuilt.pdb -o plik2.pdb
+rm tmp_plik2.pdb act.rebuilt.pdb\n""")
+            if instance.dock_peptide:
+             f2.write('../files/generator_v13 plik.pdb plik2.pdb 1 \n')
+            else:
+             f2.write('../files/generator_v13 plik.pdb plik2.pdb 0 \n')
+            f2.write("sed '/END/q' plik.pdb |grep ATOM > plik1ter.pdb \n")
+            f2.write("echo TER >>  plik1ter.pdb \n")
+            f2.write("sed '/END/q' plik2.pdb |grep ATOM >> plik1ter.pdb \n")            
           else:
            tmp1=json.loads(instance.remd_multi_t)
            f2.write(line.replace('$temperatures','"'+" ".join(tmp1)+'" '+str(nreplicas)))
       f1.close()
       f2.close()
+
+      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()
+      
       os.chdir('..')  
 
 # write wham & cluster input
@@ -371,15 +486,23 @@ CUTOFF=7.00000 WCORR4=0.00000"""
               isampl=1
           else:
               isampl=int(instance.md_nstep/instance.md_ntwx*nreplicas/8000)
-
+#---v
+          if instance.use_nmr:
+               f.write('{:79}'.format('with_dist_constr constr_dist=12')+'&\n')
+#---^
+          f.write('{:79}'.format(' isampl='+str(isampl))+'&\n')
           if instance.md_pdbref:
-            f.write('{:79}'.format('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
+            f.write('{:79}'.format('SEED='+str(instance.md_seed)+
                ' einicheck=1 rescale=2 delta=0.02 cxfile classify')+'&\n')
           else:    
-            f.write('{:79}'.format('SEED='+str(instance.md_seed)+' isampl='+str(isampl)+
+            f.write('{:79}'.format('SEED='+str(instance.md_seed)+
               ' einicheck=1 rescale=2 delta=0.02 cxfile')+'&\n')
           if instance.md_2d != '':
                f.write('{:79}'.format(' WITH_DIHED_CONSTR')+'&\n')
+          if instance.type == 'dock':
+               f.write('{:79}'.format(' n_ene=19 CONSTR_HOMOL=24')+'&\n')
+          if instance.unres_ff =='NEWCT-9P':
+               f.write('{:79}'.format('tormode=2 ')+'&\n')
           f.write('BOXX='+str(instance.boxx)+' BOXY='+str(instance.boxy)+
                     ' BOXZ='+str(instance.boxz)+cntrl_saxs +'\n')
                  
@@ -389,17 +512,54 @@ CUTOFF=7.00000 WCORR4=0.00000"""
 
           f.write(write_ssbond(instance.ssbond))
 
+#---v
+          if instance.use_nmr:
+            f.write('ndist='+repr(instance.linijek_nmr)+' restr_type=12 scal_peak=')
+            f.write(repr(instance.nmr_scal)+' fordepth_peak='+repr(instance.nmr_fordepth))
+            f.write(' slope_peak='+repr(instance.nmr_slope)+'\n')
+            if (instance.myfile3=='files/N1008_AmbiR-trunc.txt'):
+              fnmr = open(instance.jobdirname+'/../files/N1008_AmbiR-trunc.txt', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+            else:
+              fnmr = open(instance.jobdirname+'/plik3.nmr', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+#---^
+
+          if instance.type == 'dock':
+            f.write('HOMOL_DIST=0.1    HOMOL_ANGLE=1.0 HOMOL_THETA=1.0 HOMOL_SCD=1.0 DIST_CUT=15.0  &\n')
+            f.write('READ2SIGMA \n')
+            for i in range(1,10):
+              f.write('model0'+str(i)+'.pdb\n')
+            for i in range(10,25):
+              f.write('model'+str(i)+'.pdb\n')
+
           if instance.md_2d != '':
              f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
 
           if instance.saxs_data != '':
+             saxs_r=[]
+             saxs_P=[]
+             saxs_norm=0
+             r_last=None
              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]))
+               if r_last==None:
+                  r_last=float(tmp[0])
+               else:
+                  saxs_norm += float(tmp[1])*(float(tmp[0])-r_last)
+                  r_last=float(tmp[0])
+             for r,p in zip(saxs_r,saxs_P):
+               fsaxs.write('{} {}\n'.format(r,p/saxs_norm)) 
              fsaxs.close()
 
           f.write(w+'\n')
@@ -415,22 +575,59 @@ CUTOFF=7.00000 WCORR4=0.00000"""
           f.write('file_MD000\n')
           if instance.md_pdbref:
              f.write('pdbref\n')
-             f.write('plik.pdb\n')
+             if instance.type == 'dock':
+              f.write('plik1ter.pdb\n')
+             else:
+              f.write('plik.pdb\n')
 
            
       with open(instance.jobdirname+'/file_cluster.inp','w') as f:
           f.write(instance.name + ' UNRES server job'+ '\n')
           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')
+             +' temper='+str(instance.remd_cluter_temp)
+             +' nclust='+str(instance.remd_cluster_n))+'&\n')
           if instance.md_2d != '':
                f.write('{:79}'.format(' WITH_DIHED_CONSTR')+'&\n')
+#---v
+         if instance.use_nmr:
+            f.write('{:79}'.format('constr_dist=12 ')+'&\n')
+#---^
+          if instance.type == 'dock':
+               f.write('{:79}'.format(' CONSTR_HOMOL=24')+'&\n')
+          if instance.unres_ff =='NEWCT-9P':
+               f.write('{:79}'.format('tormode=2 ')+'&\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))
+
+#---v
+          if instance.use_nmr:
+            f.write('ndist='+repr(instance.linijek_nmr)+' restr_type=12 scal_peak=')
+            f.write(repr(instance.nmr_scal)+' fordepth_peak='+repr(instance.nmr_fordepth))
+            f.write(' slope_peak='+repr(instance.nmr_slope)+'\n')
+            if (instance.myfile3=='files/N1008_AmbiR-trunc.txt'):
+              fnmr = open(instance.jobdirname+'/../files/N1008_AmbiR-trunc.txt', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+            else:
+              fnmr = open(instance.jobdirname+'/plik3.nmr', 'r')
+              for linmr in fnmr:
+                   f.write(linmr)
+              fnmr.close()
+#---^
+
+          if instance.type == 'dock':
+            f.write('HOMOL_DIST=0.1    HOMOL_ANGLE=1.0 HOMOL_THETA=1.0 HOMOL_SCD=1.0 DIST_CUT=15.0  &\n')
+            f.write('READ2SIGMA \n')
+            for i in range(1,10):
+              f.write('model0'+str(i)+'.pdb\n')
+            for i in range(10,25):
+              f.write('model'+str(i)+'.pdb\n')
           if instance.md_2d != '':
              f.write(seq_2d_write_50(seq_2d_xx(instance.md_2d,seq)))
           if instance.saxs_data != '':
@@ -440,17 +637,69 @@ CUTOFF=7.00000 WCORR4=0.00000"""
               if len(tmp)==2:
                f.write(tmp[0]+' '+tmp[1]+'\n') 
       
+      if instance.type == 'dock' and instance.md_seq2 != '':
+         with open(instance.jobdirname+'/file2.inp','w') as f:
+           f.write(instance.name + ' chain2 random start'+ '\n')
+           control_line = 'SEED='+str(instance.md_seed)+' '\
+            +'rand_conf md one_letter'\
+            + ' BOXX=1000 BOXY=1000 BOXZ=1000 '
+           
+           if instance.unres_ff =='NEWCT-9P':
+             control_line = control_line+'tormode=2 cart'
+           
+           type_line = '        reset_vel=0'\
+             +' t_bath=300'\
+             +' nstep=100000'\
+             +' ntwe=10000'\
+             +' ntwx=100000'\
+             +' dt=0.2 lang=1 scal_fric=0.02 respa mdpdb '
+
+           wrapper = textwrap.TextWrapper(width=70)
+           word_list = wrapper.wrap(text=control_line)
+           for element in word_list[:-1]:
+             f.write('{:79}'.format(element)+'&\n')
+           f.write(word_list[-1]+'\n')
+
+           word_list = wrapper.wrap(text=type_line)
+           for element in word_list[:-1]:
+             f.write('{:79}'.format(element)+'&\n')
+           f.write(word_list[-1]+'\n')
+           
+           f.write(w+'\n')
+           
+           seq=instance.md_seq2.replace(" ","")
+           f.write(str(len(seq))+'\n')
+           for i in range(0,len(seq),80):
+             f.write(seq[i:i+80]+'\n')
+           f.write('0\n')
+           f.write('0\n')
+          
+      
       os.chdir(instance.jobdirname)  
       ret_code = subprocess.Popen(' /opt/torque/bin/qsub pbs8.csh', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       os.chdir('..')
+      
+     output = str(ret_code.communicate()[0])
+     output=output.strip()
+     if output=='':
+       output='error'
+     logger.warning("PBS \"%s\" " % output)
+     instance.pbsjob = output
+     instance.save()
      
-     print ret_code.stdout.readlines()
+#     print ret_code.stdout.readlines()
      logger.warning("Dir \"%s\" has been saved." % instance.jobdirname)
      
 @receiver(post_delete, sender=Task)
 def delete_on_task_del(sender, instance, **kwargs):     
    if instance.jobdirname:
       if os.path.isdir(instance.jobdirname):
+         if not instance.done:
+           ret_code_qdel = subprocess.Popen(' /opt/torque/bin/qdel '+str(instance.pbsjob), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+           output = str(ret_code_qdel.communicate()[0])
+           output=output.strip()
+           logger.warning("PBS qdel \"%s\" " % instance.pbsjob)
+           logger.warning("QDEL \"%s\" " % output)
          shutil.rmtree(instance.jobdirname)
          logger.warning("Dir \"%s\" has been rm." % instance.jobdirname)         
-         
\ No newline at end of file
+