Changeset 36884 for branches/eam_branches/ipp-20140610/ippScripts/scripts

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

• . (modified) (1 prop)
• ippScripts/scripts/queuestaticsky.pl (modified) (1 prop)
• ippScripts/scripts/sc_prepare_camera.pl (modified) (1 diff)
• ippScripts/scripts/sc_prepare_chip.pl (modified) (1 diff)
• ippScripts/scripts/sc_prepare_stack.pl (copied) (copied from trunk/ippScripts/scripts/sc_prepare_stack.pl )
• ippScripts/scripts/sc_prepare_warp.pl (modified) (1 diff)

branches/eam_branches/ipp-20140610/ippScripts/scripts/sc_prepare_camera.pl

@@ -179 +179 @@
     $psastro_command   .= " -masklist ${remote_outroot}.masklist ${remote_outroot} ";
 #    $psastro_command   .= " -refmasklist ${remote_outroot}.masklist ${remote_outroot} "; # This is used to do edge calculations.  It should probably be smart enough to know that it can just use the masks I just specified, but it's not.
+    # Uncomment when remote psastro supports this
+    $psastro_command   .= " -kh-correct /turquoise/usr/projects/ps1/watersc1/references/khcorrect.20140606.v0.fits ";
     $psastro_command   .= " -refmasklist /turquoise/usr/projects/ps1/watersc1/references/gpc1.refmask.list ";
-    $psastro_command   .= " -astrommodel /turquoise/usr/projects/ps1/watersc1/references/gpc1.20080909.asm ";
+#    $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   .= " -recipe PSASTRO $recipe_psastro ";
     $psastro_command   .= " -tracedest ${remote_outroot}.trace -log ${remote_outroot}.log ";

branches/eam_branches/ipp-20140610/ippScripts/scripts/sc_prepare_chip.pl

@@ -315 +315 @@
         $ppImage_command .= " -recipe PSPHOT $recipe_psphot ";
         $ppImage_command .= " -recipe PPSTATS CHIPSTATS -stats ${remote_outroot}.${class_id}.stats ";
-        $ppImage_command .= " -threads $threads ";
+        $ppImage_command .= " -threads 4 ";
         $ppImage_command .= " -image_id $chip_imfile_id ";
         $ppImage_command .= " -tracedest ${remote_outroot}.${class_id}.trace ";

branches/eam_branches/ipp-20140610/ippScripts/scripts/sc_prepare_warp.pl

@@ -199 +199 @@
         $pswarp_command    .= " -recipe PSWARP $recipe_pswarp ";
         $pswarp_command    .= " -tracedest ${remote_outroot}.trace -log ${remote_outroot}.log ";
-        $pswarp_command    .= " -threads $threads "; # -image_id ${image_id} -source_id ${source_id} ";
+        $pswarp_command    .= " -threads 4 "; # -image_id ${image_id} -source_id ${source_id} ";
         $pswarp_command    .= " -recipe PPSTATS WARPSTATS ";
         $pswarp_command    .= " -dumpconfig ${remote_outroot}.mdc -stats ${remote_outroot}.stats ";