Changeset 39782

Timestamp:

Oct 18, 2016, 4:58:00 PM (10 years ago)

Author:

watersc1

Message:

Fix missing ROT_PARITY information by sticking it directly into the FP table of the astrometry model.

Location:

branches/czw_branch/20160809

Files:

• psModules/src/astrom/pmAstrometryModel.c (modified) (4 diffs)
• psastro/src/psastroModelAdjust.c (modified) (3 diffs)

branches/czw_branch/20160809/psModules/src/astrom/pmAstrometryModel.c

@@ -320 +320 @@
     // the PosZero is the offset between the reported and actual POSANGLE values
     float PosZero = psMetadataLookupF32 (&status, file->fpa->concepts, "FPA.POS_ZERO");  /// XXX be consistent with degrees v radians
+    // Indicate which direction the position angle goes
+    int rotParity = psMetadataLookupS32 (&status, file->fpa->concepts, "FPA.ROT_PARITY");
     char *refChip = psMetadataLookupStr (&status, file->fpa->concepts, "FPA.REF.CHIP");
 
@@ -349 +351 @@
 
     psMetadataAddF32(row,    PS_LIST_TAIL, "POS_ZERO", PS_META_REPLACE, "POSANGLE offset (degrees)", PosZero);
+    psMetadataAddS32(row,    PS_LIST_TAIL, "ROT_PARITY", PS_META_REPLACE, "rotator parity", rotParity);
     psMetadataAddStr(row,    PS_LIST_TAIL, "REF_CHIP", PS_META_REPLACE, "reference chip for model", refChip);
 
@@ -624 +627 @@
     TRANSFER (file->fpa->concepts, row, "BORE_P0");
     TRANSFER (file->fpa->concepts, row, "POS_ZERO");
+    TRANSFER (file->fpa->concepts, row, "ROT_PARITY");
     TRANSFER (file->fpa->concepts, row, "REF_CHIP");
 
@@ -687 +691 @@
     char *refChip  = psMetadataLookupStr(&status, file->fpa->concepts, "REF_CHIP"); REQUIRE (status, "missing REF_CHIP");
 
-    int rotatorParity = psMetadataLookupS32(&status, file->fpa->concepts, "FPA.ROT.PARITY"); REQUIRE (status, "missing ROT.PARITY");
+    int rotatorParity = psMetadataLookupS32(&status, file->fpa->concepts, "ROT_PARITY"); REQUIRE (status, "missing ROT_PARITY");
     
     // XXX we've swapped the sign and parity of POS (add to model)

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

@@ -28 +28 @@
     }
 
+
+    
     // if we have not measured the boresite position, no adjustment is needed
     bool fitBoresite = psMetadataLookupBool (&status, recipe, "PSASTRO.MODEL.FIT.BORESITE");
@@ -60 +62 @@
     int rotatorParity = psMetadataLookupS32(&status, recipe, "PSASTRO.MODEL.ROT.PARITY");
     if (!status) psAbort ("Can't find recipe option PSASTRO.MODEL.ROT.PARITY");
-    psMetadataAddS32 (output->fpa->concepts, PS_LIST_TAIL, "FPA.ROT.PARITY", PS_META_REPLACE, "rotator parity parameter", rotatorParity);
+    psMetadataAddS32 (output->fpa->concepts, PS_LIST_TAIL, "FPA.ROT_PARITY", PS_META_REPLACE, "rotator parity parameter", rotatorParity);
     
     // get reference chip from name
@@ -150 +152 @@
 
     psMetadata *header = output->fpa->hdu->header;
+    
     pmAstromWriteBilevelMosaic (header, output->fpa, NONLIN_TOL);