Changeset 39686 for branches/czw_branch/20160809/psastro/src/psastroModelAdjust.c

Timestamp:

Sep 11, 2016, 2:33:18 PM (10 years ago)

Author:

eugene

Message:

add skips for chips without a valid solution (do not just crash); add recipe value for PSASTRO.MODEL.REF.CHIP.ANGLE, the position angle expected for the reference chip for an exposure with PA = 0.0; posAngle needs to be adjusted to match reference chip target value; if the projection is not TAN or DIS when attempting bilevel mosaic fitting, re-fit the projection + distortion to be TAN + distortion

File:

• branches/czw_branch/20160809/psastro/src/psastroModelAdjust.c (modified) (3 diffs)

branches/czw_branch/20160809/psastro/src/psastroModelAdjust.c

@@ -52 +52 @@
         return false; 
     } 
+    float refChipAngleNominal = PS_RAD_DEG*psMetadataLookupF32 (&status, recipe, "PSASTRO.MODEL.REF.CHIP.ANGLE");
+    if (!refChipName) {
+        psError(PS_ERR_IO, true, "reference chip is missing from recipe"); 
+        return false; 
+    } 
 
     // get reference chip from name
@@ -87 +92 @@
     // get the current posangle of the ref chip
     float chipAngle = atan2 (refChip->toFPA->y->coeff[1][0], refChip->toFPA->x->coeff[1][0]);
-    fprintf (stderr, "chipAngle: %f\n", chipAngle*PS_DEG_RAD);
+
+    // chipAngle should be refChipAngleNominal @ POSANGLE = 0.0
+    float posAngleOffset = chipAngle - refChipAngleNominal;
+
+    fprintf (stderr, "chipAngle is: %f, at PA = 0.0, it should be %f, rotating model by %f\n", 
+             chipAngle*PS_DEG_RAD, refChipAngleNominal*PS_DEG_RAD, posAngleOffset*PS_DEG_RAD);
+
     // psMetadataAddF32 (output->fpa->concepts, PS_LIST_TAIL, "FPA.POSANGLE", PS_META_REPLACE, "boresite parameter", posangle);
 
@@ -99 +110 @@
         psRegion *region = pmChipPixels (chip);
 
-        psPlaneTransform *toFPA = psPlaneTransformRotate (NULL, chip->toFPA, chipAngle);
+        psPlaneTransform *toFPA = psPlaneTransformRotate (NULL, chip->toFPA, posAngleOffset);
         psFree (chip->toFPA);
         chip->toFPA = toFPA;