Changeset 13606

Timestamp:

Jun 3, 2007, 4:27:35 PM (19 years ago)

Author:

eugene

Message:

added sat_pixel_frac

Location:

trunk

Files:

• dbconfig/tasks.md (modified) (3 diffs)
• ippScripts/scripts/register_exp.pl (modified) (2 diffs)
• ippScripts/scripts/register_imfile.pl (modified) (2 diffs)
• ippTools/src/regtool.c (modified) (4 diffs)
• ippTools/src/regtoolConfig.c (modified) (2 diffs)

trunk/dbconfig/tasks.md

@@ -1 @@
-# $Id: tasks.md,v 1.132 2007-03-22 01:10:12 jhoblitt Exp $
+# $Id: tasks.md,v 1.133 2007-06-04 02:26:09 eugene Exp $
 
 # this table records all exposure ID ever seen from the summit
@@ -116 +116 @@
     decl        F64         0.0
     exp_time    F32         0.0
+    sat_pixel_frac F32      0.0
     bg          F64         0.0
     bg_stdev    F64         0.0
@@ -142 +143 @@
     decl        F64         0.0
     exp_time    F32         0.0
+    sat_pixel_frac F32      0.0
     bg          F64         0.0
     bg_stdev    F64         0.0

trunk/ippScripts/scripts/register_exp.pl

@@ -72 +72 @@
                            "ccd_temp", # CCD temperature
                            "exp_time", # Exposure time
+                           "sat_pixel_frac", # Fraction of saturated pixels
                            "airmass", # Airmass
                            "ra", # Right ascension
@@ -160 +161 @@
 if (0) {
 # XXX for a test, randomly declare a failure and return to pantasks
-my $rnd = rand(1);
-if ($rnd > 0.5) {
-    warn ("random failure");
-    &my_die ($exp_tag, $PS_EXIT_DATA_ERROR);
-}
+    my $rnd = rand(1);
+    if ($rnd > 0.5) {
+        warn ("random failure");
+        &my_die ($exp_tag, $PS_EXIT_DATA_ERROR);
+    }
 }
 

trunk/ippScripts/scripts/register_imfile.pl

@@ -58 +58 @@
     and defined $uri;
 
-my $RECIPE = "PPSTATS_PHASE0"; # Recipe to use for ppStats
+my $RECIPE = "PPSTATS_REGISTER"; # Recipe to use for ppStats
 
 # These values should be constant for all components
@@ -79 +79 @@
 # The key is the name in the ppStats output; the value is the switch for "phase0 -updateexp"
 use constant VARIABLES => {
-    "CHIP.TEMP"    => "-ccd_temp", # CCD temperature
-    "CELL.EXPOSURE" => "-exp_time" # Exposure time
+    "CHIP.TEMP"      => "-ccd_temp", # CCD temperature
+    "CELL.EXPOSURE"  => "-exp_time", # Exposure time
+    "SAT_PIXEL_FRAC" => "-sat_pixel_frac" # fraction of saturated pixels
     };
 

trunk/ippTools/src/regtool.c

@@ -892 +892 @@
     }
 
+    psF32 sat_pixel_frac = psMetadataLookupF32(&status, config->args, "-sat_pixel_frac");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sat_pixel_frac");
+        return false;
+    }
+
     psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
     if (!status) {
@@ -977 +983 @@
         decl,
         exp_time,
+        sat_pixel_frac,
         bg,
         bg_stdev,
@@ -1046 +1053 @@
     }
 
+    psF32 sat_pixel_frac = psMetadataLookupF32(&status, config->args, "-sat_pixel_frac");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sat_pixel_frac");
+        return false;
+    }
+
     psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
     if (!status) {
@@ -1126 +1139 @@
         decl,
         exp_time,
+        sat_pixel_frac,
         bg,
         bg_stdev,

trunk/ippTools/src/regtoolConfig.c

@@ -79 +79 @@
     psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_time",  0,
         "define exposure time", NAN);
+    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac",  0,
+        "define fraction of saturated pixels", NAN);
     psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg",  0,
         "define exposue background", NAN);
@@ -160 +162 @@
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-exp_time",  0,
         "define exposure time", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac",  0,
+        "define fraction of saturated pixels", NAN);
     psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg",  0,
         "define exposue background", NAN);