Changeset 36834 for trunk/psModules/src/astrom/pmAstrometryModel.c

Timestamp:

Jun 7, 2014, 6:37:32 AM (12 years ago)

Author:

eugene

Message:

add Koppenhoefer correction; move pmConceptsChipNumberFromName & pmConceptsChipFromName to pmConcepts; clean up some visuals; change pmSourceIO_MatchedRefs to use PSASTRO.RAWSTARS.SUBSET, PSASTRO.REFSTARS.SUBSET instead of PSASTRO.RAWSTARS, PSASTRO.REFSTARS; modify the output fields in MATCHED_REFS; clip e0 outliers from psf model construction

File:

• trunk/psModules/src/astrom/pmAstrometryModel.c (modified) (2 diffs)

trunk/psModules/src/astrom/pmAstrometryModel.c

@@ -39 +39 @@
 #include "pmFPAExtent.h"
 #include "pmFPAfileFitsIO.h"
+#include "pmConcepts.h"
 #include "pmAstrometryWCS.h"
 #include "pmAstrometryUtils.h"
@@ -452 +453 @@
 }
 
-int pmConceptsChipNumberFromName (pmFPA *fpa, char *name) {
-
-    for (int i = 0; i < fpa->chips->n; i++) {
-        pmChip *chip = fpa->chips->data[i];
-        if (!chip) continue;
-        char *thisone = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
-        if (!thisone) continue;
-        if (!strcmp (name, thisone)) return (i);
-    }
-    return -1;
-}
-
-pmChip *pmConceptsChipFromName (pmFPA *fpa, char *name) {
-
-    for (int i = 0; i < fpa->chips->n; i++) {
-        pmChip *chip = fpa->chips->data[i];
-        if (!chip) continue;
-        char *thisone = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
-        if (!thisone) continue;
-        if (!strcmp (name, thisone)) return (chip);
-    }
-    return NULL;
-}
-
 // first layer converts Chip to Focal Plane
 bool pmAstromModelReadChips (pmFPAfile *file) {