Changeset 19466

Timestamp:

Sep 10, 2008, 11:30:04 AM (18 years ago)

Author:

Paul Price

Message:

Command-line arguments got moved around.

File:

• trunk/ippScripts/scripts/camera_exp.pl (modified) (3 diffs)

trunk/ippScripts/scripts/camera_exp.pl

@@ -175 +175 @@
         $chipObjectsExist = 1;
     } else {
-        if ($verbose) { print "skipping $chipObjects (not found)\n"; }
-        next;
+        if ($verbose) { print "skipping $chipObjects (not found)\n"; }
+        next;
     }
 
@@ -278 +278 @@
         if (defined $dvodbReal) {
 
-            ## XXX the camera analysis can either save the full set of
-            ## detections, or just the image metadata, in the dvodb
-
-            ## get the addstar recipe for this camera and CAMERA reduction
-            $command = "$ppConfigDump -camera $camera -dump-recipe ADDSTAR -recipe ADDSTAR $recipe_addstar -";
-            ( $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 ppConfigDump: $error_code", $cam_id, $PS_EXIT_SYS_ERROR);
-            }
-            my $recipeData = $mdcParser->parse(join "", @$stdout_buf) or
-                &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_SYS_ERROR);
-
-            ## allow the dvodb to save only images, or the full detection set
-            my $imagesOnly = metadataLookupBool($recipeData, 'IMAGES.ONLY');
+            ## XXX the camera analysis can either save the full set of
+            ## detections, or just the image metadata, in the dvodb
+
+            ## get the addstar recipe for this camera and CAMERA reduction
+            $command = "$ppConfigDump -camera $camera -recipe ADDSTAR $recipe_addstar -dump-recipe ADDSTAR -";
+            ( $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 ppConfigDump: $error_code", $cam_id, $PS_EXIT_SYS_ERROR);
+            }
+            my $recipeData = $mdcParser->parse(join "", @$stdout_buf) or
+                &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_SYS_ERROR);
+
+            ## allow the dvodb to save only images, or the full detection set
+            my $imagesOnly = metadataLookupBool($recipeData, 'IMAGES.ONLY');
 
             # XXX this construct requires the user to have a valid .ptolemyrc
@@ -303 +303 @@
             my $command;
             $command  = "$addstar -D CAMERA $camdir -update";
-            $command .= " -image" if $imagesOnly;
+            $command .= " -image" if $imagesOnly;
             $command .= " -D CATDIR $dvodbReal";