Changeset 20033 for branches/cnb_branch_20080830/psastro/src/psastroMosaicGradients.c

Timestamp:

Oct 9, 2008, 2:39:01 PM (18 years ago)

Author:

beaumont

Message:

merged mainline into branch. resolved conflicts. added plots.

Location:

branches/cnb_branch_20080830/psastro/src

Files:

• . (modified) (1 prop)
• psastroMosaicGradients.c (modified) (4 diffs)

branches/cnb_branch_20080830/psastro/src

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

branches/cnb_branch_20080830/psastro/src/psastroMosaicGradients.c

@@ -2 +2 @@
 static int nPass = 0;
 
-bool psastroMosaicGradients (pmFPA *fpa, psMetadata *recipe) {
+bool psastroMosaicDistortionFromGradients (pmFPA *fpa, psMetadata *recipe) {
 
     bool status;
@@ -9 +9 @@
     pmReadout *readout = NULL;
     psArray *gradients = NULL;
+
+    // Measure the gradient as a function of position.  This must be performed between the
+    // corrected ref->TP and the observed raw->FP, for which the distortion is a perturbation.
 
     pmFPAview *view = pmFPAviewAlloc (0);
@@ -59 +62 @@
     }
 
+    // Fit the gradient field and convert to the distortion terms.
+
     // allocate mosaic-level polynomial transformation and set masks needed by DVO
     int order = psMetadataLookupF32 (&status, recipe, "PSASTRO.MOSAIC.ORDER");
@@ -95 +100 @@
     }
         
-    if (!psastroMosaicSetAstrom (fpa)) {
-        psError(PSASTRO_ERR_UNKNOWN, false, "failed to apply mosaic distortion terms\n");
-        psFree (gradients);
-        psFree (view);
-        return false;
-    }
-
     psFree (gradients);
     psFree (view);
     return true;
 }
+

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit