Changeset 28334 for branches/czw_branch/20100519/ippScripts/scripts

Timestamp:

Jun 15, 2010, 11:22:56 AM (16 years ago)

Author:

watersc1

Message:

association and jpegs look fine. random simtest errors are a bit worrying, though.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ippScripts/scripts/addstar_run.pl (modified) (5 diffs)
• ippScripts/scripts/minidvodb_createdb.pl (modified) (4 diffs)
• ippScripts/scripts/skycell_jpeg.pl (modified) (2 diffs)

branches/czw_branch/20100519/ippScripts/scripts/addstar_run.pl

@@ -36 +36 @@
     exit($PS_EXIT_CONFIG_ERROR);
 }
-
+my $minidvodb_path;
 my ( $exp_tag, $add_id, $camera, $outroot, $camroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update,
      $no_op, $redirect, $save_temps);
@@ -132 +132 @@
                     &my_die("Unable to parse metadata list", $add_id, $PS_EXIT_PROG_ERROR);
                 my $comp = $$components[0];
+                $minidvodb_path = $comp->{minidvodb_path};
                 $minidvodb_name = $comp->{minidvodb_name};
         
+                if (!defined($minidvodb_path)) {
+                    &my_die("Unable to parse minidvodb_path", $add_id, $PS_EXIT_PROG_ERROR);
+                } 
                 if (!defined($minidvodb_name)) {
                     &my_die("Unable to parse minidvodb_name", $add_id, $PS_EXIT_PROG_ERROR);
-                } 
-                
+                }
             }
             # tack on the minidvodb part to the db.
-            $dvodbReal = $dvodbReal . '/' . $minidvodb_name . '/';
+#           $dvodbReal = $dvodbReal . '/' . $minidvodb_name . '/';
+#we don't need this now that I fixed the paths     
             
         }
@@ -160 +164 @@
         my $command  = "$addstar -update"; # XXX optionally set -update?
         $command .= " -D CAMERA $camdir";
-        $command .= " -D CATDIR $dvodbReal";
+        $command .= " -D CATDIR $minidvodb_path";
         $command .= " $realFile";
         $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
@@ -182 +186 @@
 $fpaCommand .= " -path_base $outroot";
 $fpaCommand .= " -dtime_addstar $dtime_addstar";
-$fpaCommand .= " -dvodb_path $dvodbReal" if defined $dvodbReal;
+$fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
 $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
 $fpaCommand .= " -dbname $dbname" if defined $dbname;
@@ -213 +217 @@
         $command .= " -addprocessedexp";
         $command .= " -fault $exit_code";
-        $command .= " -dvodb_path $dvodbReal" if defined $dvodbReal;
+        $command .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
         $command .= " -path_base $outroot" if defined $outroot;
         $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400));

branches/czw_branch/20100519/ippScripts/scripts/minidvodb_createdb.pl

@@ -39 +39 @@
 }
 
-my (  $outroot, $dbname, $dvodb,$minidvodb_interval, $minidvodb_group, $camera,  $verbose, $no_update,
+my (  $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_group, $camera,  $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(    
@@ -47 +47 @@
     'outroot|w=s'       => \$outroot, # output file base name
     'dvodb|w=s'         => \$dvodb,  # output DVO database
+    'minidvodb|w=s'     => \$minidvodb, # output miniDVODB
     'interval|w=s'      => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day)
     'verbose'           => \$verbose,   # Print to stdout
@@ -97 +98 @@
     exit(4);
 }
+my $minidvodbReal;
+if (defined $minidvodb) {
+    $minidvodbReal = $ipprc->dvo_catdir( $minidvodb ); # catdir for DVO
+    $minidvodbReal = $ipprc->convert_filename_absolute( $minidvodbReal );
+} else {
+    warn("minidvodb undefined:\n");
+    exit(4);
+}
+
 
 if (!defined $minidvodb_interval) {
@@ -215 +225 @@
     my $fpaCommand = "$addtool -addminidvodbrun";
     $fpaCommand .= " -set_minidvodb_group $minidvodb_group";
+    $fpaCommand .= " -set_minidvodb_path  $minidvodbReal" if defined $minidvodbReal;
     $fpaCommand .= " -set_mergedvodb_path $dvodbReal";
     $fpaCommand .= " -dbname $dbname" if defined $dbname;

branches/czw_branch/20100519/ippScripts/scripts/skycell_jpeg.pl

@@ -273 +273 @@
         my $path_base  = $imfile->{path_base};
         my $quality    = $imfile->{quality};
-        my $state      = $imfile->{data_state};
+        my $state      = $imfile->{state};
         my $fault      = $imfile->{fault};
         my $projection_cell = $skycell_id;
-        if ($quality == 8007 or $state ne 'full' or $fault != 0) {
+        if ($quality == 8007 or $state ne 'full') {
             next;
         }
@@ -333 +333 @@
     if (scalar (keys %tangents) == 0) {
         my $projection_cell = 'NULL';
-        $command = "$stacktool -addsummary -stack_id $stage_id -projection_cell $projection_cell -path_base $outroot";
-        if (defined($dbname)) {
-            $command .= " -dbname $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 update diff summary: $error_code", $stage_id, $error_code);
+        $command = "$stacktool -addsummary -sass_id $stage_id -projection_cell $projection_cell -path_base $outroot";
+        if (defined($dbname)) {
+            $command .= " -dbname $dbname";
+        }
+#       print "$command\n";
+        ( $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 update stack summary: $error_code", $stage_id, $error_code);
         }
     }