Changeset 29620 for trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c

Timestamp:

Oct 29, 2010, 4:31:24 PM (16 years ago)

Author:

eugene

Message:

make DV2 and V3 consistent wrt xErr, yErr

File:

• trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c

@@ -89 +89 @@
     if (!status1) {
         fwhmMajor = psMetadataLookupF32(&status1, readout->analysis, "IQ_FW1");
+        if (!status1) {
+            fwhmMajor = 5.0; // XXX just a guess!
+        }
     }
     float 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!
+        }
     }
 
@@ -154 +160 @@
             useMoments = (useMoments && !(source->mode && PM_SOURCE_MODE_MOMENTS_FAILURE)); // can't if the moments failed...
 
-            if (source->moments) {
+            if (useMoments) {
                 xPos = source->moments->Mx;
                 yPos = source->moments->My;