Changeset 36

Timestamp:

Feb 14, 2003, 1:53:24 AM (23 years ago)

Author:

eugene

Message:

abstract ccd name / number

Location:

trunk/Ohana/src/perl/src

Files:

• mosaic.merge (modified) (2 diffs)
• mosaic.stats (modified) (4 diffs)

trunk/Ohana/src/perl/src/mosaic.merge

@@ -11 +11 @@
 # confusion on a second pass
 
-$answer = `cameraconfig -ccds`;
-@ccds = split (" ", $answer); 
+@ccds = split (" ", `cameraconfig -ccdn`);
+if ($?) { die "ERROR: configuration problem\n"; }
 
 if (@ARGV != 3) { die "ERROR: USAGE: mosaic.tenbin (name) (out) (type)\n" }
@@ -46 +46 @@
 
 @filenames = ();
-for ($i = 0; $i < @ccds; $i++) {
+foreach $ccd (@ccds) {
     $name = $ARGV[0];
-    $name =~ s/CCDNUM/$ccds[$i]/;
+    $name =~ s/CCDNUM/$ccd/;
     push @filenames, $name;
 
-    $line = `echo $name | fields NEXTEND`;
-    ($junk, $N) = split (" ", $line);
-    if ($i == 0) {
+    ($junk, $N) = split (" ", `echo $name | fields NEXTEND`);
+    if ($ccd eq $ccds[0]) {
         $Nline = $N;
     } 
-    if ($N != $Nline) {
-        print STDERR "ERROR: mis-matched number of images in $name\n";
-        exit (1);
-    }
+    if ($N != $Nline) { die "ERROR: mis-matched number of images in $name\n"; }
 }    
 

trunk/Ohana/src/perl/src/mosaic.stats

@@ -10 +10 @@
 # confusion on a second pass
 
-$answer = `cameraconfig -ccds`;
-@ccds = split (" ", $answer); 
+@ccds = split (" ", `cameraconfig -ccdn`);
+if ($?) { die "ERROR: configuration problem\n"; }
 
 sub vsystem {
@@ -37 +37 @@
 }
 
-# count number of lines in file 00:
-$name = $ARGV[0];
-$name =~ s/CCDNUM/$ccds[0]/;
+# load in stats from files (Nlist*Nccd entries)
+foreach $ccd (@ccds) {
+    $name = $ARGV[0];
+    $name =~ s/CCDNUM/$ccd/;
 
-# load in stats from files (Nlist*Nccd entries)
-for ($i = 0; $i < @ccds; $i++) {
-    $name = $ARGV[0];
-    $name =~ s/CCDNUM/$ccds[$i]/;
-
-    $lname = "list$i";
     open (FILE, $name);
-    @$lname = <FILE>;
+    @$ccd = <FILE>;
     close (FILE);
 
-    if ($i == 0) {
-        $Nline = @$lname;
-    } else {
-        if (@$lname != $Nline) { die "ERROR mis-matched file lengths\n"; }
-    }
+    if ($ccd eq $ccds[0]) {
+        $Nline = @$ccd;
+    } 
+    if (@$ccd != $Nline) { die "ERROR mis-matched file lengths\n"; }
 }    
 
@@ -77 +71 @@
     $mbin2 = 0;
 
-    for ($j = 0; $j < @ccds; $j++) {
-        $lname = "list$j";
-        $line = $$lname[$i];
+    foreach $ccd (@ccds) {
+        $line = $$ccd[$i];
         chop ($line);
         @words = split (" ", $line);
@@ -96 +89 @@
         $mbin2 += $words[7]*$words[7];
     }
-    $N = $j;
+    $N = @ccds;
 
     # identify even or morn twilight