# HG changeset patch
# User modencode-dcc
# Date 1360296381 18000
# Node ID c573810591798e1774d003d63640171536d0f157
# Parent  dfdaa943f8557c744de1be5c6f6b359b7936e7a0
Uploaded

diff -r dfdaa943f855 -r c57381059179 spp_wrapper.py
--- a/spp_wrapper.py	Wed Feb 06 21:23:05 2013 -0500
+++ b/spp_wrapper.py	Thu Feb 07 23:06:21 2013 -0500
@@ -47,7 +47,8 @@
 
     #run cmdline
     #========================================================================================
-    tmp_dir = tempfile.mkdtemp()
+    #tmp_dir = tempfile.mkdtemp()
+    tmp_dir = os.path.dirname(options['chip_file'])
     stderr_name = tempfile.NamedTemporaryFile().name
     proc = subprocess.Popen( args=cmdline, shell=True, cwd=tmp_dir, stderr=open( stderr_name, 'wb' ) )
     proc.wait()
@@ -66,17 +67,18 @@
 
     #determine if the outputs are there, copy them to the appropriate dir and filename
     #========================================================================================
+    chip_name = os.path.basename(options['chip_file'])
+    input_name = os.path.basename(options['input_file'])
+
     created_default_file =  os.path.join( tmp_dir, "default_output.txt" )
     if os.path.exists( created_default_file ):
         shutil.move( created_default_file, output_default_file )
 
-    chip_name = os.path.basename(options['chip_file'])
-    input_name = os.path.basename(options['input_file'])
-    created_narrow_peak =  os.path.join( tmp_dir, "%s_VS_%s.narrowPeak.gz" % (chip_name, input_name) )
+    created_narrow_peak =  os.path.join( tmp_dir, "%s_VS_%s.narrowPeak" % (chip_name, input_name) )
     if os.path.exists( created_narrow_peak ):
         shutil.move( created_narrow_peak, output_narrow_peak )
  
-    created_region_peak =  os.path.join( tmp_dir, "%s_VS_%s.regionPeak.gz" % (chip_name, input_name) )
+    created_region_peak =  os.path.join( tmp_dir, "%s_VS_%s.regionPeak" % (chip_name, input_name) )
     if os.path.exists( created_region_peak ):
         shutil.move( created_region_peak, output_region_peak )
 
@@ -84,11 +86,11 @@
     if os.path.exists( created_peakshift_file ):
         shutil.move( created_peakshift_file, output_peakshift_file )
 
-    created_rdata_file =  os.path.join( tmp_dir, "%s.Rdata" % options['chip_file'] )
+    created_rdata_file =  os.path.join( tmp_dir, "%s.Rdata" % chip_name )
     if os.path.exists( created_rdata_file ):
         shutil.move( created_rdata_file, output_rdata_file )
 
-    created_plot_file =  os.path.join( tmp_dir, "%s.pdf" % options['chip_file'] )
+    created_plot_file =  os.path.join( tmp_dir, "%s.pdf" % chip_name )
     if os.path.exists( created_plot_file ):
         shutil.move( created_plot_file, output_plot_file )