Changeset 36914

Timestamp:

Jun 19, 2014, 3:22:46 PM (12 years ago)

Author:

bills

Message:

have psastro output a mask for each chip ASTROM_CHIPS. It has
the value 1 << chip_num if sucessfull otherwise zero
ppStatsFromMetadata ors them all together and then
add to camProcessedExp.
If all 60 gpc1 chips get an astronomical fit the value is 1152921504606846975

Location:

trunk

Files:

• dbconfig/cam.md (modified) (1 diff)
• dbconfig/changes.txt (modified) (1 diff)
• ippTools/share/camtool_find_processedexp.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/camtool.c (modified) (2 diffs)
• ippTools/src/camtoolConfig.c (modified) (1 diff)
• ippconfig/recipes/ppStats.config (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (1 diff)
• ppStats/src/ppStatsFromMetadataStats.c (modified) (3 diffs)
• psastro/src/psastroChipAstrom.c (modified) (1 diff)
• psastro/src/psastroOneChipFit.c (modified) (1 diff)

trunk/dbconfig/cam.md

@@ -119 +119 @@
     quality        S16      0
     background_model  S16   0
+    astrom_chips   S64      0
 END
 

trunk/dbconfig/changes.txt

@@ -2521 +2521 @@
 UPDATE dbversion set schema_version = '1.1.79', updated= CURRENT_TIMESTAMP();
 
-
+ALTER TABLE camProcessedExp ADD COLUMN astrom_chips BIGINT;
+UPDATE dbversion set schema_version = '1.1.79', updated= CURRENT_TIMESTAMP();
+
+

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -1 +1 @@
 SELECT
     camProcessedExp.*,
+    HEX(IFNULL(camProcessedExp.astrom_chips, 0)) AS good_astrom_chips,
     camRun.workdir,
     camRun.label,

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -523 +523 @@
     quality SMALLINT NOT NULL DEFAULT 0,
     background_model SMALLINT,
+    astrom_chips BIGINT,
     PRIMARY KEY(cam_id),
     KEY(fault),

trunk/ippTools/src/camtool.c

@@ -501 +501 @@
     PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false);
     PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
+    PXOPT_LOOKUP_S64(astrom_chips, config->args, "-astrom_chips", false, false);
+
     
     PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
@@ -692 +694 @@
         deteff_uq,
         quality,
-        background_model
+        background_model,
+        astrom_chips
         );
 

trunk/ippTools/src/camtoolConfig.c

@@ -205 +205 @@
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst_uq", 0, "define deteff_uq", NAN);
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-background_model", 0, "set background_model value", 0);
+    psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-astrom_chips", 0, "chips with successful astrom", -1);
 
     // -processedexp

trunk/ippconfig/recipes/ppStats.config

@@ -116 +116 @@
   HEADER        STR     DT_ASTR  # elapsed time in astrometry processing
   HEADER        STR     NASTRO
+  HEADER        STR     ASTROM_CHIPS
 
   HEADER        STR     ZPT_OBS

trunk/ippconfig/recipes/ppStatsFromMetadata.config

@@ -274 +274 @@
   ENTRY  VAL  DT_ASTR             F32  SUM              -dtime_astrom      
   ENTRY  VAL  NASTRO              S32  SUM              -n_astrom          
+  ENTRY  VAL  ASTROM_CHIPS        U64  BITWISEOR        -astrom_chips
 
   ENTRY  VAL  ZPT_OBS             F32  SAMPLE_MEAN      -zpt_obs

trunk/ppStats/src/ppStatsFromMetadataStats.c

@@ -1 +1 @@
 # include "ppStatsInternal.h"
+
+static void computeBitwiseOr(ppStatsEntry *entry);
 
 // calculate the stats for the non-constant entries (already calculated)
@@ -11 +13 @@
         // XXX skip or warn on missing stats?
         if (!entry->vector) continue;
+
+        if (!strcasecmp (entry->statistic, "bitwiseor")) {
+            computeBitwiseOr(entry);
+            continue;
+        }
 
         psStatsOptions option;
@@ -68 +75 @@
     return true;
 }
+
+static void computeBitwiseOr(ppStatsEntry *entry)
+{
+    psU64 result = 0;
+    psVector *vector = entry->vector;
+    for (int j = 0; j < vector->n; j++) {
+        // XXX: should we handle other types
+        if (entry->type == PS_DATA_U64) {
+            result |= vector->data.U64[j];
+        } else if (entry->type == PS_DATA_U32) {
+            result |= vector->data.U32[j];
+        } else {
+            return;
+        } 
+    }
+
+    if (entry->type == PS_DATA_U64) {
+        entry->value = psMetadataItemAllocU64(entry->keyword, entry->statistic, result);
+    } else {
+        entry->value = psMetadataItemAllocU32(entry->keyword, entry->statistic, result);
+    }
+
+    return;
+}
+

trunk/psastro/src/psastroChipAstrom.c

@@ -143 +143 @@
                 numGoodRO++;
 
+                psU64 astrom_chip_val = 1;
+                astrom_chip_val <<= view->chip;
+                psMetadataAddU64 (updates, PS_LIST_TAIL, "ASTROM_CHIPS", PS_META_REPLACE, 
+                    "chips that passed astrometry", astrom_chip_val);
+
                 // write the elapsed time here; this will be updated in psastroMosaicAstrometry, if called
                 psMetadataAddF32 (updates, PS_LIST_TAIL, "DT_ASTR", PS_META_REPLACE, "elapsed psastro time", psTimerMark ("psastroAnalysis"));

trunk/psastro/src/psastroOneChipFit.c

@@ -228 +228 @@
     psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", 0.0);
     psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", 0);
+    psMetadataAddU64 (updates, PS_LIST_TAIL, "ASTROM_CHIPS", PS_META_REPLACE, "chips that passed astrometry", 0);
     return true;
 }