Changeset 38038 for trunk/psModules/src/objects/pmSourceOutputs.c

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)
• pmSourceOutputs.c (modified) (1 diff)

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

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