Changeset 32792

Timestamp:

Nov 23, 2011, 2:26:50 PM (15 years ago)

Author:

bills

Message:

fix some issues with videophot processsing

Location:

tags/ipp-20111110

Files:

• ippScripts/scripts/videophot_process.pl (modified) (3 diffs, 1 prop)
• psvideophot/src (modified) (2 props)
• psvideophot/src/psvideoLoop.c (modified) (1 diff)

tags/ipp-20111110/ippScripts/scripts/videophot_process.pl

@@ -32 +32 @@
 my $listvideocells = can_run('listvideocells.pl') or (warn "Can't find listvideocells.pl" and $missing_tools = 1);
 my $dsreg = can_run('dsreg') or (warn "Can't find dsreg" and $missing_tools = 1);
+my $nebrepair = can_run('neb-repair') or (warn "Can't find neb-repair" and $missing_tools = 1);
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -116 +117 @@
         run(command => $command, verbose => $verbose);
     unless ($success) {
+        check_input_file($uri, $vp_id, $class_id, 'nocell');
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
         &my_die("Unable to perform $command: $error_code", $vp_id, $error_code);
@@ -244 +246 @@
 exit 0;
 
+sub check_input_file {
+    my $uri = shift;
+    my $vp_id = shift;
+    my $class_id = shift;
+    my $cell_id = shift;
+    my $resolved = $ipprc->file_resolve($uri);
+
+    my $tryrepair = 0;
+    if (!-e $resolved) {
+        printf STDERR "instance $resolved for $uri does not exist\n";
+        $tryrepair = 1;
+    } elsif (-s $resolved == 0) {
+        printf STDERR "instance $resolved for $uri is empty\n";
+        $tryrepair = 1;
+    }
+    if ($tryrepair) {
+        my $scheme = file_scheme($uri);
+        if ($scheme and ($scheme = 'neb')) {
+            my $command = "$nebrepair $uri";
+            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 $err_message = "Unable to perform nebrepair";
+                &my_die("$err_message: $error_code", $vp_id, $error_code);
+            }
+       }
+    }
+}
+
 sub my_die
 {

tags/ipp-20111110/psvideophot/src

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+

tags/ipp-20111110/psvideophot/src/psvideoLoop.c

@@ -234 +234 @@
                     Centering(readout->image, EDGE, &vpSum, xy, median);
 
-                    vpFlux = SubSum(readout->image, xy, median);
+                    if (isfinite(xy[0]) && isfinite(xy[1])) {
+                        vpFlux = SubSum(readout->image, xy, median);
+                    }
 
 //                    printf("%4d %9.2f %9.2f %9.2f %.1f %.1f %9.2f\n",

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+