Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroExtractGhosts.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psastro (modified) (1 prop)
• psastro/src (modified) (1 prop)
• psastro/src/psastroExtractGhosts.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psastro/src

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroExtractGhosts.c

@@ -89 +89 @@
 
                     // XXX can make a more clever model...
-                    float xFPA = -1*ref->FP->x;
-                    float yFPA = -1*ref->FP->y;
+                    double xFPA = -1*ref->FP->x;
+                    double yFPA = -1*ref->FP->y;
 
-                    float xChip, yChip;
-                    pmChip *ghostChip = psastroExtractFindChip (&xChip, &yChip, fpa, xFPA, yFPA);
+                    double xChip, yChip;
+                    pmChip *ghostChip = psastroFindChip (&xChip, &yChip, fpa, xFPA, yFPA);
                     if (!ghostChip) continue;
                     if (!ghostChip->cells) continue;
@@ -107 +107 @@
                     if (ghosts == NULL) { 
                         ghosts = psArrayAllocEmpty (100);
-                        psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.GHOSTS", PS_DATA_ARRAY, "astrometry matches", ghosts);
+                        if (!psMetadataAdd (ghostReadout->analysis, PS_LIST_TAIL, "PSASTRO.GHOSTS", PS_DATA_ARRAY, "astrometry matches", ghosts)) {
+                          psError(PSASTRO_ERR_CONFIG, false, "failure to add ghosts to readout");
+                          return false;
+                        }
                         psFree (ghosts);
                     }
@@ -127 +130 @@
     }
 
+    psastroExtractFreeChipBounds();
+
     psFree (view);
     return true;

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h