Changeset 20033 for branches/cnb_branch_20080830/psastro/src/psastroChooseRefstars.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)
• psastroChooseRefstars.c (modified) (3 diffs)

branches/cnb_branch_20080830/psastro/src

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

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

branches/cnb_branch_20080830/psastro/src/psastroChooseRefstars.c

@@ -51 +51 @@
         psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-        if (!chip->fromFPA) { continue; }
+        if (!chip->fromFPA) { continue; }
 
         while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
@@ -62 +62 @@
                 if (! readout->data_exists) { continue; }
 
-                psRegion *extent = pmReadoutExtent (readout);
-                if (!extent) {
-                    psError(PSASTRO_ERR_CONFIG, true, "Can't find readout size!\n");
-                    return NULL;
-                }
+                psRegion *extent = pmReadoutExtent (readout);
+                if (!extent) {
+                    psError(PSASTRO_ERR_CONFIG, true, "Can't find readout size!\n");
+                    return NULL;
+                }
 
-                int Nx = abs(extent->x1 - extent->x0);
-                int Ny = abs(extent->y1 - extent->y0);
+                int Nx = abs(extent->x1 - extent->x0);
+                int Ny = abs(extent->y1 - extent->y0);
 
                 float minX = -fieldPadding*Nx;
@@ -98 +98 @@
                     psFree (ref);
 
-                    if (nMax && (refstars->n >= nMax)) break;
+                    if (nMax && (refstars->n >= nMax)) break;
                 }
                 psTrace ("psastro", 4, "Added %ld refstars\n", refstars->n);
 
-                psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.REFSTARS", PS_DATA_ARRAY, "astrometry matches", refstars);
-                psFree (refstars);
-                psFree (extent);
+                psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.REFSTARS", PS_DATA_ARRAY, "astrometry matches", refstars);
+                psFree (refstars);
+                psFree (extent);
 
-                if (matchLumFunc) {
-                    // in this case, no PSASTRO.REFSTARS is added to readout->analysis
-                    if (!psastroRefstarSubset (readout)) {
-                        psError(PSASTRO_ERR_DATA, false, "Can't determine an appropriate refstar subset\n");
-                        psFree (index);
-                        psFree (view);
-                        return false;
-                    }
-                }
+                if (matchLumFunc) {
+                    // in this case, no PSASTRO.REFSTARS is added to readout->analysis
+                    if (!psastroRefstarSubset (readout)) {
+                        psError(PSASTRO_ERR_DATA, false, "Can't determine an appropriate refstar subset\n");
+                        psFree (index);
+                        psFree (view);
+                        return false;
+                    }
+                }
             }
         }
-        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
     }
     if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;

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