Changeset 25971

Timestamp:

Oct 30, 2009, 2:15:14 PM (17 years ago)

Author:

bills

Message:

rename backgroundBinning psphotBackgroundBinning and make it an extern function

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotModelBackground.c (modified) (4 diffs)

trunk/psphot/src/psphot.h

@@ -42 +42 @@
 bool            psphotModelBackground (pmConfig *config, const pmFPAview *view, const char *filename);
 bool            psphotSubtractBackground (pmConfig *config, const pmFPAview *view, const char *filename) ;
+
+psImageBinning *psphotBackgroundBinning(const psImage *, const pmConfig *);
+
 pmDetections   *psphotFindDetections (pmDetections *detections, pmReadout *readout, psMetadata *recipe);
 

trunk/psphot/src/psphotModelBackground.c

@@ -5 +5 @@
 // Determine the binning characteristics for the background model
 // Sets the ruff image size and skip based on recipe values for the binning
-static psImageBinning *backgroundBinning(const psImage *image, // Image for which to generate a bg model
+psImageBinning *psphotBackgroundBinning(const psImage *image, // Image for which to generate a bg model
                                          const pmConfig *config // Configuration
                                          )
@@ -27 +27 @@
     return binning;
 }
+
 
 // Generate the background model
@@ -335 +336 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    psImageBinning *binning = backgroundBinning(ro->image, config); // Image binning parameters
+    psImageBinning *binning = psphotBackgroundBinning(ro->image, config); // Image binning parameters
     psImage *model = psImageAlloc(binning->nXruff, binning->nYruff, PS_TYPE_F32); // Background model
     psImage *modelStdev = psImageAlloc(binning->nXruff, binning->nYruff, PS_TYPE_F32); // Standard deviation
@@ -363 +364 @@
     pmReadout *readout = pmFPAviewThisReadout(view, inFPA);
 
-    psImageBinning *binning = backgroundBinning(readout->image, config); // Image binning parameters
+    psImageBinning *binning = psphotBackgroundBinning(readout->image, config); // Image binning parameters
     pmReadout *model = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL", inFPA, binning);
     pmReadout *modelStdev = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL.STDEV", inFPA, binning);