Changeset 34247 for branches/eam_branches/ipp-20120627/psphot/src/psphot.h

Timestamp:

Jul 31, 2012, 11:50:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psphot

Files:

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

branches/eam_branches/ipp-20120627/psphot/src/psphot.h

@@ -102 +102 @@
 bool            psphotMergeSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index);
 
-bool            psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final);
-bool            psphotFitSourcesLinearReadout (psMetadata *recipe, pmReadout *readout, psArray *sources, pmPSF *psf, bool final, pmSourceFitVarMode fitVarMode);
+bool            psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final, bool skipNegativeFluxSources);
+bool            psphotFitSourcesLinearReadout (psMetadata *recipe, pmReadout *readout, psArray *sources, pmPSF *psf, bool final, pmSourceFitVarMode fitVarMode, bool skipNegativeFluxSources);
 
 bool            psphotSourceSize (pmConfig *config, const pmFPAview *view, const char *filerule, bool getPSFsize);
@@ -265 +265 @@
 bool            psphotEllipticalProfile (pmSource *source, bool RAW_RADIUS);
 bool            psphotEllipticalContour (pmSource *source);
+bool            psphotLimitRadialApertures(psMetadata *recipe, long nSources);
 
 // psphotVisual functions
@@ -423 +424 @@
 // bool loadKernel (pmConfig *config, pmReadout *readoutCnv, psphotStackOptions *options, int index);
 
+bool psphotStackSetInputsToSkip(pmConfig *config, const pmFPAview *view, const char *filerule, bool set) ;
+
 bool psphotStackRenormaliseVariance(const pmConfig *config, pmReadout *readout);