Changeset 30945

Timestamp:

Mar 17, 2011, 2:34:49 PM (15 years ago)

Author:

watersc1

Message:

Fix bad dtime entries and add dtime_convolve to the stack stage.

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/stack.md (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/stacktool.c (modified) (2 diffs)
• ippTools/src/stacktoolConfig.c (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (2 diffs)

trunk/dbconfig/changes.txt

@@ -1999 +1999 @@
 ALTER TABLE pstampDataStore ADD COLUMN need_magic INT;
 
-
 --Version 1.1.67
 
 ALTER TABLE minidvodbProcessed add column dtime_verify FLOAT AFTER dtime_relphot;
 ALTER TABLE minidvodbProcessed add column dtime_script FLOAT AFTER dtime_merge;
+
+-- Version 1.1.68
+
+ALTER TABLE stackSumSkyfile ADD column dtime_convolve FLOAT AFTER dtime_match_stdev;

trunk/dbconfig/stack.md

@@ -32 +32 @@
     dtime_match_mean   F32    0.0 # Key
     dtime_match_stdev  F32    0.0 # Key
+    dtime_convolve     F32    0.0 # Key
     dtime_initial      F32    0.0 # Key
     dtime_reject       F32    0.0 # Key

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1040 +1040 @@
         dtime_match_mean FLOAT,
         dtime_match_stdev FLOAT,
+        dtime_convolve FLOAT,
         dtime_initial FLOAT,
         dtime_reject FLOAT,

trunk/ippTools/src/stacktool.c

@@ -968 +968 @@
     PXOPT_LOOKUP_F32(dtime_reject, config->args, "-dtime_reject", false, false);
     PXOPT_LOOKUP_F32(dtime_final, config->args, "-dtime_final", false, false);
+    PXOPT_LOOKUP_F32(dtime_convolve, config->args, "-dtime_convolve", false, false);
     PXOPT_LOOKUP_F32(dtime_phot, config->args, "-dtime_phot", false, false);
     PXOPT_LOOKUP_F32(dtime_script, config->args, "-dtime_script", false, false);
@@ -1031 +1032 @@
                                dtime_match_mean,
                                dtime_match_stdev,
+                               dtime_convolve,
                                dtime_initial,
                                dtime_reject,

trunk/ippTools/src/stacktoolConfig.c

@@ -157 +157 @@
     psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_reject", 0, "define rejection time", NAN);
     psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_final", 0, "define final stack time", NAN);
+    psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_convolve", 0, "define image convolution time", NAN);
     psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_phot", 0, "define photometry time", NAN);
     psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_script", 0, "define elapsed time in script (seconds)", NAN);

trunk/ippconfig/recipes/ppStatsFromMetadata.config

@@ -370 +370 @@
   ENTRY  VAL  TIME_REJECT         F32  SUM               -dtime_reject                  
   ENTRY  VAL  TIME_FINAL          F32  SUM               -dtime_final                   
+  ENTRY  VAL  TIME_CONVOLVE       F32  SUM               -dtime_convolve
   ENTRY  VAL  TIME_PHOT           F32  SUM               -dtime_phot                    
   ENTRY  VAL  STAMP.MEAN          F32  SAMPLE_MEAN       -match_mean                    
@@ -400 +401 @@
   ENTRY  VAL  ROBUST_MEDIAN          F32  ROBUST_MEDIAN     -bg             
   ENTRY  VAL  ROBUST_STDEV           F32  RMS               -bg_stdev       
-  ENTRY  VAL  TIME_SUB               F32  SUM               -dtime_diff     
+  ENTRY  VAL  TIME_DIFF              F32  SUM               -dtime_diff     
   ENTRY  VAL  TIME_MATCH             F32  SUM               -dtime_match    
-  ENTRY  VAL  TIME_PHOT              F32  SUM               -dtime_phot     
+  ENTRY  VAL  TIME_PHOT              F32  SUM               -dtime_phot 
   ENTRY  VAL  SUBTRACTION.STAMPS     S32  SAMPLE_MEAN       -stamps_num     
   ENTRY  VAL  SUBTRACTION.DEV.MEAN   F32  SAMPLE_MEAN       -stamps_mean