Changeset 2628

Timestamp:

Dec 3, 2004, 9:31:55 PM (22 years ago)

Author:

eugene

Message:

updated changes from cfht

Location:

trunk/Ohana/src

Files:

• opihi/cmd.data/extract.c (modified) (1 diff)
• perl/src/darktime.linear (modified) (1 diff)
• perl/src/dt.select (modified) (1 diff)
• perl/src/normalize (modified) (2 diffs)
• perl/src/normalize.pre12KfiltersHandling (added)

trunk/Ohana/src/opihi/cmd.data/extract.c

@@ -51 +51 @@
   }
 
-  if ((out = SelectBuffer (argv[2], OLDBUFFER, TRUE)) == NULL) {
+  if ((out = SelectBuffer (argv[2], OLDBUFFER, FALSE)) == NULL) {
     if ((out = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
     fits_free_matrix (&out[0].matrix);

trunk/Ohana/src/perl/src/darktime.linear

@@ -13 +13 @@
 if (@ARGV != 2) { die "USAGE: darktime.linear (image.exptime) (dark.exptime)\n" }
 
-print STDOUT "1.0\n";
+
+$t1 = $ARGV[0];
+$t2 = $ARGV[1];
+
+$r = $t1 / $t2;
+
+# no dark correction for exptime < 60 sec
+if ($t1 < 60) { $r = 0.0; }
+
+print STDOUT "$r\n";
 
 exit 0;

trunk/Ohana/src/perl/src/dt.select

@@ -149 +149 @@
             
             # test for acceptable flux
-            $Flux = $words2[11] / $words2[7];
+            if ($words2[7] > 0.0) {
+               $Flux = $words2[11] / $words2[7];
+            } else {
+               $Flux = 0.0;
+            }
             if ($Flux < $minflux) { print STDERR "$words[5] rejected: flux too low: $Flux vs $minflux\n"; next FRAME; }
         }

trunk/Ohana/src/perl/src/normalize

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-$revline = "\$Revision: 1.5 $?";
+$revline = "\$Revision: 1.6 $?";
 ($version) = $revline =~ m|\$Revision:\s*(\S*)|;
 
@@ -110 +110 @@
         print STDERR "ERROR: ref file $args[3] is missing\n";
         exit 1;
+    }
+    $chipref = `gconfig FLIPS_REF_CCD`; chop ($chipref);
+    $baseref = $chipref;
+    print STDERR "Normalizing reference: using file $ref\n";
+
+    # Check that FLIPS_REF_CCD is not in CHIPSKIP, otherwise find another CCD
+    $Nccd = `cameraconfig -Nccd`; chop ($Nccd);
+    @ccdn = split (" ", `cameraconfig -ccdn`);
+    $CHIPSKIP = `gconfig CHIP_SKIP_LIST`; chop $CHIPSKIP;
+    @chipskip = ();
+    if (-e $CHIPSKIP) {
+
+       open (FILE, $CHIPSKIP);
+       @chipskip = <FILE>;
+       close (FILE);
+       foreach $chip (@chipskip) { chop $chip; }
+
+       foreach $chip (@chipskip) {
+          $chip =~ s/ccd//;
+          if ($chip eq $chipref) {
+             print STDERR "Warning: found reference chip in skip list ($chipref)\n";
+             
+             # Find a new reference: increment by one
+             for ($i = 0; $i < $Nccd; $i++) {
+                $ccdindex = $ccdn[$i];
+                if ( $ccdindex eq $chipref ) {
+                   $newref = $ccdn[$i + 1];
+                }
+             }
+             $chipref = $newref
+          }
+       }
+       # Substitute the CCD reference number in the name of the ref FITS file
+       $ref =~ s/.$baseref./.$chipref./;
+       print STDERR "New SkipChip selection: using ref file $ref\n";
     }