Changeset 26748 for branches/eam_branches/psphot.stack.20100120/src/psphot.h

Timestamp:

Jan 31, 2010, 5:01:05 PM (16 years ago)

Author:

eugene

Message:

updates relative to 20091201, fixes for all psphot variants

Location:

branches/eam_branches/psphot.stack.20100120

Files:

• . (modified) (1 prop)
• src/psphot.h (modified) (6 diffs)

branches/eam_branches/psphot.stack.20100120/src/psphot.h

@@ -63 +63 @@
 bool            psphotSubtractBackgroundReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe);
 
-bool            psphotFindDetections (pmConfig *config, const pmFPAview *view);
-bool            psphotFindDetectionsReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe);
+bool            psphotFindDetections (pmConfig *config, const pmFPAview *view, bool firstPass);
+bool            psphotFindDetectionsReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool firstPass);
 
 bool            psphotSourceStats (pmConfig *config, const pmFPAview *view, bool setWindow);
@@ -140 +140 @@
 
 // in psphotChoosePSF.c:
-bool            psphotPSFstats (pmReadout *readout, psMetadata *recipe, pmPSF *psf);
-bool            psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources);
+bool            psphotPSFstats (pmReadout *readout, pmPSF *psf);
+bool            psphotMomentsStats (pmReadout *readout, psArray *sources);
 
 // in psphotGuessModel.c
@@ -147 +147 @@
 
 // in psphotMergeSources.c:
-bool            psphotLoadExtSources (pmConfig *config, const pmFPAview *view, psArray *sources);
+bool            psphotLoadExtSources (pmConfig *config, const pmFPAview *view);
 psArray        *psphotLoadPSFSources (pmConfig *config, const pmFPAview *view);
+bool            psphotRepairLoadedSources (pmConfig *config, const pmFPAview *view);
+bool            psphotCheckExtSources (pmConfig *config, const pmFPAview *view);
 
 // generate the detection structure for the supplied array of sources
-pmDetections   *psphotDetectionsFromSources (pmConfig *config, psArray *sources);
+bool            psphotDetectionsFromSources (pmConfig *config, const pmFPAview *view, psArray *sources);
 
 // generate the detection structure for the supplied array of sources
@@ -159 +161 @@
 // Create a background model for a readout, without saving the result as a pmFPAfile on config->files.  Otherwise identical to psphotModelBackgroundFileIndex.
 psImage        *psphotModelBackgroundReadoutNoFile(pmReadout *readout, const pmConfig *config);
-psImageBinning *psphotBackgroundBinning(const psImage *, const pmConfig *);
+psImageBinning *psphotBackgroundBinning(const psImage *image, const pmConfig *config);
 
 // in psphotReplaceUnfit.c:
@@ -186 +188 @@
 
 // functions to set the correct source pixels
-bool            psphotInitRadiusPSF (const psMetadata *recipe, const pmModelType type);
+bool            psphotInitRadiusPSF(const psMetadata *recipe, const psMetadata *analysis, const pmModelType type);
+
 bool            psphotCheckRadiusPSF (pmReadout *readout, pmSource *source, pmModel *model, psImageMaskType markVal);
 bool            psphotCheckRadiusPSFBlend (pmReadout *readout, pmSource *source, pmModel *model, psImageMaskType markVal, float dR);
@@ -224 +227 @@
 
 bool            psphotLoadPSF (pmConfig *config, const pmFPAview *view);
-bool            psphotLoadPSFReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe);
+bool            psphotLoadPSFReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index);
 
 bool            psphotSetHeaderNstars (psMetadata *recipe, psArray *sources);