Changeset 31451 for trunk/psModules/src/objects/pmPeaks.c

Timestamp:

May 5, 2011, 11:02:53 AM (15 years ago)

Author:

eugene

Message:

merge updates from eam branch 20110404

File:

• trunk/psModules/src/objects/pmPeaks.c (modified) (3 diffs)

trunk/psModules/src/objects/pmPeaks.c

@@ -150 +150 @@
     tmp->x = x;
     tmp->y = y;
+    tmp->xf = x;
+    tmp->yf = y;
+    tmp->dx = NAN;
+    tmp->dy = NAN;
     tmp->detValue        = value;
     tmp->rawFlux         = value; // set this by default: it is up to the user to supply a better value
@@ -155 +159 @@
     tmp->smoothFlux      = value; // set this by default: it is up to the user to supply a better value
     tmp->smoothFluxStdev = NAN;
-    // tmp->SN = 0;
-    tmp->xf = x;
-    tmp->yf = y;
     tmp->assigned = false;
     tmp->type = type;
@@ -166 +167 @@
     psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__);
     return(tmp);
+}
+
+// copy to an already allocated peak
+bool pmPeakCopy(pmPeak *out, pmPeak *in)
+{
+    out->x               = in->x;
+    out->y               = in->y;
+    out->xf              = in->xf;
+    out->yf              = in->yf;
+    out->dx              = in->dx;
+    out->dy              = in->dy;
+    out->detValue        = in->detValue;
+    out->rawFlux         = in->rawFlux;
+    out->rawFluxStdev    = in->rawFluxStdev;
+    out->smoothFlux      = in->smoothFlux;
+    out->smoothFluxStdev = in->smoothFluxStdev;
+    out->assigned        = in->assigned;
+    out->type            = in->type;
+
+    return true;
 }