Changeset 25105 for branches/eam_branches/20090715/psphot/src/pmPetrosian.c

Timestamp:

Aug 18, 2009, 6:24:53 AM (17 years ago)

Author:

eugene

Message:

updates for petrosian analysis study

Location:

branches/eam_branches/20090715/psphot/src

Files:

• . (modified) (1 prop)
• pmPetrosian.c (modified) (2 diffs)

branches/eam_branches/20090715/psphot/src

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy

branches/eam_branches/20090715/psphot/src/pmPetrosian.c

@@ -11 +11 @@
 # include "psphotInternal.h"
 
-static void pmPetrosianFree(pmPetrosian *petro)
+static void pmPetrosianFree(pmPetrosian *petrosian)
 {
-   if (!petro) {
+    if (!petrosian) {
         return;
-   }
-   psFree(petrosian->radii);
-   psFree(petrosian->fluxes);
-   psFree(petrosian->theta);
-   psFree(petrosian->isophotalRadii);
+    }
+    psFree(petrosian->radii);
+    psFree(petrosian->fluxes);
+    psFree(petrosian->theta);
+    psFree(petrosian->isophotalRadii);
+
+    psFree(petrosian->radiusElliptical);
+    psFree(petrosian->fluxElliptical);
+
+    psFree(petrosian->binnedFlux);
+    psFree(petrosian->radialBins);
+    psFree(petrosian->area);
 }
 
@@ -32 +39 @@
     petrosian->isophotalRadii = NULL;
 
-    petrosian->axes = {0.0, 0.0, 0.0};
+    petrosian->radiusElliptical = NULL;
+    petrosian->fluxElliptical = NULL;
 
-    return(petrosian);
+    petrosian->radialBins = NULL;
+    petrosian->area = NULL;
+    petrosian->binnedFlux = NULL;
+
+    petrosian->petrosianRadius = NAN;
+    petrosian->petrosianFlux = NAN;
+
+    // petrosian->axes = {0.0, 0.0, 0.0};
+
+    return petrosian;
 }
 
+bool psphotPetrosianFreeVectors(pmPetrosian *petrosian) {
+
+    psFree(petrosian->radii);
+    psFree(petrosian->fluxes);
+    psFree(petrosian->theta);
+    psFree(petrosian->isophotalRadii);
+
+    psFree(petrosian->radiusElliptical);
+    psFree(petrosian->fluxElliptical);
+
+    psFree(petrosian->binnedFlux);
+    psFree(petrosian->radialBins);
+    psFree(petrosian->area);
+
+    petrosian->radii = NULL;
+    petrosian->fluxes = NULL;
+    petrosian->theta = NULL;
+    petrosian->isophotalRadii = NULL;
+
+    petrosian->radiusElliptical = NULL;
+    petrosian->fluxElliptical = NULL;
+
+    petrosian->radialBins = NULL;
+    petrosian->area = NULL;
+    petrosian->binnedFlux = NULL;
+    
+    return true;
+}
+
+# define COMPARE_INDEX(A,B) (index->data.F32[A] < index->data.F32[B])
+# define SWAP_INDEX(TYPE,A,B) { \
+  float tmp; \
+  if (A != B) { \
+    tmp = index->data.F32[A]; \
+    index->data.F32[A] = index->data.F32[B]; \
+    index->data.F32[B] = tmp; \
+    tmp = extra->data.F32[A]; \
+    extra->data.F32[A] = extra->data.F32[B]; \
+    extra->data.F32[B] = tmp; \
+  } \
+}
+
+bool psphotPetrosianSortPair (psVector *index, psVector *extra) {
+
+    // sort the vector set by the radius
+    PSSORT (index->n, COMPARE_INDEX, SWAP_INDEX, NONE);
+    return true;
+}

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy