Changeset 38031 for branches/eam_branches/ipp-20150326/psModules/src/objects/pmSourceOutputs.c

Timestamp:

Mar 28, 2015, 5:35:05 AM (11 years ago)

Author:

eugene

Message:

pmDetrendDB should not fail if the classID is not present in the list of locations (eg, not one of the listed cameras); add galaxy shape error analysis failure flags to pmModelStatus; correctly load SKY_EXT from cmf file; for psastro, we need to get FWHM_MAJ,MIN from the header not the readout analysis

File:

• branches/eam_branches/ipp-20150326/psModules/src/objects/pmSourceOutputs.c (modified) (1 diff)

branches/eam_branches/ipp-20150326/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;