Changeset 34780

Timestamp:

Dec 7, 2012, 4:21:32 PM (14 years ago)

Author:

watersc1

Message:

It looks like everything is workign as designed. Next to automate via the task.

Location:

branches/czw_branch/20120906

Files:

• ippScripts/scripts/regenerate_background.pl (modified) (5 diffs)
• ippTools/share/stacktool_inputskyfile.sql (modified) (1 diff)
• ippTools/src/stacktool.c (modified) (1 diff)

branches/czw_branch/20120906/ippScripts/scripts/regenerate_background.pl

@@ -110 +110 @@
         my $skycell_id = $imfile->{skycell_id};
         my $path_base  = $imfile->{path_base};
-        my $tess_id    = $imfile->{path_base};
+        my $tess_id    = $imfile->{tess_id};
 
         # Parse the results to determine if there are any problems that prevent this from
@@ -220 +220 @@
     my $ppStackMedian = can_run('ppStackMedian') or
         &my_die("Can't find ppStackMedian",$stage,$stage_id,$PS_EXIT_UNKNOWN_ERROR);
-    
+
+    # Get the information about this run
+    my $st_command = "$stacktool -sumskyfile -stack_id $stack_id";
+    $st_command   .= " -dbname $dbname " if defined $dbname;
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $st_command, verbose => $verbose);
+    unless($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform stacktool -sumskyfile",$stage,$stage_id,$error_code);
+    }
+    if (@$stdout_buf == 0) {
+        # Nothing to do;
+    }
+    my $in_md = $mdcParser->parse(join "", @$stdout_buf) or
+        &my_die("Unable to parse metadata config doc", $stage, $stage_id, $PS_EXIT_PROG_ERROR);
+    my $stacks  = parse_md_list($in_md) or
+        &my_die("Unable to parse metadata", $stage, $stage_id, $PS_EXIT_PROG_ERROR);
+    my $stack = shift(@$stacks);
+    my $path_base = $stack->{path_base};
 
     # Get inputs
@@ -226 +244 @@
     my $command = "$stacktool -inputskyfile -stack_id $stack_id";
     $command .= " -dbname $dbname " if defined $dbname;
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
     unless($success) {
@@ -235 +253 @@
         # Nothing to do;
     }
-    my $in_md = $mdcParser->parse_list(join "", @$stdout_buf) or
+    $in_md = $mdcParser->parse(join "", @$stdout_buf) or
         &my_die("Unable to parse metadata config doc", $stage, $stage_id, $PS_EXIT_PROG_ERROR);
     $imfiles  = parse_md_list($in_md) or
         &my_die("Unable to parse metadata", $stage, $stage_id, $PS_EXIT_PROG_ERROR);
-    
+
     my $num = 0;
-    my $path_base = '/tmp/x';
-    my $expTime   = 60;
-
+    my $expTime;
     my ($inputMDC_file, $inputMDC_name) = tempfile("/tmp/bkgreg.stack.mdc.${stage_id}.XXXX",
                                                    UNLINK => !$save_temps);
@@ -260 +276 @@
         print $inputMDC_file "END\n\n";
         $num++;
+
+        $expTime = $imfile->{exp_time}; # I need something here.
     }
     close($inputMDC_file);
 
-    my $bkgOut_log = prepare_output("LOG.IMFILE",$path_base . "BKG_REG",$skycell_id,1);    
-
-    my $ppStack_command = "$ppStackMedian -input $inputMDC_name $path_base ";
+    my $bkgOut_log = prepare_output("LOG.EXP",$path_base . ".BKG_REG",1);    
+
+    my $ppStack_command = "$ppStackMedian -input $inputMDC_name ${path_base}.mdl ";
     $ppStack_command   .= " -recipe PPSTACK STACK -recipe PPSUB STACK -recipe PSPHOT STACK ";
     $ppStack_command   .= " -recipe PPSTATS STACKSTATS -stack-type DEEP_STACK ";
-    $ppStack_command   .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE ";
-    $ppStack_command   .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF -F PSPHOT.BACKMDL PSPHOT.BACKMDL.MEF ";
-    $ppStack_command   .= " -F SOURCE.PLOT.MOMENTS SOURCE.PLOT.SKY.MOMENTS ";
-    $ppStack_command   .= " -F SOURCE.PLOT.PSFMODEL SOURCE.PLOT.SKY.PSFMODEL ";
-    $ppStack_command   .= " -F SOURCE.PLOT.APRESID SOURCE.PLOT.SKY.APRESID ";
+#    $ppStack_command   .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE ";
+#    $ppStack_command   .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF -F PSPHOT.BACKMDL PSPHOT.BACKMDL.MEF ";
+#    $ppStack_command   .= " -F SOURCE.PLOT.MOMENTS SOURCE.PLOT.SKY.MOMENTS ";
+#    $ppStack_command   .= " -F SOURCE.PLOT.PSFMODEL SOURCE.PLOT.SKY.PSFMODEL ";
+#    $ppStack_command   .= " -F SOURCE.PLOT.APRESID SOURCE.PLOT.SKY.APRESID ";
     $ppStack_command   .= " -Db PHOTOMETRY F -Db VARIANCE F -Db CONVOLVE F ";
     $ppStack_command   .= " -Df DEFAULT.EXPTIME $expTime ";
     $ppStack_command   .= " -threads 1 -log $bkgOut_log ";
     $ppStack_command   .= " -dbname $dbname " if defined $dbname;
+
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $ppStack_command, verbose => $verbose);
+    unless($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform ppStackMedian",$stage,$stage_id,$error_code);
+    }
+
+    my $update_command = "$stacktool ";
+    $update_command .= " -updatesumskyfile -stack_id $stack_id ";
+    $update_command .= " -set_background_model 1 -fault 0 ";
+    $update_command .= " -dbname $dbname " if defined $dbname;
+    
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
+        run(command => $update_command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8)  or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform stacktool: $error_code", $stage, $stage_id, $error_code);
+    }
+    
+
 
 }

branches/czw_branch/20120906/ippTools/share/stacktool_inputskyfile.sql

@@ -4 +4 @@
     rawExp.exp_id,
     rawExp.exp_name,
+    rawExp.exp_time,
     rawExp.object,
     rawExp.dateobs,

branches/czw_branch/20120906/ippTools/src/stacktool.c

@@ -1766 +1766 @@
       psMetadata *values = psMetadataAlloc();
       PXOPT_COPY_S16(config->args, values, "-set_background_model", "background_model", "==");
-      long rows = psDBUpdateRows(config->dbh,"warpSkyfile", where, values);
+      long rows = psDBUpdateRows(config->dbh,"stackSumSkyfile", where, values);
       psFree(values);
       if (!rows) {