Changeset 29901

Timestamp:

Dec 2, 2010, 2:28:29 PM (15 years ago)

Author:

bills

Message:

Add columns for detection efficiency parameters. Changes to psphot to set the
value in stats file and in ppStats* to process them

Location:

tags/ipp-20101029

Files:

• dbconfig/cam.md (modified) (1 diff)
• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/chip.md (modified) (1 diff)
• dbconfig/config.md (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 diff)
• ippTools/src/camtool.c (modified) (2 diffs)
• ippTools/src/camtoolConfig.c (modified) (1 diff)
• ippTools/src/chiptool.c (modified) (3 diffs)
• ippTools/src/chiptoolConfig.c (modified) (1 diff)
• ippconfig/recipes/ppStats.config (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (2 diffs)
• psphot/src/psphotEfficiency.c (modified) (1 diff)
• psphot/src/psphotOutput.c (modified) (1 diff)

tags/ipp-20101029/dbconfig/cam.md

@@ -113 +113 @@
     maskfrac_max_magic  F32     0.0
     maskfrac_max_advisory F32   0.0
+    deteff         F32      0
+    deteff_err     F32      0
+    deteff_lq      F32      0
+    deteff_uq      F32      0
     quality        S16      0
 END

tags/ipp-20101029/dbconfig/changes.txt

@@ -1981 +1981 @@
     FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+ALTER TABLE chipProcessedImfile ADD column deteff_magref FLOAT;
+ALTER TABLE camProcessedExp ADD column deteff FLOAT AFTER maskfrac_max_advisory;
+ALTER TABLE camProcessedExp ADD column deteff_err FLOAT AFTER deteff;
+ALTER TABLE camProcessedExp ADD column deteff_lq FLOAT AFTER deteff_err;
+ALTER TABLE camProcessedExp ADD column deteff_uq FLOAT AFTER deteff_lq;
+UPDATE dbversion set schema_version = '1.1.66',  updated= CURRENT_TIMESTAMP();
+
+-- Version 1.1.67

tags/ipp-20101029/dbconfig/chip.md

@@ -105 +105 @@
     maskfrac_magic  F32     0.0
     maskfrac_advisory F32   0.0
+    deteff_magref   F32     0.0
 END
 

tags/ipp-20101029/dbconfig/config.md

@@ -2 +2 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.65
+    pkg_version     STR     1.1.66
 END

tags/ipp-20101029/ippTools/share/camtool_find_pendingimfile.sql

@@ -2 +2 @@
     camRun.cam_id,
     chipProcessedImfile.*,
+    (IF(exp_time IS NOT NULL AND deteff_magref IS NOT NULL,
+       (2.5 * LOG10(exp_time) + chipProcessedImfile.deteff_magref),  NULL))
+        AS deteff_inst,
     rawExp.exp_name,
     rawExp.camera,

tags/ipp-20101029/ippTools/src/camtool.c

@@ -519 +519 @@
     PXOPT_LOOKUP_F32(maskfrac_max_magic, config->args, "-maskfrac_max_magic", false, false);
     PXOPT_LOOKUP_F32(maskfrac_max_advisory, config->args, "-maskfrac_max_advisory", false, false);
+
+    // we store actual detection efficiency by adding in zpt_obs
+    PXOPT_LOOKUP_F32(deteff_inst, config->args, "-deteff_inst", false, false);
+    PXOPT_LOOKUP_F32(deteff_inst_lq, config->args, "-deteff_inst_lq", false, false);
+    PXOPT_LOOKUP_F32(deteff_inst_uq, config->args, "-deteff_inst_uq", false, false);
+    // error is dd
+    PXOPT_LOOKUP_F32(deteff_err, config->args, "-deteff_inst_err", false, false);
+    psF32 deteff = NAN;
+    psF32 deteff_uq = NAN;
+    psF32 deteff_lq = NAN;
+    if (isfinite(zpt_obs)) {
+        if (isfinite(deteff_inst)) {
+            deteff = deteff_inst + zpt_obs;
+        }
+        if (isfinite(deteff_inst_uq)) {
+            deteff_uq = deteff_inst_uq + zpt_obs;
+        }
+        if (isfinite(deteff_inst_lq)) {
+            deteff_lq = deteff_inst_lq + zpt_obs;
+        }
+    }
 
 /*     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n", */
@@ -666 +687 @@
         maskfrac_max_magic,
         maskfrac_max_advisory,
+        deteff,
+        deteff_err,
+        deteff_lq,
+        deteff_uq,
         quality
         );

tags/ipp-20101029/ippTools/src/camtoolConfig.c

@@ -198 +198 @@
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-maskfrac_max_advisory", 0, "define advisory mask fraction", NAN);
 
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst", 0, "define deteff", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst_err", 0, "define deteff_err", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst_lq", 0, "define deteff_lq", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-deteff_inst_uq", 0, "define deteff_uq", NAN);
+
 
     // -processedexp

tags/ipp-20101029/ippTools/src/chiptool.c

@@ -601 +601 @@
     PXOPT_LOOKUP_F32(maskfrac_magic, config->args, "-maskfrac_magic", false, false);
     PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
+    PXOPT_LOOKUP_F32(deteff_magref, config->args, "-deteff_magref", false, false);
 
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n",
@@ -706 +707 @@
                                    maskfrac_dynamic,
                                    maskfrac_magic,
-                                   maskfrac_advisory
+                                   maskfrac_advisory,
+                                   deteff_magref
             )) {
         // rollback
@@ -715 +717 @@
         return false;
     }
-
-#if 0
-    // XXX I've decided to make the transaction cover the Exp migration as
-    // well.  Otherwise, if the last imfile in an exp is moved and the exp
-    // migration fails then the data base is left in a situation where the exp
-    // migration can't happen.
-
-    if (!chipProcessedCompleteExp(config)) {
-        // rollback
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-#endif
 
     if (!psDBCommit(config->dbh)) {

tags/ipp-20101029/ippTools/src/chiptoolConfig.c

@@ -196 +196 @@
     psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-maskfrac_magic", 0, "define magic mask fraction", NAN);
     psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-maskfrac_advisory", 0, "define advisory mask fraction", NAN);
+    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-deteff_magref", 0, "define deteff_magref", NAN);
 
     // -processedimfile

tags/ipp-20101029/ippconfig/recipes/ppStats.config

@@ -84 +84 @@
   HEADER        STR     IQ_M4_LQ
   HEADER        STR     IQ_M4_UQ
+  HEADER        STR     DETEFF.MAGREF
+
 
   HEADER        STR     PSLIB_V

tags/ipp-20101029/ippconfig/recipes/ppStatsFromMetadata.config

@@ -187 +187 @@
   ENTRY VAL MASKFRAC_MAGIC        F32  CONSTANT         -maskfrac_magic
   ENTRY VAL MASKFRAC_ADVISORY     F32  CONSTANT         -maskfrac_advisory
+
+  # Detection Efficiency
+  ENTRY  VAL  DETEFF.MAGREF       F32  CONSTANT         -deteff_magref            
 END
 
@@ -255 +258 @@
   ENTRY  VAL  IMAGE_V             STR  CONSTANT         -ver_ppimage
   ENTRY  VAL  STREAK_V            STR  CONSTANT         -ver_streaks
+
+  # Detection Efficiency
+  ENTRY  VAL  deteff_inst         F64  ROBUST_MEDIAN    -deteff_inst            
+  ENTRY  VAL  deteff_inst         F64  ROBUST_STDEV     -deteff_inst_err            
+  ENTRY  VAL  deteff_inst         F64  UQ               -deteff_inst_uq            
+  ENTRY  VAL  deteff_inst         F64  LQ               -deteff_inst_lq            
 END
 

tags/ipp-20101029/psphot/src/psphotEfficiency.c

@@ -512 +512 @@
     psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PM_DETEFF_ANALYSIS, PS_META_REPLACE | PS_DATA_UNKNOWN,
                      "Detection efficiency", de);
+    psMetadataAddF32(readout->analysis, PS_LIST_TAIL, "DETEFF.MAGREF", 
+        PS_META_REPLACE, "Magnitude reference", magLim);
+
     psFree(de);
 

tags/ipp-20101029/psphot/src/psphotOutput.c

@@ -283 +283 @@
     psMetadataItemSupplement (&status, header, analysis, "MSKY_NY");
 
+    psMetadataItemSupplement (&status, header, analysis, "DETEFF.MAGREF");
+
     psMetadataAddF32 (header, PS_LIST_TAIL, "DT_PHOT", PS_META_REPLACE, "elapsed psphot time", psTimerMark ("psphotReadout"));