Index: /tags/ipp-20150115/ippScripts/scripts/sc_mk_stack_mdc.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_mk_stack_mdc.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_mk_stack_mdc.pl	(revision 37914)
@@ -9,4 +9,5 @@
 
 my $remote_root = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
 
 my ($compmap_file);
Index: /tags/ipp-20150115/ippScripts/scripts/sc_mk_staticsky_mdc.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_mk_staticsky_mdc.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_mk_staticsky_mdc.pl	(revision 37914)
@@ -9,4 +9,6 @@
 
 my $remote_root = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
+
 
 my ($compmap_file);
Index: /tags/ipp-20150115/ippScripts/scripts/sc_prepare_camera.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_prepare_camera.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_prepare_camera.pl	(revision 37914)
@@ -21,5 +21,8 @@
 # my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root     = '/scratch3/watersc1/';  # Far side destination base location
+$remote_root = '/lus/scratch/watersc/';
+
 my $remote_hostname = "LANL/Mustang";         # Name of the remote node.
+$remote_hostname = "UH/Cray";
 my $threads_req     = 0;                      # How many threads are we going to use?
 
@@ -151,8 +154,8 @@
     $psastro_command   .= " -masklist ${remote_outroot}.masklist ${remote_outroot} ";
 #   $psastro_command   .= " -refmasklist ${remote_outroot}.masklist ${remote_outroot} ";
-    $psastro_command   .= " -refmasklist /turquoise/usr/projects/ps1/watersc1/references/gpc1.refmask.list ";
-    $psastro_command   .= " -kh-correct /turquoise/usr/projects/ps1/watersc1/references/khcorrect.20140606.v0.fits ";
+    $psastro_command   .= " -refmasklist /home/watersc/references/gpc1.refmask.list ";
+    $psastro_command   .= " -kh-correct /home/watersc/references/khcorrect.20140606.v0.fits ";
 #   $psastro_command   .= " -astrommodel /turquoise/usr/projects/ps1/watersc1/references/gpc1.20080909.asm ";
-    $psastro_command   .= " -astrommodel /turquoise/usr/projects/ps1/watersc1/references/gpc1.20140505.asm ";
+    $psastro_command   .= " -astrommodel /home/watersc/references/gpc1.20140505.asm ";
     $psastro_command   .= " -recipe PSASTRO $recipe_psastro ";
     $psastro_command   .= " -tracedest ${remote_outroot}.trace -log ${remote_outroot}.log ";
Index: /tags/ipp-20150115/ippScripts/scripts/sc_prepare_chip.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_prepare_chip.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_prepare_chip.pl	(revision 37914)
@@ -21,5 +21,8 @@
 # my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root     = '/scratch3/watersc1/';  # Far side destination base location
+$remote_root = '/lus/scratch/watersc/';
+
 my $remote_hostname = "LANL/Mustang";         # Name of the remote node.
+$remote_hostname = "UH/Cray";
 my $remote_raw      = "${remote_root}/tmp/";  # Directory to find raw data in.
 my $threads_req     = 4;
Index: /tags/ipp-20150115/ippScripts/scripts/sc_prepare_run.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_prepare_run.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_prepare_run.pl	(revision 37914)
@@ -24,4 +24,5 @@
 # my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
 my $remote_raw    = "${remote_root}/tmp/";  # Directory to find raw data in.
 
@@ -45,9 +46,9 @@
 $job_subscription{"warp"}   = 1;
 $job_subscription{"stack"}  = 3;
-$job_subscription{"staticsky"} = 3;
-
-my $proc_per_node = 24;                     # processors per node
+$job_subscription{"staticsky"} = 5;
+
+my $proc_per_node = 20;                     # processors per node
 my $min_nodes     = 1;                      # smallest allocation to ask for
-my $max_nodes     = 1000;                   # largest allocation to ask for
+my $max_nodes     = 10;                     # largest allocation to ask for
 my $min_time      = 1;                      # shortest allocation to ask for
 my $max_time      = 8;                      # longest allocation to ask for
@@ -248,9 +249,15 @@
 open(COMMAND,  ">$disk_command") || &my_die("Couldn't open file? $disk_command", $remote_id, $PS_EXIT_SYS_ERROR, $fail_state);
 print COMMAND "#!/bin/tcsh\n";
-print COMMAND "##### Moab controll lines\n";
-print COMMAND "#MSUB -l nodes=${node_req}:ppn=${proc_per_node},walltime=${time_req}:00:00\n"; ## CHECK RESOURCES
-print COMMAND "#MSUB -j oe\n";
-print COMMAND "#MSUB -V\n";
-print COMMAND "#MSUB -o ${remote_root}/stask_logs/${stage}.${remote_id}.out\n";
+# print COMMAND "##### Moab controll lines\n";
+# print COMMAND "#MSUB -l nodes=${node_req}:ppn=${proc_per_node},walltime=${time_req}:00:00\n"; ## CHECK RESOURCES
+# print COMMAND "#MSUB -j oe\n";
+# print COMMAND "#MSUB -V\n";
+# print COMMAND "#MSUB -o ${remote_root}/stask_logs/${stage}.${remote_id}.out\n";
+print COMMAND "###### sbatch control lines\n";
+print COMMAND "#SBATCH --time ${time_req}:00:00\n";
+print COMMAND "#SBATCH --nodes ${node_req}\n";
+print COMMAND "#SBATCH --open-mode=append\n";
+print COMMAND "#SBATCH --export=ALL\n";
+print COMMAND "#SBATCH -o ${remote_root}/stask_logs/${stage}.${remote_id}.out\n";
 print COMMAND "date\n";
 print COMMAND 'srun -n $SLURM_JOB_NUM_NODES -m cyclic -l /bin/hostname | sort -n | awk \'{printf "%s\n", $2}\' > hosts.${SLURM_JOB_ID}' . "\n";
Index: /tags/ipp-20150115/ippScripts/scripts/sc_prepare_stack.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_prepare_stack.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_prepare_stack.pl	(revision 37914)
@@ -21,5 +21,8 @@
 # my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root     = '/scratch3/watersc1/';  # Far side destination base location
+$remote_root = '/lus/scratch/watersc/';
+
 my $remote_hostname = "LANL/Mustang";         # Name of the remote node.
+$remote_hostname = "UH/Cray";
 my $threads_req     = 4;                      # How many threads are we going to use?
 
Index: /tags/ipp-20150115/ippScripts/scripts/sc_prepare_staticsky.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_prepare_staticsky.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_prepare_staticsky.pl	(revision 37914)
@@ -21,5 +21,8 @@
 # my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root     = '/scratch3/watersc1/';  # Far side destination base location
+$remote_root = '/lus/scratch/watersc/';
+
 my $remote_hostname = "LANL/Mustang";         # Name of the remote node.
+$remote_hostname = "UH/Cray";
 my $threads_req     = 4;                      # How many threads are we going to use?
 
Index: /tags/ipp-20150115/ippScripts/scripts/sc_prepare_warp.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_prepare_warp.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_prepare_warp.pl	(revision 37914)
@@ -21,5 +21,8 @@
 # my $remote_root = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
 my $remote_root     = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
+
 my $remote_hostname = "LANL/Mustang";         # Name of the remote node.
+$remote_hostname = "UH/Cray";
 my $threads_req     = 4;                      # How many threads are we going to use?
 
Index: /tags/ipp-20150115/ippScripts/scripts/sc_remote_exec.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_remote_exec.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_remote_exec.pl	(revision 37914)
@@ -16,10 +16,17 @@
 # Hard coded values
 my $DMZ_HOST = 'wtrw';
+$DMZ_HOST = '128.171.123.18';
+
 my @SEC_HOSTS= ('mu-fe1','mu-fe2','mu-fe3'
 		# ,'mu-fe4'
     );
 my $SEC_HOST = $SEC_HOSTS[int(rand(@SEC_HOSTS))]; # 'mu-fe';
+$SEC_HOST = '';
+
 my $IPP_PATH = '/turquoise/usr/projects/cosmo/mswarren/ipp/';
+$IPP_PATH = '/home/watersc/src/';
+
 my $remote_root  = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
 
 # tools
@@ -111,8 +118,10 @@
 # Run real command
 my (undef,$remote_command) = &uri_convert($uri_command);
-my $ssh_exec_stdout = &ssh_exec_command("msub -V $remote_command");
+my $ssh_exec_stdout = &ssh_exec_command("sbatch $remote_command");   ##"msub -V $remote_command");
 if ($#{ $ssh_exec_stdout } != -1) { # Parse the output
-    $job_id = ${ $ssh_exec_stdout }[0];
-    chomp($job_id);
+    my $line = ${ $ssh_exec_stdout }[0];
+    chomp($line);
+    my @line_split = split /\s+/, $line;
+    $job_id = $line_split[-1]
     $job_id =~ s/\s+//g;
 }
@@ -141,5 +150,11 @@
     my $file = shift;
     my $destination = shift;
-    my $cmd = "$scp $file ${DMZ_HOST}:${SEC_HOST}:${destination}";
+    my $cmd;
+    if ($SEC_HOST ne '') {
+        $cmd = "$scp $file ${DMZ_HOST}:${SEC_HOST}:${destination}";
+    }
+    else {
+        $cmd = "$scp $file ${DMZ_HOST}:${destination}";
+    }
 
     my $directory = dirname($destination);
@@ -157,6 +172,11 @@
     my $destination = shift;
     my $file = shift;
-
-    my $cmd = "$scp ${DMZ_HOST}:${SEC_HOST}:${destination} $file ";
+    my $cmd;
+    if ($SEC_HOST ne '') {
+        $cmd = "$scp $file ${DMZ_HOST}:${SEC_HOST}:${destination}";
+    }
+    else {
+        $cmd = "$scp $file ${DMZ_HOST}:${destination}";
+    }
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -170,5 +190,11 @@
 sub ssh_exec_command {
     my $cmd = shift;
-    $cmd = "$ssh -n $DMZ_HOST ssh  ${SEC_HOST} $cmd";
+    if ($SEC_HOST ne '') {
+        $cmd = "$ssh -n $DMZ_HOST ssh  ${SEC_HOST} $cmd";
+    }
+    else {
+        $cmd = "$ssh -n $DMZ_HOST $cmd";
+    }
+
     print "EXEC: $cmd\n";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
Index: /tags/ipp-20150115/ippScripts/scripts/sc_remote_poll.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_remote_poll.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_remote_poll.pl	(revision 37914)
@@ -29,10 +29,15 @@
 # Hard coded values
 my $DMZ_HOST = 'wtrw';
+$DMZ_HOST = '128.171.123.18';
 my @SEC_HOSTS= ('mu-fe1','mu-fe2','mu-fe3'
-		# ,'mu-fe4'
+		,'mu-fe4'
     );
 my $SEC_HOST = $SEC_HOSTS[int(rand(@SEC_HOSTS))]; # 'mu-fe';
+$SEC_HOST = '';
 my $IPP_PATH = '/turquoise/usr/projects/cosmo/mswarren/ipp/';
+$IPP_PATH = '/home/watersc/src/';
 my $remote_root  = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
+
 
 # tools
@@ -351,5 +356,11 @@
     my $file = shift;
     my $destination = shift;
-    my $cmd = "$scp $file ${DMZ_HOST}:${SEC_HOST}:${destination}";
+    my $cmd;
+    if ($SEC_HOST ne '') {
+	$cmd = "$scp $file ${DMZ_HOST}:${SEC_HOST}:${destination}";
+    }
+    else {
+	$cmd = "$scp $file ${DMZ_HOST}:${destination}";
+    }
 
     my $directory = dirname($destination);
@@ -368,6 +379,11 @@
     my $file = shift;
 
-    my $cmd = "$scp ${DMZ_HOST}:${SEC_HOST}:${destination} $file ";
-
+    my $cmd;
+    if ($SEC_HOST ne '') {
+	$cmd = "$scp ${DMZ_HOST}:${SEC_HOST}:${destination} $file ";
+    }
+    else {
+	$cmd = "$scp ${DMZ_HOST}:${destination} $file ";
+    }
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $cmd, verbose => $verbose);
@@ -380,5 +396,10 @@
 sub ssh_exec_command {
     my $cmd = shift;
-    $cmd = "$ssh -n $DMZ_HOST ssh  ${SEC_HOST} $cmd";
+    if ($SEC_HOST ne '') {
+	$cmd = "$ssh -n $DMZ_HOST ssh  ${SEC_HOST} $cmd";
+    }
+    else {
+	$cmd = "$ssh -n $DMZ_HOST $cmd";
+    }
     print "EXEC: $cmd\n";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
Index: /tags/ipp-20150115/ippScripts/scripts/sc_transfer_tool.pl
===================================================================
--- /tags/ipp-20150115/ippScripts/scripts/sc_transfer_tool.pl	(revision 37913)
+++ /tags/ipp-20150115/ippScripts/scripts/sc_transfer_tool.pl	(revision 37914)
@@ -11,8 +11,11 @@
 
 my $scp_cmd = "/usr/projects/cosmo/amd6100/bin/scp";
+$scp_cmd = '/usr/bin/scp';
 my $ssh_cmd = "/usr/projects/cosmo/amd6100/bin/ssh";
+$ssh_cmd = '/usr/bin/ssh';
 
 my $remote_root = '/lustre/scratch1/turquoise/watersc1/ps1/';
-   $remote_root = '/scratch3/watersc1/';
+#   $remote_root = '/scratch3/watersc1/';
+$remote_root = '/lus/scratch/watersc/';
 
 #my $local_raw = "${remote_root}/tmp/";