Changeset 40

Timestamp:

Feb 14, 2003, 1:55:26 AM (23 years ago)

Author:

eugene

Message:

megacam upgrades

Location:

trunk/Ohana/src/perl/src

Files:

• ckimregdb (modified) (4 diffs)
• fr.imdata (modified) (1 diff)
• fr.medbin.spline (modified) (1 diff)

trunk/Ohana/src/perl/src/ckimregdb

@@ -10 +10 @@
 # imsearch and ardrange12k have different default hr:mn:sc values
 # this script converts to the ardrange12k defaults: 12:00:00
+
+# WARNING: define a ref CCD for seeing
 
 # test for current camera?
@@ -29 +31 @@
 }
 
+@ccds = split (" ", `cameraconfig -ccds`);
+if ($?) { &escape ("error with elixir camera configuration"); }
+
 @archive = split (" ", $answer);
 $N = @archive;
 print "archive: $N files\n";
 
-@imregdb = `imsearch -ccd 0 -trange $start $range -tz 10.0`;
+@imregdb = `imsearch -ccd $ccds[0] -trange $start $range -tz 10.0`;
 $N = @imregdb;
 print "imregdb: $N files\n";
@@ -62 +67 @@
 foreach $file (@missing) {
 
+    print STDERR "link: $file\n";
     $arcfile  = sprintf "%s/%s", $archive, $file;
     $linkfile = sprintf "%s/%s", $linkdir, $file;
@@ -91 +97 @@
 
 # generate table of images which can be sent to CADC, mark as distributed:
-system ("imsearch -ccd 3 -trange $start $stop -proc t -dist f -cadctable cadc.fits");
-system ("imsearch -ccd 3 -trange $start $stop -proc t -dist f -modify dist t");
+system ("imsearch -ccd $ccds[3] -trange $start $stop -proc t -dist f -cadctable cadc.fits");
+system ("imsearch -ccd $ccds[3] -trange $start $stop -proc t -dist f -modify dist t");
 
 # utilities ############################

trunk/Ohana/src/perl/src/fr.imdata

@@ -22 +22 @@
 
 # abstract header keywords
-$datekwd = `gconfig -q DATE-KEYWORD`; chop ($datekwd);
-$timekwd = `gconfig -q UT-KEYWORD`; chop ($timekwd);
-$obsidkwd = `gconfig -q ID-KEYWORD`; chop ($obsidkwd);
-$exptimekwd = `gconfig -q EXPTIME-KEYWORD`; chop ($exptimekwd);
+($datekwd, $timekwd, $obsidkwd, $exptimekwd) = 
+    split (" ", `gconfig DATE-KEYWORD UT-KEYWORD ID-KEYWORD EXPTIME-KEYWORD`);
+if ($?) { die "ERROR problem with keywords\n"; }
 
-$answer = `echo $list[0] | fields $datekwd $timekwd $obsidkwd $exptimekwd`;
-# need to eventually fix return value of 'fields'
-# if ($?) { die "ERROR problem with fr.imdata\n"; }
-
-# grab interesting data
-($file, $date, $utc, $obsid, $exptime) = split (" ", $answer);
-if ($exptime eq "") { die "ERROR problem with fr.imdata\n"; }
+($file, $date, $utc, $obsid, $exptime) = 
+    split (" ", `echo $list[0] | fields $datekwd $timekwd $obsidkwd $exptimekwd`);
+if ($?) { die "ERROR missing header information\n"; }
  
 open (FILE, ">$imdata");

trunk/Ohana/src/perl/src/fr.medbin.spline

@@ -14 +14 @@
 
 $Nccd = `cameraconfig -Nccd`; chop ($Nccd);
-$answer = `cameraconfig -ccds`;
-@ccds = split (" ", $answer); 
+@ccds = split (" ", `cameraconfig -ccdn`);
+if ($?) { die "ERROR: cameraconfig error\n"; }
 
 if (! -d $meddir) { vsystem ("mkdir -p $meddir"); }