Changeset 14545 for branches/eam_branch_20070817/psphot/src/pmFootprint.c

Timestamp:

Aug 17, 2007, 11:27:05 AM (19 years ago)

Author:

eugene

Message:

changed APIs pmIsFooBar to pmFooBarTest

changed pmModelGroup to pmModelClass (and rationalized some names)

using pmModelPSFforXY for clearer code

using new pmModel member functions for limits, etc

File:

• branches/eam_branch_20070817/psphot/src/pmFootprint.c (modified) (9 diffs)

branches/eam_branch_20070817/psphot/src/pmFootprint.c

@@ -29 +29 @@
 }
 
-bool pmIsSpan(const psPtr ptr)
+bool pmSpanTest(const psPtr ptr)
 {
     return (psMemGetDeallocator(ptr) == (psFreeFunc)spanFree);
@@ -115 +115 @@
 }
 
-bool pmIsFootprint(const psPtr ptr) {
+bool pmFootprintTest(const psPtr ptr) {
     return (psMemGetDeallocator(ptr) == (psFreeFunc)footprintFree);
 }
@@ -762 +762 @@
    // Set stop bits from peaks list
    //
-   assert (peaks == NULL || peaks->n == 0 || pmIsPeak(peaks->data[0]));
+   assert (peaks == NULL || peaks->n == 0 || pmPeakTest(peaks->data[0]));
    if (peaks != NULL) {
        for (int i = 0; i < peaks->n; i++) {
@@ -859 +859 @@
    }
    const pmFootprint *fp = footprints->data[0];
-   assert(pmIsFootprint((const psPtr)fp));
+   assert(pmFootprintTest((const psPtr)fp));
    const int numCols = fp->region.x1 - fp->region.x0 + 1;
    const int numRows = fp->region.y1 - fp->region.y0 + 1;
@@ -884 +884 @@
 psImage *pmSetFootprintID(const pmFootprint *fp, // the footprint to insert
                           const int id) {       // the desired ID
-   assert(fp != NULL && pmIsFootprint((const psPtr)fp));
+   assert(fp != NULL && pmFootprintTest((const psPtr)fp));
    const int numCols = fp->region.x1 - fp->region.x0 + 1;
    const int numRows = fp->region.y1 - fp->region.y0 + 1;
@@ -910 +910 @@
 psArray *pmGrowFootprintArray(const psArray *footprints, // footprints to grow
                               int r) {  // how much to grow each footprint
-    assert (footprints->n == 0 || pmIsFootprint(footprints->data[0]));
+    assert (footprints->n == 0 || pmFootprintTest(footprints->data[0]));
 
     if (footprints->n == 0) {           // we don't know the size of the footprint's region
@@ -964 +964 @@
                                 const psArray *footprints2, // the other set
                                 const int includePeaks) { // which peaks to set? 0x1 => footprints1, 0x2 => 2
-    assert (footprints1->n == 0 || pmIsFootprint(footprints1->data[0]));
-    assert (footprints2->n == 0 || pmIsFootprint(footprints2->data[0]));
+    assert (footprints1->n == 0 || pmFootprintTest(footprints1->data[0]));
+    assert (footprints2->n == 0 || pmFootprintTest(footprints2->data[0]));
 
     if (footprints1->n == 0 || footprints2->n == 0) {           // nothing to do but put copies on merged
@@ -1032 +1032 @@
                           const psArray *peaks) { // the pmPeaks
     assert (footprints != NULL);
-    assert (footprints->n == 0 || pmIsFootprint(footprints->data[0]));
+    assert (footprints->n == 0 || pmFootprintTest(footprints->data[0]));
     assert (peaks != NULL);
-    assert (peaks->n == 0 || pmIsPeak(peaks->data[0]));
+    assert (peaks->n == 0 || pmPeakTest(peaks->data[0]));
     
     if (footprints->n == 0) {
@@ -1222 +1222 @@
 psArray *pmFootprintArrayToPeaks(const psArray *footprints) {
    assert(footprints != NULL);
-   assert(footprints->n == 0 || pmIsFootprint(footprints->data[0]));
+   assert(footprints->n == 0 || pmFootprintTest(footprints->data[0]));
 
    int npeak = 0;