Changeset 30935

Timestamp:

Mar 16, 2011, 3:41:54 PM (15 years ago)

Author:

eugene

Message:

fix build errors for pmSourcePosition...

Location:

branches/eam_branches/ipp-20110213/psModules/src/objects

Files:

• pmSource.c (modified) (1 diff)
• pmSource.h (modified) (1 diff)
• pmSourceOutputs.c (modified) (1 diff)
• pmSourceOutputs.h (modified) (1 diff)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSource.c

@@ -1162 +1162 @@
     }
     return NULL;
+}
+
+// this function decides if the source position should be based on the peak or the moments.
+// this is only used if we know we should not use a model fit position (eg, no model, or no
+// model yet)
+bool pmSourcePositionUseMoments(pmSource *source) {
+
+    if (!source->moments) return false;          // can't if there are no moments
+    if (!source->moments->nPixels) return false; // can't if the moments were not measured
+    if (source->mode && PM_SOURCE_MODE_MOMENTS_FAILURE) return false; // can't if the moments failed...
+
+    if (source->mode & PM_SOURCE_MODE_SATSTAR) return true; // moments are best for SATSTARs
+
+    float dX = source->moments->Mx - source->peak->xf;
+    float dY = source->moments->My - source->peak->yf;
+    float dR = hypot(dX, dY);
+    
+    // only use the moments position if the moment-peak offset is small or the star is saturated
+    if (dR > 1.5) return false;
+
+    return true;
 }
 

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSource.h

@@ -287 +287 @@
 bool pmSourceCachePSF (pmSource *source, psImageMaskType maskVal);
 
+bool pmSourcePositionUseMoments(pmSource *source);
+
 int  pmSourceSortByY (const void **a, const void **b);
 int  pmSourceSortByX (const void **a, const void **b);

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceOutputs.c

@@ -180 +180 @@
     return true;
 }
-
-// this function decides if the source position should be based on the peak or the moments.
-// this is only used if we know we should not use a model fit position (eg, no model, or no
-// model yet)
-bool pmSourcePositionUseMoments(pmSource *source) {
-
-    if (!source->moments) return false;          // can't if there are no moments
-    if (!source->moments->nPixels) return false; // can't if the moments were not measured
-    if (source->mode && PM_SOURCE_MODE_MOMENTS_FAILURE) return false; // can't if the moments failed...
-
-    if (source->mode & PM_SOURCE_MODE_SATSTAR) return true; // moments are best for SATSTARs
-
-    float dX = source->moments->Mx - source->peak->xf;
-    float dY = source->moments->My - source->peak->yf;
-    float dR = hypot(dX, dY);
-    
-    // only use the moments position if the moment-peak offset is small or the star is saturated
-    if (dR > 1.5) return false
-
-    return true;
-}

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourceOutputs.h

@@ -60 +60 @@
 bool pmSourceOutputsSetMoments (pmSourceOutputsMoments *moments, pmSource *source);
 
-bool pmSourcePositionUseMoments(pmSource *source);
-
 # endif