Changeset 38038 for trunk/psModules/src/objects/pmSourceIO_CMF.c.in

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/objects

Files:

• . (modified) (2 props)
• pmSourceIO_CMF.c.in (modified) (2 diffs, 1 prop)

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/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) {

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