Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psphot/src

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphot.h (modified) (5 diffs)
• psphot/src/psphotCleanup.c (modified) (1 diff)
• psphot/src/psphotDetect.h (modified) (1 diff)
• psphot/src/psphotFitSourcesLinear.c (modified) (5 diffs)
• psphot/src/psphotMaskReadout.c (modified) (1 diff)
• psphot/src/psphotReadout.c (modified) (1 diff)
• psphot/src/psphotReadoutFindPSF.c (modified) (1 diff)
• psphot/src/psphotReadoutKnownSources.c (modified) (1 diff)
• psphot/src/psphotReadoutMinimal.c (modified) (1 diff)
• psphot/src/psphotStandAlone.h (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphot.h

@@ -23 +23 @@
 
 bool            psphotModelTest (pmConfig *config, const pmFPAview *view, psMetadata *recipe);
-bool            psphotInit ();
+bool            psphotInit (void);
 bool            psphotReadout (pmConfig *config, const pmFPAview *view);
 bool            psphotReadoutFindPSF(pmConfig *config, const pmFPAview *view, psArray *inSources);
@@ -35 +35 @@
 
 // XXX test functions
-psArray        *psphotFakeSources ();
+psArray        *psphotFakeSources (void);
 
 // psphotReadout functions
@@ -76 +76 @@
 
 // thread-related:
-bool            psphotSetThreads ();
+bool            psphotSetThreads (void);
 bool            psphotChooseCellSizes (int *Cx, int *Cy, pmReadout *readout, int nThreads);
 bool            psphotCoordToCell (int *group, int *cell, float x, float y, int Cx, int Cy);
@@ -136 +136 @@
 bool            psphotPlotMoments (pmConfig *config, pmFPAview *view, psArray *sources);
 bool            psphotPlotPSFModel (pmConfig *config, pmFPAview *view, psArray *sources);
-bool            psphotFitInit ();
-bool            psphotFitSummary ();
+bool            psphotFitInit (int nThreads);
+bool            psphotFitSummary (void);
 
 bool            psphotMergeSources (psArray *oldSources, psArray *newSources);
@@ -230 +230 @@
 psImage *pmPCMDataSaveImage (pmPCMData *pcm);
 
-int psphotKapaOpen ();
-bool psphotKapaClose ();
+int psphotKapaOpen (void);
+bool psphotKapaClose (void);
 bool psphotImageBackgroundCellHistogram (psVector *values, float mean, float sigma, int ix, int iy);
 bool psphotDiagnosticPlots (const pmConfig *config, const char *name, ...);

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotCleanup.c

@@ -18 +18 @@
 }
 
-psExit psphotGetExitStatus () {
+psExit psphotGetExitStatus (void) {
 
     psErrorCode err = psErrorCodeLast ();
     switch (err) {
       case PS_ERR_NONE:
-        return PS_EXIT_SUCCESS;
+        return PS_EXIT_SUCCESS;
       case PSPHOT_ERR_SYS:
         return PS_EXIT_SYS_ERROR;

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotDetect.h

@@ -19 +19 @@
 bool        psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile);
 void        psphotCleanup (pmConfig *config);
-psExit      psphotGetExitStatus ();
+psExit      psphotGetExitStatus (void);
 
 #endif

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotFitSourcesLinear.c

@@ -63 +63 @@
         pmSource *source = sources->data[i];
 
-        // turn this bit off and turn it on again if we pass this test
-        source->mode &= ~PM_SOURCE_MODE_LINEAR_FIT;
+        // turn this bit off and turn it on again if we pass this test
+        source->mode &= ~PM_SOURCE_MODE_LINEAR_FIT;
 
         // skip non-astronomical objects (very likely defects)
@@ -70 +70 @@
         if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
 
-        // do not include CRs in the full ensemble fit
+        // do not include CRs in the full ensemble fit
         if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
 
@@ -94 +94 @@
         if (y > AnalysisRegion.y1) continue;
 
-        source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
+        source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
         psArrayAdd (fitSources, 100, source);
     }
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f sec (%ld objects)\n", psTimerMark ("psphot.linear"), sources->n);
+
+    if (fitSources->n == 0) {
+        return true;
+    }
 
     // vectors to store stats for each object
@@ -189 +193 @@
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "solve matrix: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
 
-    // XXXX **** philosophical question: 
+    // XXXX **** philosophical question:
     // we measure bright objects in three passes: 1) linear fit; 2) non-linear fit; 3) linear fit:
-    // should retain the chisq and errors from the intermediate non-linear fit? 
-    // the non-linear fit provides better values for the position errors, and for 
+    // should retain the chisq and errors from the intermediate non-linear fit?
+    // the non-linear fit provides better values for the position errors, and for
     // extended sources, the shape errors
 
@@ -218 +222 @@
     for (int i = 0; final && (i < fitSources->n); i++) {
         pmSource *source = fitSources->data[i];
-        if (source->mode & PM_SOURCE_MODE_NONLINEAR_FIT) continue;
+        if (source->mode & PM_SOURCE_MODE_NONLINEAR_FIT) continue;
         pmModel *model = pmSourceGetModel (NULL, source);
         pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal);

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotMaskReadout.c

@@ -12 +12 @@
     psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.SAT", PS_META_REPLACE, "user-defined mask", maskSat);
 
-    psImageMaskType maskBad  = pmConfigMaskGet("BAD", config); // Mask value for bad pixels
+    psImageMaskType maskBad  = pmConfigMaskGet("LOW", config); // Mask value for low pixels
+    if (!maskBad) {
+        // XXX: for backward compatability look up old name
+        maskBad  = pmConfigMaskGet("BAD", config);
+    }
     psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.BAD", PS_META_REPLACE, "user-defined mask", maskBad);
 

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotReadout.c

@@ -2 +2 @@
 
 // this should be called by every program that links against libpsphot
-bool psphotInit () {
+bool psphotInit (void) {
 
     psphotErrorRegister();              // register our error codes/messages

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotReadoutFindPSF.c

@@ -11 +11 @@
     if (!recipe) {
         psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
+        return false;
+    }
+
+    // set the photcode for this image
+    if (!psphotAddPhotcode(recipe, config, view, "PSPHOT.INPUT")) {
+        psError(PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
     }

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotReadoutKnownSources.c

@@ -11 +11 @@
     if (!recipe) {
         psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
+        return false;
+    }
+
+    // set the photcode for this image
+    if (!psphotAddPhotcode(recipe, config, view, "PSPHOT.INPUT")) {
+        psError(PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
     }

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotReadoutMinimal.c

@@ -19 +19 @@
     if (!recipe) {
         psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
+        return false;
+    }
+
+    // set the photcode for this image
+    if (!psphotAddPhotcode(recipe, config, view, "PSPHOT.INPUT")) {
+        psError(PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
     }

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotStandAlone.h

@@ -17 +17 @@
 bool            psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile);
 void            psphotCleanup (pmConfig *config);
-psExit          psphotGetExitStatus ();
+psExit          psphotGetExitStatus (void);
 
 #endif