Changeset 38225 for trunk/ippScripts

Timestamp:

May 4, 2015, 5:52:38 PM (11 years ago)

Author:

watersc1

Message:

Changes to be more device agnostic. Require dbname and camera be supplied on command line, and sort and determine a unique set of filters (to work around ppConfigDump MULTI merge bug).

File:

• trunk/ippScripts/scripts/nightly_science.pl (modified) (5 diffs)

trunk/ippScripts/scripts/nightly_science.pl

@@ -122 +122 @@
     defined $test_mode or defined $clean_old or defined $check_mode or
     defined $confirm_stacks or defined $burntool_status;
+pod2usage(
+          -msg => "Explicitly choose --dbname and --camera",
+    -exitval => 3,
+    ) unless (defined($camera) and defined($dbname));
 
 # Configurable parameters from our config file.
@@ -132 +136 @@
 my @unrecoverable_quality = ();
 my @filter_list = ();
+my %unique_filter_hash = ();
 
 # Grab the configuration data.
-my $conf_cmd = "$ppConfigDump -dump-recipe NIGHTLY_SCIENCE -";
+my $conf_cmd = "$ppConfigDump -camera $camera -dump-recipe NIGHTLY_SCIENCE -";
 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     run(command => $conf_cmd, verbose => $verbose);
@@ -161 +166 @@
     }
     elsif (${ $entry }{name} eq 'FILTERS') {
-        push @filter_list, ${ $entry }{value};
+        $unique_filter_hash{ ${ $entry }{value} } = 1;
+#        push @filter_list, ${ $entry }{value};
     }
     elsif (${ $entry }{name} eq 'UNRECOVERABLE_QUALITY') {
@@ -216 +222 @@
     }
 }
+@filter_list = sort(keys(%unique_filter_hash));
 
 if (defined($date)) {
@@ -246 +253 @@
     $datetime = DateTime->now(time_zone => 'UTC'); # time_zone   => 'Pacific/Honolulu');
     $date = $datetime->ymd();
-}
-unless(defined($camera)) {
-    $camera = 'GPC1';
-}
-unless(defined($dbname)) {
-    $dbname = 'gpc1';
 }