Changeset 28821

Timestamp:

Aug 1, 2010, 4:38:52 PM (16 years ago)

Author:

eugene

Message:

moved pmPhotObjSortByX to psModules

Location:

branches/eam_branches/ipp-20100621

Files:

• psModules/src/objects/pmPhotObj.c (modified) (1 diff)
• psModules/src/objects/pmPhotObj.h (modified) (1 diff)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotFitSourcesLinearStack.c (modified) (1 diff)

branches/eam_branches/ipp-20100621/psModules/src/objects/pmPhotObj.c

@@ -103 +103 @@
     return (0);
 }
+
+// sort by X (ascending)
+int pmPhotObjSortByX (const void **a, const void **b)
+{
+    pmPhotObj *objA = *(pmPhotObj **)a;
+    pmPhotObj *objB = *(pmPhotObj **)b;
+
+    psF32 fA = objA->x;
+    psF32 fB = objB->x;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (+1);
+    if (diff < FLT_EPSILON) return (-1);
+    return (0);
+}

branches/eam_branches/ipp-20100621/psModules/src/objects/pmPhotObj.h

@@ -42 +42 @@
 
 int pmPhotObjSortBySN (const void **a, const void **b);
+int pmPhotObjSortByX (const void **a, const void **b);
 
 /// @}

branches/eam_branches/ipp-20100621/psphot/src/psphot.h

@@ -328 +328 @@
 
 bool psphotFitSourcesLinearStack (pmConfig *config, psArray *objects, bool final);
-int pmPhotObjSortBySN (const void **a, const void **b);
-int pmPhotObjSortByX (const void **a, const void **b);
 
 typedef enum {

branches/eam_branches/ipp-20100621/psphot/src/psphotFitSourcesLinearStack.c

@@ -170 +170 @@
     return true;
 }
-
-// sort by X (ascending)
-int pmPhotObjSortByX (const void **a, const void **b)
-{
-    pmPhotObj *objA = *(pmPhotObj **)a;
-    pmPhotObj *objB = *(pmPhotObj **)b;
-
-    psF32 fA = objA->x;
-    psF32 fB = objB->x;
-
-    psF32 diff = fA - fB;
-    if (diff > FLT_EPSILON) return (+1);
-    if (diff < FLT_EPSILON) return (-1);
-    return (0);
-}