Changeset 35550

Timestamp:

May 9, 2013, 11:30:54 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419

Files:

• dbconfig/cam.md (modified) (1 prop)
• dbconfig/changes.txt (modified) (2 diffs, 1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/ipp_cleanup.pl (modified) (3 diffs)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/publish_file.pl (modified) (1 diff, 1 prop)
• ippScripts/scripts/warp_skycell.pl (modified) (1 diff, 1 prop)
• ippScripts/scripts/whichimage (modified) (2 diffs)

branches/eam_branches/ipp-20130419/dbconfig/changes.txt

@@ -2400 +2400 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
-UPDATE dbversion set schema_version = '1.1.75', updated= CURRENT_TIMESTAMP();
-
-
 -- new Postage Stamp Request columns
 -- Note: These do not aply to the gpc1 database because the pstamp tables were
@@ -2412 +2409 @@
 -- default to the gpc1 project
 UPDATE pstampRequest SET proj_id = 1;
+
+-- unique keys for the release tables
+
+alter table relStack  add unique key (rel_id, tess_id, skycell_id, filter, stack_type, mjd_obs)
+alter table relExp add UNIQUE KEY(rel_id, exp_id);
+alter table ippRelease add unique key (surveyID, release_name);
+
+UPDATE dbversion set schema_version = '1.1.75', updated= CURRENT_TIMESTAMP();

branches/eam_branches/ipp-20130419/ippScripts/scripts/ipp_cleanup.pl

@@ -20 +20 @@
 my ($stage, $camera, $stage_id, $mode, $path_base, $dbname, $verbose, $no_op, $helplist, $logfile, $check_all);
 my $very_verbose = 0;
+
+# turn this on to set data_state to error_state for components for which cleanup fails
+# Note: we no longer do this, we leave the state alone.
+my $set_error_state_for_file = 0;
+
+# turn this on the set the state to error_state when errors occur cleaning up individual components
+# We may stop doing this
+my $set_error_state_for_run = 1;
 
 # this gets set to 1 the first time we set the corresponding destreak run to be cleaned
@@ -335 +343 @@
             $num_errors++;
 
-            # if an error happens for one chip, the chipRun will stay in goto_*, but the chips will go to error_* (matching the goto_*)
-            my $command = "$chiptool -updateprocessedimfile -chip_id $stage_id -class_id $class_id -set_state $error_state";
-            $command .= " -dbname $dbname" if defined $dbname;
-
-            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            if ($set_error_state_for_file) {
+                # if an error happens for one chip, the chipRun will stay in goto_*, but the chips will go to error_* (matching the goto_*)
+                my $command = "$chiptool -updateprocessedimfile -chip_id $stage_id -class_id $class_id -set_state $error_state";
+                $command .= " -dbname $dbname" if defined $dbname;
+
+                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                        run(command => $command, verbose => $verbose);
+                unless ($success) {
+                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                    &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
+                }
+            }
+
+            if ($set_error_state_for_run) {
+                # We want to flag the run as well, to avoid attempting to reprocess the same data over and over again.
+                $command = "$chiptool -chip_id $stage_id -updaterun -set_state $error_state";
+                $command .= " -dbname $dbname" if defined $dbname;
+
+                ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                     run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
-            }
-
-            # We want to flag the run as well, to avoid attempting to reprocess the same data over and over again.
-            $command = "$chiptool -chip_id $stage_id -updaterun -set_state $error_state";
-            $command .= " -dbname $dbname" if defined $dbname;
-
-            ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
-            }
-
-        }
-    }
-    if ($num_updated eq 0 and $num_errors eq 0) {
-        # no chips were updated by this procedssing so set state to $done_state
+                unless ($success) {
+                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                    &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
+                }
+
+            }
+        }
+    }
+    # We no longer depend on chiptool to promote the run from goto_cleaned to cleaned based on all of
+    # the imfiles being in the cleaned state.
+    # Due to missing files we don't always clean individual components.
+    # unless there was an error set state to $done_state
+    if (!$set_error_state_for_run or $num_errors eq 0) {
+        # set state to $done_state
         my $command = "$chiptool -chip_id $stage_id -updaterun -set_state $done_state";
         $command .= " -dbname $dbname" if defined $dbname;
@@ -625 +641 @@
          } else {
             $num_errors++;
-            my $command = "$warptool -updateskyfile -warp_id $stage_id -skycell_id $skycell_id -set_state $error_state";
-            $command .= " -dbname $dbname" if defined $dbname;
-
-            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
-            }
-
-            # We want to flag the run as well, to avoid attempting to reprocess the same data over and over again.
-            $command = "$warptool -warp_id $stage_id -updaterun -set_state $error_state";
-            $command .= " -dbname $dbname" if defined $dbname;
-
-            ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
-            }
-        }
-    }
-    if ($num_updated eq 0 and $num_errors eq 0) {
-        # no skycells were updated by this procedssing so set state to $done_state
+            if ($set_error_state_for_file) {
+                my $command = "$warptool -updateskyfile -warp_id $stage_id -skycell_id $skycell_id -set_state $error_state";
+                $command .= " -dbname $dbname" if defined $dbname;
+
+                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                    run(command => $command, verbose => $verbose);
+                unless ($success) {
+                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                    &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+                }
+            }
+
+            if ($set_error_state_for_run) {
+                # We want to flag the run as well, to avoid attempting to reprocess the same data over and over again.
+                $command = "$warptool -warp_id $stage_id -updaterun -set_state $error_state";
+                $command .= " -dbname $dbname" if defined $dbname;
+
+                ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                    run(command => $command, verbose => $verbose);
+                unless ($success) {
+                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                    &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+                }
+            }
+        }
+    }
+    if (!$set_error_state_for_run or $num_errors eq 0) {
+        # Set run to done state
         my $command = "$warptool -warp_id $stage_id -updaterun -set_state $done_state";
         $command .= " -dbname $dbname" if defined $dbname;

branches/eam_branches/ipp-20130419/ippScripts/scripts/publish_file.pl

@@ -328 +328 @@
 
 unless ($no_update) {
-    my $command = "$dsreg --add pub.$pub_id.$stage.$stage_id --copy --abspath --product $product --type $dsType --list $dsFileName";
+    my $command = "$dsreg --add pub.$pub_id.$stage.$stage_id --link --abspath --product $product --type $dsType --list $dsFileName";
     $command .= " --ps0 \"$comment\"" if defined $comment;
     $command .= " --ps1 \"$exp_name_1\"" if defined $exp_name_1;

branches/eam_branches/ipp-20130419/ippScripts/scripts/warp_skycell.pl

@@ -158 +158 @@
     $dynamicMasks = metadataLookupBool($recipeData, 'REFSTAR_MASK');
 }
-
+print "Dynamic Mask Status: $dynamicMasks\n";
 
 my $outputImage = prepare_output ("PSWARP.OUTPUT", $outroot, $skycell_id, 1);

branches/eam_branches/ipp-20130419/ippScripts/scripts/whichimage

@@ -94 +94 @@
 my $cmd = "dvoImagesAtCoords -chipcoords $coord_file";
 $cmd .= " -listchipcoords" if $listchipcoords;
+
+$tess_id = uc($tess_id) if $tess_id;
 
 my $status = 0;
@@ -125 +127 @@
             # next if $tess_name eq 'FIXNS';
             # next if $tess_name eq 'ALLSKY';
+            next if $tess_name eq 'RINGS.V0';
             push @tess_ids_to_check, $tess_name;
         }