Changeset 36635 for trunk/ppBackground/src/ppBackgroundStackMath.c

Timestamp:

Apr 2, 2014, 1:13:06 PM (12 years ago)

Author:

watersc1

Message:

This version appears to complete and generate the expected output products. Now to test and tune the parameters.

File:

• trunk/ppBackground/src/ppBackgroundStackMath.c (modified) (6 diffs)

trunk/ppBackground/src/ppBackgroundStackMath.c

@@ -94 +94 @@
       psImage *dec   = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg dec");
       
-      psVector *obs  = psVectorAlloc(image->numRows * image->numCols, PS_TYPE_F32);
-      psVector *model= psVectorAlloc(image->numRows * image->numCols, PS_TYPE_F32);
+      psVector *obs  = psVectorAllocEmpty(image->numRows, PS_TYPE_F32);
+      psVector *model= psVectorAllocEmpty(image->numRows, PS_TYPE_F32);
       
       for (v = 0; v < image->numRows; v++) {
         for (u = 0; u < image->numCols; u++) {
-          obs->data.F32[v * image->numCols + u] = image->data.F32[v][u];
-          model->data.F32[v * image->numCols + u] = psImageMapEval(data->modelMap,ra->data.F32[v][u],dec->data.F32[v][u]);
+          if ((ra->data.F32[v][u] < data->x_min)||(ra->data.F32[v][u] > data->x_max)||
+              (dec->data.F32[v][u] < data->y_min)||(dec->data.F32[v][u] > data->y_max)) { continue; }
+          psVectorAppend(obs,image->data.F32[v][u]);
+          psVectorAppend(model, psImageMapEval(data->modelMap,ra->data.F32[v][u],dec->data.F32[v][u]));
+          //      obs->data.F32[v * image->numCols + u] = image->data.F32[v][u];
+          //      model->data.F32[v * image->numCols + u] = psImageMapEval(data->modelMap,ra->data.F32[v][u],dec->data.F32[v][u]);
         }
       }
@@ -140 +144 @@
       psImage *model = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg calibrated data");
       psImage *camera= psMetadataLookupPtr(NULL, data->OTA_solutions, chipName);
+      psImage *ra    = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg ra");
+      psImage *dec   = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg dec");
       
       psF32 offset = psMetadataLookupF32(NULL,chipItem->data.md,"bkg offset");
@@ -146 +152 @@
       for (v = 0; v < image->numRows; v++) {
         for (u = 0; u < image->numCols; u++) {
+          if ((ra->data.F32[v][u] < data->x_min)||(ra->data.F32[v][u] > data->x_max)||
+              (dec->data.F32[v][u] < data->y_min)||(dec->data.F32[v][u] > data->y_max)) { continue; }
+
           model->data.F32[v][u] = scale * image->data.F32[v][u] - offset - camera->data.F32[v][u];
         }
@@ -164 +173 @@
   int u,v;
 
+  long used;
   psS16 N = psMetadataLookupS16(NULL, data->models, "N");
-  psVector *X = psVectorAlloc(N * 60 * 13 * 13,PS_TYPE_F32);
-  psVector *Y = psVectorAlloc(N * 60 * 13 * 13,PS_TYPE_F32);
-  psVector *Z = psVectorAlloc(N * 60 * 13 * 13,PS_TYPE_F32);
-  psVector *E = psVectorAlloc(N * 60 * 13 * 13,PS_TYPE_F32);
-  psVector *mask = psVectorAlloc(N * 60 * 13 * 13,PS_TYPE_VECTOR_MASK);
+  psVector *X = psVectorAllocEmpty(N * 13 * 13,PS_TYPE_F32);
+  psVector *Y = psVectorAllocEmpty(N * 13 * 13,PS_TYPE_F32);
+  psVector *Z = psVectorAllocEmpty(N * 13 * 13,PS_TYPE_F32);
+  psVector *E = psVectorAllocEmpty(N * 13 * 13,PS_TYPE_F32);
+  psVector *mask = psVectorAllocEmpty(N * 13 * 13,PS_TYPE_VECTOR_MASK);
   j = 0;
   
@@ -187 +197 @@
       psImage *ra    = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg ra");
       psImage *dec   = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg dec");
+      //      psImage *model = psMetadataLookupPtr(NULL, chipItem->data.md, "bkg image");
       for (v = 0; v < calib->numRows; v++) {
         for (u = 0; u < calib->numCols; u++) {
-          X->data.F32[j] = ra->data.F32[v][u];
-          Y->data.F32[j] = dec->data.F32[v][u];
-          Z->data.F32[j] = calib->data.F32[v][u];
-          E->data.F32[j] = 1.0;
-          mask->data.PS_TYPE_VECTOR_MASK_DATA[j] = 0;
+          if ((ra->data.F32[v][u] < data->x_min)||(ra->data.F32[v][u] > data->x_max)||
+              (dec->data.F32[v][u] < data->y_min)||(dec->data.F32[v][u] > data->y_max)) {
+            j++;            
+            continue; }
+          psVectorAppend(X,ra->data.F32[v][u]);
+          psVectorAppend(Y,dec->data.F32[v][u]);
+          psVectorAppend(Z,calib->data.F32[v][u]);
+          psVectorAppend(E,1.0);
+          psVectorAppend(mask,0);
+/*        X->data.F32[j] = ra->data.F32[v][u]; */
+/*        Y->data.F32[j] = dec->data.F32[v][u]; */
+/*        Z->data.F32[j] = calib->data.F32[v][u]; */
+/*        E->data.F32[j] = 1.0; */
+/*        mask->data.PS_TYPE_VECTOR_MASK_DATA[j] = 0; */
+          used++;
           j++;
+          
+/*        printf("DATA %ld %ld %f %f %f %f\n", */
+/*               j,used, */
+/*               ra->data.F32[v][u], */
+/*               dec->data.F32[v][u], */
+/*               calib->data.F32[v][u], */
+/*               model->data.F32[v][u]); */
+                 
         }
       }
@@ -200 +229 @@
     psFree(chipIter);
   } // End smfs
-
+  printf("%ld %ld\n", j,used);
   bool fitStatus;
-  bool status = psImageMapClipFit(&fitStatus,data->modelMap,stats, mask, 0, X, Y, Z, E);
+  bool status = psImageMapClipFit(&fitStatus,data->modelMap,stats, mask, 1, X, Y, Z, E);
 
   psFree(expIter);