Changeset 34428

Timestamp:

Sep 11, 2012, 10:24:05 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/background_chip.pl (modified) (3 diffs)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/staticskytool_pendingskycalrun.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/isp/psastro.config (modified) (2 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

branches/eam_branches/ipp-20120905/ippScripts/scripts/background_chip.pl

@@ -73 +73 @@
 
 if ($redirect) {
-    $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $chip_bg_id, $class_id, $PS_EXIT_SYS_ERROR );
+    $ipprc->redirect_to_logfile($logDest) or my_die( "Unable to redirect output", $chip_bg_id, $class_id, $PS_EXIT_SYS_ERROR );
     print STDOUT "\n\n";
     print STDOUT "Starting script $0 on $host\n\n";
@@ -155 +155 @@
 
 $ipprc->outroot_prepare($outroot);
-my $out_image = $ipprc->filename("PPBACKGROUND.OUTPUT", $outroot, $class_id);
-my $out_mask = $ipprc->filename("PPBACKGROUND.OUTPUT.MASK", $outroot, $class_id);
-my $out_stats = $ipprc->filename("PPBACKGROUND.STATS", $outroot, $class_id);
-my $out_config = $ipprc->filename("PPBACKGROUND.CONFIG", $outroot, $class_id);
-my $traceDest = $ipprc->filename("TRACE.IMFILE", $outroot, $class_id);
+#my $out_image = $ipprc->filename("PPBACKGROUND.OUTPUT", $outroot, $class_id);
+#my $out_mask = $ipprc->filename("PPBACKGROUND.OUTPUT.MASK", $outroot, $class_id);
+#my $out_stats = $ipprc->filename("PPBACKGROUND.STATS", $outroot, $class_id);
+#my $out_config = $ipprc->filename("PPBACKGROUND.CONFIG", $outroot, $class_id);
+#my $traceDest = $ipprc->filename("TRACE.IMFILE", $outroot, $class_id);
+
+my $out_image = prepare_output("PPBACKGROUND.OUTPUT", $outroot, $class_id, 1);
+my $out_mask = prepare_output("PPBACKGROUND.OUTPUT.MASK", $outroot, $class_id, 1);
+my $out_stats = prepare_output("PPBACKGROUND.STATS", $outroot, $class_id, 1);
+my $out_config = prepare_output("PPBACKGROUND.CONFIG", $outroot, $class_id, 1);
+my $traceDest = prepare_output("TRACE.IMFILE", $outroot, $class_id, 1);
 
 # Run ppImage
@@ -238 +244 @@
 ### Pau.
 
+# Prepare to write to an output file
+#   Lookup the filename in the rules.
+#   Make sure that if file exists and is a nebulous file that there is only one instance
+#   Deal with files that have been lost.
+sub prepare_output
+{
+    my $filerule = shift;
+    my $outroot  = shift;
+    my $class_id = shift;
+    my $delete = shift;
+    $delete = 0 if !defined $delete;
+
+    my $error;
+    my $output = $ipprc->prepare_output($filerule, $outroot, $class_id, $delete, \$error)
+                    or &my_die("failed to prepare output file for: $filerule", $chip_bg_id, $class_id, $error);
+    return $output;
+}
+
+
 
 sub my_die

branches/eam_branches/ipp-20120905/ippTools/share/staticskytool_pendingskycalrun.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     skycalRun.*,
     stackRun.tess_id,

branches/eam_branches/ipp-20120905/ippconfig/isp/psastro.config

@@ -56 +56 @@
 # single-chip radius match in pixels
 PSASTRO.MATCH.RADIUS   F32    15
-PSASTRO.MATCH.RADIUS.N0 F32   15
-PSASTRO.MATCH.RADIUS.N1 F32   10
-PSASTRO.MATCH.RADIUS.N2 F32   15
-PSASTRO.MATCH.RADIUS.N3 F32   0
-PSASTRO.MATCH.RADIUS.N4 F32   0
-PSASTRO.MATCH.RADIUS.N5 F32   0
+PSASTRO.MATCH.RADIUS.N0 F32   30
+PSASTRO.MATCH.RADIUS.N1 F32   15
+PSASTRO.MATCH.RADIUS.N2 F32   10
+PSASTRO.MATCH.RADIUS.N3 F32   6
+PSASTRO.MATCH.RADIUS.N4 F32   3
+PSASTRO.MATCH.RADIUS.N5 F32   3
 PSASTRO.MATCH.RADIUS.N6 F32   0
 PSASTRO.MATCH.RADIUS.N7 F32   0
-PSASTRO.MATCH.FIT.NITER S32   1
+PSASTRO.MATCH.FIT.NITER S32   5
 
 # pmAstromMatchFit
@@ -70 +70 @@
 PSASTRO.CHIP.NITER     S32      3  # fit clipping iterations
 PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+
+
+
+
 
 PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels

branches/eam_branches/ipp-20120905/psModules/src/objects

@@ -10 +10 @@
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c

@@ -10 +10 @@
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c

@@ -10 +10 @@
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c