Changeset 20443 for branches/cnb_branch_20081011/psastro/src/psastroFixChips.c

Timestamp:

Oct 28, 2008, 1:20:29 PM (18 years ago)

Author:

beaumont

Message:

New plots for fixChips and CommonScale

File:

• branches/cnb_branch_20081011/psastro/src/psastroFixChips.c (modified) (10 diffs)

branches/cnb_branch_20081011/psastro/src/psastroFixChips.c

@@ -109 +109 @@
   }
   xObs->n = yObs->n = xRef->n = yRef->n = nPts;
-        
+
   psPlaneTransform *map = psPlaneTransformAlloc (1, 1);
-  
+
   psVector *mask = psVectorAlloc (nPts, PS_TYPE_U8);
   psVectorInit (mask, 0);
@@ -127 +127 @@
 
   // loop over all chips, select the outliers, and replace the measured astrometry with the model
-  // the measured transformation above must be applied to make the comparison, and also then applied to the 
+  // the measured transformation above must be applied to make the comparison, and also then applied to the
   // model transformation
 
-  psFree (xObs);
-  psFree (yObs);
   psFree (xRef);
   psFree (yRef);
@@ -159 +157 @@
     psPlaneTransformApply (&tmpCoord, refChip->toFPA, &refPixel);
     psPlaneTransformApply (&refCoord, map, &tmpCoord);
-    
+
     psPlane offPixel = {100.0, 0.0, 100.0, 0.0};
     psPlane obsOffPt, refOffPt;
@@ -169 +167 @@
     psPlaneTransformApply (&tmpCoord, refChip->toFPA, &offPixel);
     psPlaneTransformApply (&refOffPt, map, &tmpCoord);
-    
+
     double obsAngle = PM_DEG_RAD*atan2 (obsOffPt.y - obsCoord.y, obsOffPt.x - obsCoord.x);
     double refAngle = PM_DEG_RAD*atan2 (refOffPt.y - refCoord.y, refOffPt.x - refCoord.x);
@@ -183 +181 @@
 
     psLogMsg ("psastro", PS_LOG_INFO, "fixing chip %d, angle: %f, pixel: %f,%f\n",
-              view->chip, obsAngle - refAngle, obsCoord.x - refCoord.x, obsCoord.y - refCoord.y);
+              view->chip, obsAngle - refAngle, obsCoord.x - refCoord.x, obsCoord.y - refCoord.y);
 
     psFree (obsChip->toFPA);
@@ -192 +190 @@
     psPlaneTransform *toFPA = psPlaneTransformAlloc(refChip->toFPA->x->nX, refChip->toFPA->x->nY);
     for (int i = 0; i <= refChip->toFPA->x->nX; i++) {
-        for (int j = 0; j <= refChip->toFPA->x->nY; j++) {
-            double f1 = refChip->toFPA->x->coeffMask[i][j] ? 0.0 : map->x->coeff[1][0]*refChip->toFPA->x->coeff[i][j];
-            double f2 = refChip->toFPA->y->coeffMask[i][j] ? 0.0 : map->x->coeff[0][1]*refChip->toFPA->y->coeff[i][j];
-            toFPA->x->coeff[i][j] = f1 + f2;
-
-            double g1 = refChip->toFPA->x->coeffMask[i][j] ? 0.0 : map->y->coeff[1][0]*refChip->toFPA->x->coeff[i][j];
-            double g2 = refChip->toFPA->y->coeffMask[i][j] ? 0.0 : map->y->coeff[0][1]*refChip->toFPA->y->coeff[i][j];
-            toFPA->y->coeff[i][j] = g1 + g2;
-        }
+        for (int j = 0; j <= refChip->toFPA->x->nY; j++) {
+            double f1 = refChip->toFPA->x->coeffMask[i][j] ? 0.0 : map->x->coeff[1][0]*refChip->toFPA->x->coeff[i][j];
+            double f2 = refChip->toFPA->y->coeffMask[i][j] ? 0.0 : map->x->coeff[0][1]*refChip->toFPA->y->coeff[i][j];
+            toFPA->x->coeff[i][j] = f1 + f2;
+
+            double g1 = refChip->toFPA->x->coeffMask[i][j] ? 0.0 : map->y->coeff[1][0]*refChip->toFPA->x->coeff[i][j];
+            double g2 = refChip->toFPA->y->coeffMask[i][j] ? 0.0 : map->y->coeff[0][1]*refChip->toFPA->y->coeff[i][j];
+            toFPA->y->coeff[i][j] = g1 + g2;
+        }
     }
     toFPA->x->coeff[0][0] += map->x->coeff[0][0];
@@ -209 +207 @@
     obsChip->fromFPA = psPlaneTransformInvert(NULL, obsChip->toFPA, *region, 50);
     psFree (region);
-    
+
     // XXX this stuff below should be applied to each readout...
     // XXX for now, just use first readout
@@ -226 +224 @@
     // the absolute minimum number of stars is 4 (for order = 1)
     if ((rawstars->n < 4) || (refstars->n < 4)) {
-        readout->data_exists = false;
-        psLogMsg ("psastro", 3, "insufficient rawstars (%ld) or refstars (%ld)", 
-                  rawstars->n, refstars->n);
-        continue;
-    } 
+        readout->data_exists = false;
+        psLogMsg ("psastro", 3, "insufficient rawstars (%ld) or refstars (%ld)",
+                  rawstars->n, refstars->n);
+        continue;
+    }
 
     psastroUpdateChipToFPA (input->fpa, obsChip, rawstars, refstars);
@@ -237 +235 @@
     psMetadata *updates = psMemIncrRefCounter (psMetadataLookupMetadata (&status, readout->analysis, "PSASTRO.HEADER"));
     if (!updates) {
-        updates = psMetadataAlloc ();
+        updates = psMetadataAlloc ();
     }
 
     // XXX update the header with info to reflect the failure
     if (!psastroOneChipFit (input->fpa, obsChip, refstars, rawstars, recipe, updates)) {
-        readout->data_exists = false;
-        psLogMsg ("psastro", 3, "failed to find a solution\n");
-        psFree (updates);
-        continue;
+        readout->data_exists = false;
+        psLogMsg ("psastro", 3, "failed to find a solution\n");
+        psFree (updates);
+        continue;
     }
 
@@ -253 +251 @@
   }
 
+  psastroVisualPlotFixChips (input, xObs, yObs);
+  psFree (xObs);
+  psFree (yObs);
   psFree (map);
   psFree (view);