Changeset 31606 for branches/czw_branch/20110406/pswarp/src/pswarpTransformSources.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpTransformSources.c (modified) (2 diffs)

branches/czw_branch/20110406/pswarp/src/pswarpTransformSources.c

@@ -101 +101 @@
         new->psfMag = source->psfMag;
         new->extMag = source->extMag;
-        new->errMag = source->errMag;
+        new->psfMagErr = source->psfMagErr;
         new->apMag = source->apMag;
         new->pixWeightNotBad = source->pixWeightNotBad;
@@ -116 +116 @@
           (isfinite(new->psfMag) ? pow(10.0, -0.4*new->psfMag) : NAN);
         new->modelPSF->dparams->data.F32[PM_PAR_I0]=
-          (isfinite(new->psfMag) ? new->errMag*pow(10.0, -0.4*new->psfMag) : NAN);
+          (isfinite(new->psfMag) ? new->psfMagErr*pow(10.0, -0.4*new->psfMag) : NAN);
 
 #if 0