Changeset 21087 for branches/eam_branch_20081230/psphot/src/psphotModelWithPSF.c

Timestamp:

Jan 6, 2009, 7:13:34 AM (18 years ago)

Author:

eugene

Message:

update to psImageMaskType and associated (psphot, psastro, ppImage, ppMerge, ppSim, ppStats, ppArith)

File:

• branches/eam_branch_20081230/psphot/src/psphotModelWithPSF.c (modified) (9 diffs)

branches/eam_branch_20081230/psphot/src/psphotModelWithPSF.c

@@ -20 +20 @@
         paramMask = constraint->paramMask;
         if (paramMask != NULL) {
-            PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, false);
+          PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_TYPE, false);
             PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, false);
         }
@@ -145 +145 @@
         psImageInit (covar, 0.0);
         for (int j = 0, J = 0; j < params->n; j++) {
-            if (paramMask && (paramMask->data.U8[j])) {
+            if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[j])) {
                 covar->data.F32[j][j] = 1.0;
                 continue;
             }
             for (int k = 0, K = 0; k < params->n; k++) {
-                if (paramMask && (paramMask->data.U8[k])) continue;
+                if (paramMask && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[k])) continue;
                 covar->data.F32[j][k] = Alpha->data.F32[J][K];
                 K++;
@@ -197 +197 @@
     PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, false);
     if (paramMask) {
-        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, false);
     }
 
@@ -224 +224 @@
             // XXX probably should not skipped masked points: 
             // XXX skip if convolution of unmasked pixels will not see this pixel
-            // if (source->maskObj->data.U8[i][j]) {
+            // if (source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j]) {
             // continue;
             // }
@@ -246 +246 @@
 
             for (int n = 0; n < params->n; n++) {
-                if ((paramMask != NULL) && (paramMask->data.U8[n])) { continue; }
+                if ((paramMask != NULL) && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n])) { continue; }
                 psImage *dmodel = pcm->dmodels->data[n];
                 dmodel->data.F32[i][j] = deriv->data.F32[n];
@@ -285 +285 @@
             // XXX are we doing the right thing with the mask?
             // skip masked points
-            if (source->maskObj->data.U8[i][j]) {
+            if (source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j]) {
                 continue;
             }
@@ -308 +308 @@
             // alpha & beta only contain unmasked elements 
             for (int n1 = 0, N1 = 0; n1 < params->n; n1++) {
-                if ((paramMask != NULL) && (paramMask->data.U8[n1])) continue;
+                if ((paramMask != NULL) && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n1])) continue;
                 psImage *dmodel = pcm->dmodelsConv->data[n1];
                 float weight = dmodel->data.F32[i][j] * yweight;
                 for (int n2 = 0, N2 = 0; n2 <= n1; n2++) {
-                    if ((paramMask != NULL) && (paramMask->data.U8[n2])) continue;
+                    if ((paramMask != NULL) && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n2])) continue;
                     dmodel = pcm->dmodelsConv->data[n2];
                     alpha->data.F32[N1][N2] += weight * dmodel->data.F32[i][j];
@@ -357 +357 @@
     for (psS32 n = 0; n < params->n; n++) {
         pcm->dmodels->data[n] = NULL;
-        if ((paramMask != NULL) && (paramMask->data.U8[n])) { continue; }
+        if ((paramMask != NULL) && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n])) { continue; }
         pcm->dmodels->data[n] = psImageCopy (NULL, source->pixels, PS_TYPE_F32);
     }
@@ -366 +366 @@
     for (psS32 n = 0; n < params->n; n++) {
         pcm->dmodelsConv->data[n] = NULL;
-        if ((paramMask != NULL) && (paramMask->data.U8[n])) { continue; }
+        if ((paramMask != NULL) && (paramMask->data.PS_TYPE_VECTOR_MASK_DATA[n])) { continue; }
         pcm->dmodelsConv->data[n] = psImageCopy (NULL, source->pixels, PS_TYPE_F32);
     }