Changeset 26835

Timestamp:

Feb 9, 2010, 6:38:12 PM (16 years ago)

Author:

eugene

Message:

fix magic_process.pl to correctly run VerifyStreaks; updates to ippconfig for MAGIC output files

Location:

branches/eam_branches/20091201

Files:

• ippScripts/scripts/magic_process.pl (modified) (3 diffs)
• ippconfig/recipes/filerules-mef.mdc (modified) (1 diff)
• ippconfig/recipes/filerules-simple.mdc (modified) (1 diff)
• ippconfig/recipes/filerules-split.mdc (modified) (1 diff)

branches/eam_branches/20091201/ippScripts/scripts/magic_process.pl

@@ -290 +290 @@
     my $baseroot = shift;
 
-    unless ($VerifyStreaks) { 
-        print STDERR "skipping VerifyStreaks\n";
-        return 1;
+    unless ($VerifyStreaks) {
+        print STDERR "skipping VerifyStreaks\n";
+        return 1;
     }
 
@@ -300 +300 @@
 
     my($status) = system ("mkdir -p $outdir");
-    if ($status) { 
-        print STDERR "failed to create output directory $outdir\n"; 
-        return 1;
-    }
+    if ($status) {
+        print STDERR "failed to create output directory $outdir\n";
+        return 1;
+    }
+
+    my $FILE;
 
     my @files = <$baseroot.*.clusters>;
-    unless (OPEN (FILE, ">$outdir/clusters.list")) {
-        print "failed to create cluster file $outdir/clusters.list\n"; 
-        return 1;
+
+    unless (open ($FILE, ">$outdir/clusters.list")) {
+        print "failed to create cluster file $outdir/clusters.list\n";
+        return 1;
     }
     foreach my $file (@files) {
-        print FILE "$file\n";
-    }
-    close (FILE);
-    if ($status) { 
-        print "failed to create cluster file $outdir/clusters.list\n"; 
-        return 1;
+        $file =~ s|.clusters$||;
+        print $FILE "$file\n";
+    }
+    close ($FILE);
+    if ($status) {
+        print "failed to create cluster file $outdir/clusters.list\n";
+        return 1;
     }
 
@@ -322 +326 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        print "failed to run VerifyStreaks:\n stderr: $stderr_buff\n stdout: $stdout_buff"; 
-        return 1;
+        print "failed to run VerifyStreaks:\n";
+        return 1;
     }
 

branches/eam_branches/20091201/ippconfig/recipes/filerules-mef.mdc

@@ -302 +302 @@
 CENSOR.OUTPUT           OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
 
+MAGIC.ORIGINAL.PNG      OUTPUT {OUTPUT}_original.png             JPEG      NONE       FPA        TRUE      NONE
+MAGIC.RESIDUAL.PNG      OUTPUT {OUTPUT}_residual.png             JPEG      NONE       FPA        TRUE      NONE
+MAGIC.MASK.PNG          OUTPUT {OUTPUT}_mask.png                 JPEG      NONE       FPA        TRUE      NONE
+MAGIC.DUPLICATE.PNG     OUTPUT {OUTPUT}_duplicate.png            JPEG      NONE       FPA        TRUE      NONE
+
 PPSMOOTH.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits        IMAGE     NONE       CHIP       TRUE      MEF
 PPSMOOTH.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits     MASK      NONE       CHIP       TRUE      MEF

branches/eam_branches/20091201/ippconfig/recipes/filerules-simple.mdc

@@ -250 +250 @@
 CENSOR.OUTPUT           OUTPUT {OUTPUT}.smf          CMF       NONE       FPA        TRUE      MEF
 
+MAGIC.ORIGINAL.PNG      OUTPUT {OUTPUT}_original.png             JPEG      NONE       FPA        TRUE      NONE
+MAGIC.RESIDUAL.PNG      OUTPUT {OUTPUT}_residual.png             JPEG      NONE       FPA        TRUE      NONE
+MAGIC.MASK.PNG          OUTPUT {OUTPUT}_mask.png                 JPEG      NONE       FPA        TRUE      NONE
+MAGIC.DUPLICATE.PNG     OUTPUT {OUTPUT}_duplicate.png            JPEG      NONE       FPA        TRUE      NONE
+
 PPSMOOTH.OUTPUT          OUTPUT {OUTPUT}.fits        IMAGE     NONE       FPA        TRUE      SIMPLE
 PPSMOOTH.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits     MASK      NONE       FPA        TRUE      SIMPLE

branches/eam_branches/20091201/ippconfig/recipes/filerules-split.mdc

@@ -269 +269 @@
 CENSOR.OUTPUT           OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
 
+MAGIC.ORIGINAL.PNG      OUTPUT {OUTPUT}_original.png             JPEG      NONE       FPA        TRUE      NONE
+MAGIC.RESIDUAL.PNG      OUTPUT {OUTPUT}_residual.png             JPEG      NONE       FPA        TRUE      NONE
+MAGIC.MASK.PNG          OUTPUT {OUTPUT}_mask.png                 JPEG      NONE       FPA        TRUE      NONE
+MAGIC.DUPLICATE.PNG     OUTPUT {OUTPUT}_duplicate.png            JPEG      NONE       FPA        TRUE      NONE
+
 PPSMOOTH.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits        IMAGE     NONE       CHIP       TRUE      MEF
 PPSMOOTH.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits     MASK      NONE       CHIP       TRUE      MEF