Changeset 28211 for trunk/ippScripts/scripts

Timestamp:

Jun 3, 2010, 7:11:23 PM (16 years ago)

Author:

heather

Message:

minidvodb tested. trying itout on MD05, 04 and 07 now.

Location:

trunk/ippScripts/scripts

Files:

• addstar_run.pl (modified) (4 diffs)
• minidvodb_merge.pl (modified) (8 diffs)

trunk/ippScripts/scripts/addstar_run.pl

@@ -48 +48 @@
     'reduction=s'       => \$reduction, # Reduction class
     'dvodb|w=s'         => \$dvodb,  # output DVO database
-    'minidvodb'         => \$minidvodb,  # use minidvodb?
     'minidvodb_name|w=s'=> \$minidvodb_name,  # miniDVO database name
     'minidvodb_group|w=s' => \$minidvodb_group, # miniDVO database group
+    'minidvodb'         => \$minidvodb,  # use minidvodb?
     'image-only'        => \$image_only,   # Print to stdout
     'verbose'           => \$verbose,   # Print to stdout
@@ -104 +104 @@
 if (defined $dvodb) {
     $dvodbReal = $ipprc->dvo_catdir( $dvodb ); # catdir for DVO
-    $dvodbReal = $ipprc->convert_filename_absolute( $dvodbReal );
-}
+    $dvodbReal = $ipprc->convert_filename_absolute( $dvodbReal ) or &my_die("can't get path for dvodb", $add_id, $PS_EXIT_CONFIG_ERROR);
+}
+
+
+
 
 my $dtime_addstar = 0;
@@ -179 +182 @@
 $fpaCommand .= " -path_base $outroot";
 $fpaCommand .= " -dtime_addstar $dtime_addstar";
-$fpaCommand .= " -dvodb_path $dvodbReal";
+$fpaCommand .= " -dvodb_path $dvodbReal" if defined $dvodbReal;
+$fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
 $fpaCommand .= " -dbname $dbname" if defined $dbname;
 print $fpaCommand;
@@ -212 +216 @@
         $command .= " -path_base $outroot" if defined $outroot;
         $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400));
+        $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
         $command .= " -dbname $dbname" if defined $dbname;
         system ($command);

trunk/ippScripts/scripts/minidvodb_merge.pl

@@ -4 +4 @@
 use strict;
 use Carp;
-
+ 
 ## report the program and machine
 use Sys::Hostname;
@@ -90 +90 @@
             my $command  = "$addstar -resort";
             $command .= " -D CAMERA $camera";
-            $command .= " -D CATDIR $mergedvodbReal";
+            $command .= " -D CATDIR $minidvodb";
 
             my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
-
+            print "\n$command\n";
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                 run(command => $command, verbose => $verbose);
@@ -102 +102 @@
             $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);  $dtime_resort = $dtime_addstar;
             # MJD of starting script
+            $dtime_resort = $dtime_addstar;
             print "addstar -resort time $dtime_addstar\n";
         }
@@ -110 +111 @@
             my $command  = "$relphot -averages -update";
             $command .= " -D CAMERA $relphot_camera";
-            $command .= " -D CATDIR $mergedvodbReal";
-
+            $command .= " -D CATDIR $minidvodb";
+            print "$command\n";
             my $mjd_relphot_start = DateTime->now->mjd;   # MJD of starting script
 
@@ -129 +130 @@
             my $mdcParser = PS::IPP::Metadata::Config->new;
 
-            my $command = "$addtool -listminidvodbrun -state mergedsdfsad -minidvodb_group " . $minidvodb_group;
+            my $command = "$addtool -listminidvodbrun -state merged -minidvodb_group " . $minidvodb_group;
             $command .= " -dbname $dbname" if defined $dbname;
 
@@ -152 +153 @@
             }
         }
+        {
+            if (!-e "$mergedvodb/Image.dat") {
+                $this_is_the_first = 1; #the first time it copied maybe it failed? we want it to copy this time
+        
+            }
+
+        }
 
         {
             my $merge_command;
+            my $mjd_merge_start = DateTime->now->mjd;   # MJD of starting script
             if ($this_is_the_first) {
-                $merge_command = "cp -rp $minidvodb $mergedvodb"
-            } else {
-                $merge_command = "$dvomerge $minidvodb into $mergedvodb"
-            }
-
-            my $mjd_merge_start = DateTime->now->mjd;   # MJD of starting script
-
-            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $merge_command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to merge: $error_code", $mergedvodb, $error_code);
-            }
-
-            $dtime_merge = 86400.0*(DateTime->now->mjd - $mjd_merge_start);   # MJD of starting script
-            print "merge time $dtime_merge\n";
-        }
-
-
-        {
+                $merge_command = "cp -rp $minidvodb/* $mergedvodb";
+                print "$merge_command\n";
+            } else {
+                $merge_command = "$dvomerge $minidvodb into $mergedvodb";
+            }
+            
+            print "\n$merge_command\n";
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $merge_command, verbose => $verbose);
+            unless ($success) {
+                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                    &my_die("Unable to merge: $error_code", $mergedvodb, $error_code);
+            }
+                
+            $dtime_merge = 86400.0*(DateTime->now->mjd - $mjd_merge_start);   # MJD of starting script
+            print "merge time $dtime_merge\n";
+#       }
+        }
+
+        {
             my $command = "addtool -minidvodb_id $minidvodb_id";
             $command .= " -addminidvodbprocessed";
@@ -181 +190 @@
             $command .= " -minidvodb_group $minidvodb_group";
             $command .= " -dtime_relphot $dtime_relphot"  if defined $dtime_relphot;
-            $command .= " -dtime_relphot $dtime_resort" if defined $dtime_resort;
-            $command .= " -dtime_relphot $dtime_merge" if defined $dtime_merge;
+            $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
+            $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
             $command .= " -dbname $dbname" if defined $dbname;
             #print $command;
@@ -220 +229 @@
         $command .= " -minidvodb_group $minidvodb_group";
         $command .= " -dtime_relphot $dtime_relphot" if defined $dtime_relphot;
-        $command .= " -dtime_relphot $dtime_resort" if defined $dtime_resort;
-        $command .= " -dtime_relphot $dtime_merge" if defined $dtime_merge;
+        $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
+        $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
         $command .= " -dbname $dbname" if defined $dbname;