Changeset 20307 for trunk/psModules

Timestamp:

Oct 21, 2008, 4:11:36 PM (18 years ago)

Author:

Paul Price

Message:

Propagating changes to psImageInterpolate.h

Location:

trunk/psModules/src

Files:

• camera/pmFPAMaskWeight.c (modified) (1 diff)
• objects/pmModel.c (modified) (3 diffs)
• objects/pmSourcePhotometry.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -453 +453 @@
     psImage *weight = readout->weight;  // Weight map
 
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(mode, image, weight, mask, maskVal,
-                                                                       NAN, NAN, maskBad, maskPoor, poorFrac);
+    psImageInterpolation *interp = psImageInterpolationAlloc(mode, image, weight, mask, maskVal,
+                                                             NAN, NAN, maskBad, maskPoor, poorFrac, 0);
     interp->shifting = false;           // Turn off "exact shifts" so we get proper interpolation
 

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:36:36 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-22 02:11:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -222 +222 @@
     psImage *myRx = NULL;
     psImage *myRy = NULL;
-    psImageInterpolateOptions *Ro = NULL;
-    psImageInterpolateOptions *Rx = NULL;
-    psImageInterpolateOptions *Ry = NULL;
+    psImageInterpolation *Ro = NULL;
+    psImageInterpolation *Rx = NULL;
+    psImageInterpolation *Ry = NULL;
     if (model->residuals && (mode & (PM_MODEL_OP_RES0 | PM_MODEL_OP_RES1))) {
         // if the residual image and object image don't match,
@@ -274 +274 @@
         }
 
-        Ro = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, myRo, NULL, mask, 0, 0.0, 0.0, 1, 0, 0.0);
-        Rx = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, myRx, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0);
-        Ry = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, myRy, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0);
+        Ro = psImageInterpolationAlloc(PS_INTERPOLATE_BILINEAR, myRo, NULL, mask, 0, 0.0, 0.0, 1, 0, 0.0, 0);
+        Rx = psImageInterpolationAlloc(PS_INTERPOLATE_BILINEAR, myRx, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0, 0);
+        Ry = psImageInterpolationAlloc(PS_INTERPOLATE_BILINEAR, myRy, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0, 0);
 
     }

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-13 01:59:05 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-22 02:11:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
     if (source->modelFits) {
       for (int i = 0; i < source->modelFits->n; i++) {
-        pmModel *model = source->modelFits->data[i];
-        status = pmSourcePhotometryModel (&model->mag, model);
+        pmModel *model = source->modelFits->data[i];
+        status = pmSourcePhotometryModel (&model->mag, model);
       }
       if (source->modelEXT) {
-        source->extMag = source->modelEXT->mag;
+        source->extMag = source->modelEXT->mag;
       }
     } else {
       if (source->modelEXT) {
-        status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
+        status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
       }
     }
@@ -177 +177 @@
 
         if (!psImageShiftMask(&flux, &mask, source->pixels, source->maskObj, maskVal, dx, dy,
-                              NAN, 0xff, PS_INTERPOLATE_BICUBE)) {
+                              NAN, 0xff, PS_INTERPOLATE_BIQUADRATIC)) {
             // Not much we can do about it
             psErrorClear();
@@ -256 +256 @@
         }
         if (mode & PM_SOURCE_PHOT_APCORR) {
-            rflux   = pow (10.0, 0.4*source->psfMag);
-            source->apMag -= PS_SQR(model->radiusFit)*rflux * psf->skyBias + psf->skySat / rflux;
+            rflux   = pow (10.0, 0.4*source->psfMag);
+            source->apMag -= PS_SQR(model->radiusFit)*rflux * psf->skyBias + psf->skySat / rflux;
         }
     }
@@ -333 +333 @@
     }
     if (apSum <= 0) {
-        *apMag = NAN;
+        *apMag = NAN;
         return true;
     }