Changeset 29283

Timestamp:

Sep 30, 2010, 3:11:03 PM (16 years ago)

Author:

bills

Message:

Save MJD-OBS (average dateobs in TAI) in stackSumSkyfile.mjd_obs

Location:

trunk

Files:

• dbconfig/stack.md (modified) (1 diff)
• ippTools/src/stacktool.c (modified) (2 diffs)
• ippTools/src/stacktoolConfig.c (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (1 diff)
• ppStack/src/ppStackConvolve.c (modified) (1 diff)

trunk/dbconfig/stack.md

@@ -49 +49 @@
     hostname           STR    64
     good_frac          F32    0.0     # Key
+    mjd_obs            F64    0.0
     fault              S16    0       # Key
     software_ver    STR         16

trunk/ippTools/src/stacktool.c

@@ -982 +982 @@
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false);
+    PXOPT_LOOKUP_F64(mjd_obs, config->args, "-mjd_obs", false, false);
 
     PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
@@ -1047 +1048 @@
                                hostname,
                                good_frac,
+                               mjd_obs,
                                fault,
                                software_ver,

trunk/ippTools/src/stacktoolConfig.c

@@ -172 +172 @@
     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-hostname", 0,            "define hostname", 0);
     psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-good_frac",  0,            "define %% of good pixels", NAN);
+    psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-mjd_obs",  0,            "define mjd_obs (average mjd_obs of inputs)", NAN);
     psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-fault",  0,            "set fault code", 0);
     psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-quality",  0,            "set quality", 0);

trunk/ippconfig/recipes/ppStatsFromMetadata.config

@@ -374 +374 @@
   ENTRY  VAL  GOOD_PIXEL_FRAC     F32  MEAN              -good_frac                     
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+  ENTRY  VAL  MJD_OBS             F64  CONSTANT          -mjd_obs
 
   # Revision values

trunk/ppStack/src/ppStackConvolve.c

@@ -295 +295 @@
         UPDATE_CONCEPT(unconvCell, "CELL.DARKTIME", NAN);
         UPDATE_CONCEPT(unconvFPA,  "FPA.ZP",        options->zp);
+
+        if (options->stats) {
+            psTime *fpaTime = psMetadataLookupPtr(NULL, outFPA->concepts, "FPA.TIME");
+            psTimeConvert(fpaTime, PS_TIME_TAI); // is this necessary??
+            double time = psTimeToMJD(fpaTime);
+            psMetadataAddF64(options->stats, PS_LIST_TAIL, "MJD_OBS", PS_META_DUPLICATE_OK,
+                                 "Average MJD_OBS of inputs", time);
+
+        }
     }