Changeset 38038

Timestamp:

Mar 28, 2015, 7:16:10 AM (11 years ago)

Author:

eugene

Message:

replace assert with psAssert in cases where the value is otherwise unused; do not raise an error when looking for classID in detloc which is not found; add galaxy shape error propagation failure flags to pmModelStatus; read EXT_WIDTH_MAJ_ERR et al back into dPAR[SXX,etc] (careful: this only works if not real errors); read SKY_EXT in PAR[SKY]; use header for FWHM_MAJ if not found on readout->analysis

Location:

trunk/psModules/src

Files:

• config (modified) (1 prop)
• config/Makefile.am (modified) (1 diff)
• config/pmConfigRecipes.c (modified) (1 diff)
• detrend/pmDetrendDB.c (modified) (1 diff)
• objects (modified) (2 props)
• objects/pmFootprintAssignPeaks.c (modified) (1 diff)
• objects/pmModelFuncs.h (modified) (1 diff)
• objects/pmSourceIO_CMF.c.in (modified) (2 diffs, 1 prop)
• objects/pmSourceIO_PS1_CAL_0.c (modified) (1 diff)
• objects/pmSourceIO_PS1_DEV_1.c (modified) (1 diff)
• objects/pmSourceOutputs.c (modified) (1 diff)

trunk/psModules/src/config

@@ -8 +8 @@
 pmErrorCodes.h
 pmVersionDefinitions.h
+pmVersionDefinitions.h.tmp

@@ -8 +8 @@
 pmErrorCodes.h
 pmVersionDefinitions.h
+pmVersionDefinitions.h.tmp

trunk/psModules/src/config/Makefile.am

@@ -1 +1 @@
 noinst_LTLIBRARIES = libpsmodulesconfig.la
-
-if HAVE_SVNVERSION
-PSMODULES_VERSION=`$(SVNVERSION) ../..`
-else
-PSMODULES_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSMODULES_BRANCH=`$(SVN) info ../.. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PSMODULES_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSMODULES_BRANCH="UNKNOWN"
-PSMODULES_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of pmVersion.c, since it gets the version information
 pmVersion.c: pmVersionDefinitions.h
 pmVersionDefinitions.h: pmVersionDefinitions.h.in FORCE
-        -$(RM) pmVersionDefinitions.h
-        $(SED) -e "s|@PSMODULES_VERSION@|\"$(PSMODULES_VERSION)\"|" -e "s|@PSMODULES_BRANCH@|\"$(PSMODULES_BRANCH)\"|" -e "s|@PSMODULES_SOURCE@|\"$(PSMODULES_SOURCE)\"|" pmVersionDefinitions.h.in > pmVersionDefinitions.h
+        pslib-setsvnversion.pl PSMODULES pmVersionDefinitions.h.in pmVersionDefinitions.h
 FORCE: ;
 

trunk/psModules/src/config/pmConfigRecipes.c

@@ -228 +228 @@
         }
         psFree (words);
-        assert (valid);  // flag may be: -D, -Df, -Di, -Db
+        psAssert (valid, "invalid flag: may be: -D, -Df, -Di, -Db\n");
 
         psArgumentRemove (argNum, argc, argv);

trunk/psModules/src/detrend/pmDetrendDB.c

@@ -356 +356 @@
     psTrace("psModules.detrend", 5, "detrend file: %s\n", result);
 
+    // XXX: A somewhat hacked bit of code to force the analysis to use a specific version of the detrend file
     char *is_nebulous = strstr(result,"neb://");
     if (is_nebulous) { // This file matches the nebulous string
       psString truncated = psStringCopy(is_nebulous + 6);
       //      printf("A: %s %s\n",result,truncated);
+
       psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes,"PPIMAGE");
-      psMetadata *detloc = psMetadataLookupMetadata(NULL, recipe, "DETREND.LOCATIONS");
+      psMetadata *detloc = psMetadataLookupMetadata(&status, recipe, "DETREND.LOCATIONS");
+
       if (detloc) { // This exists, so we have the information.
-        psString location = psMetadataLookupStr(NULL, detloc,classID);
+        psString location = psMetadataLookupStr(&status, detloc, classID);
         //      printf("B: %s %s\n", classID,location);
         if (location) { // Found a location

trunk/psModules/src/objects

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c

trunk/psModules/src/objects/pmFootprintAssignPeaks.c

@@ -56 +56 @@
         const int y = peak->y - row0;
         
-        if (ids) { assert (x >= 0 && x < numCols && y >= 0 && y < numRows);}
+        if (ids) { psAssert (x >= 0 && x < numCols && y >= 0 && y < numRows, "out of range");}
         int id = ids ? ids->data.S32[y][x] : 0;
 

trunk/psModules/src/objects/pmModelFuncs.h

@@ -36 +36 @@
 
 typedef enum {
-    PM_MODEL_STATUS_NONE           = 0x000, ///< model fit not yet attempted, no other info
-    PM_MODEL_STATUS_FITTED         = 0x001, ///< model fit completed
-    PM_MODEL_STATUS_NONCONVERGE    = 0x002, ///< model fit did not converge
-    PM_MODEL_STATUS_OFFIMAGE       = 0x004, ///< model fit drove out of range
-    PM_MODEL_STATUS_BADARGS        = 0x008, ///< model fit called with invalid args
-    PM_MODEL_STATUS_LIMITS         = 0x010, ///< model parameters hit limits
-    PM_MODEL_STATUS_WEAK_FIT       = 0x020, ///< model fit met loose tolerance, but not tight tolerance
-    PM_MODEL_STATUS_NAN_CHISQ      = 0x040, ///< model fit failed with a NAN chisq 
-    PM_MODEL_SERSIC_PCM_FAIL_GUESS = 0x080, ///< sersic model fit failed on the initial moments-based guess
-    PM_MODEL_SERSIC_PCM_FAIL_GRID  = 0x100, ///< sersic model fit failed on the grid search
-    PM_MODEL_PCM_FAIL_GUESS        = 0x200, ///< non-sersic model fit failed on the initial moments-based guess
-    PM_MODEL_BEST_FIT              = 0x400, ///< this model was the best fit and was subtracted
+    PM_MODEL_STATUS_NONE           = 0x0000, ///< model fit not yet attempted, no other info
+    PM_MODEL_STATUS_FITTED         = 0x0001, ///< model fit completed
+    PM_MODEL_STATUS_NONCONVERGE    = 0x0002, ///< model fit did not converge
+    PM_MODEL_STATUS_OFFIMAGE       = 0x0004, ///< model fit drove out of range
+    PM_MODEL_STATUS_BADARGS        = 0x0008, ///< model fit called with invalid args
+    PM_MODEL_STATUS_LIMITS         = 0x0010, ///< model parameters hit limits
+    PM_MODEL_STATUS_WEAK_FIT       = 0x0020, ///< model fit met loose tolerance, but not tight tolerance
+    PM_MODEL_STATUS_NAN_CHISQ      = 0x0040, ///< model fit failed with a NAN chisq 
+    PM_MODEL_SERSIC_PCM_FAIL_GUESS = 0x0080, ///< sersic model fit failed on the initial moments-based guess
+    PM_MODEL_SERSIC_PCM_FAIL_GRID  = 0x0100, ///< sersic model fit failed on the grid search
+    PM_MODEL_PCM_FAIL_GUESS        = 0x0200, ///< non-sersic model fit failed on the initial moments-based guess
+    PM_MODEL_BEST_FIT              = 0x0400, ///< this model was the best fit and was subtracted
+    PM_MODEL_STATUS_NAN_SHAPE      = 0x0800, ///< model ellipse parameters do not transform to valid ellipse
+    PM_MODEL_STATUS_NAN_SHAPE_ERR  = 0x1000, ///< model ellipse parameters errors do not transform to valid ellipse
+    PM_MODEL_STATUS_FAIL_SHAPE_ERR = 0x2000, ///< could not find an MC solution for ellipse parameter errors
 } pmModelStatus;
 

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -1252 +1252 @@
         }
 
-        // XXX : make this depend on what is in the cmf
-        if (0) {
+        // NOTE: we no longer write out the covariance matrix
+        if (false) {
             // read the covariance matrix
             int nparams = model->params->n;
@@ -1266 +1266 @@
             model->covar = covar;
         }
+
+        // we are only saving the values stored in dPAR[SXX,etc]
+        dPAR[PM_PAR_SXX] = psMetadataLookupF32(&status, row, "EXT_WIDTH_MAJ_ERR");
+        dPAR[PM_PAR_SYY] = psMetadataLookupF32(&status, row, "EXT_WIDTH_MIN_ERR");
+        dPAR[PM_PAR_SXY] = psMetadataLookupF32(&status, row, "EXT_THETA_ERR");
+
+        // other parameters that we need to read
+        PAR[PM_PAR_SKY] = psMetadataLookupF32(&status, row, "SKY_EXT");
 
         if (modelType == extModelType) {

trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

@@ -376 +376 @@
     psVector *radialBinsLower = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.LOWER");
     psVector *radialBinsUpper = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.UPPER");
-    assert (radialBinsLower->n == radialBinsUpper->n);
+    psAssert (radialBinsLower->n == radialBinsUpper->n, "upper and lower bins must match");
 
     // we write out all sources, regardless of quality.  the source flags tell us the state

trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

@@ -322 +322 @@
     psVector *radialBinsLower = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.LOWER");
     psVector *radialBinsUpper = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.UPPER");
-    assert (radialBinsLower->n == radialBinsUpper->n);
+    psAssert (radialBinsLower->n == radialBinsUpper->n, "upper and lower bins must match");
 
     // we write out all sources, regardless of quality.  the source flags tell us the state

trunk/psModules/src/objects/pmSourceOutputs.c

@@ -60 +60 @@
     // we need a measure of the image quality (FWHM) for this image, in order to get the positional errors
     *fwhmMajor = psMetadataLookupF32(&status1, readout->analysis, "FWHM_MAJ");
-    if (!status1) {
-        *fwhmMajor = psMetadataLookupF32(&status1, readout->analysis, "IQ_FW1");
-        if (!status1) {
-            *fwhmMajor = 5.0; // XXX just a guess!
-        }
-    }
+    if (status1) goto got_major;
+
+    *fwhmMajor = psMetadataLookupF32(&status1, header, "FWHM_MAJ");
+    if (status1) goto got_major;
+
+    *fwhmMajor = psMetadataLookupF32(&status1, readout->analysis, "IQ_FW1");
+    if (status1) goto got_major;
+
+    *fwhmMajor = psMetadataLookupF32(&status1, header, "IQ_FW1");
+    if (status1) goto got_major;
+
+    *fwhmMajor = 5.0; // XXX just a guess!
+
+    got_major:
+
     *fwhmMinor = psMetadataLookupF32(&status1, readout->analysis, "FWHM_MIN");
-    if (!status1) {
-        *fwhmMinor = psMetadataLookupF32(&status1, readout->analysis, "IQ_FW2");
-        if (!status1) {
-            *fwhmMinor = 5.0; // XXX just a guess!
-        }
-    }
-
+    if (status1) goto got_minor;
+    *fwhmMinor = psMetadataLookupF32(&status1, header, "FWHM_MIN");
+    if (status1) goto got_minor;
+
+    *fwhmMinor = psMetadataLookupF32(&status1, readout->analysis, "IQ_FW2");
+    if (status1) goto got_minor;
+    *fwhmMinor = psMetadataLookupF32(&status1, header, "IQ_FW2");
+    if (status1) goto got_minor;
+
+    *fwhmMinor = 5.0; // XXX just a guess!
+
+    got_minor:
     return true;
 

@@ -8 +8 @@
 pmErrorCodes.h
 pmVersionDefinitions.h
+pmVersionDefinitions.h.tmp

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c