Changeset 7311 for trunk/psModules/src/objects/pmPSF.h

Timestamp:

Jun 2, 2006, 3:02:08 PM (20 years ago)

Author:

Paul Price

Message:

Applying RHL patch. Generally improves the error handling and traceback. pmConcepts.c and pmConceptsRead.c done by PAP (RHL did this also, but I had already done them). Resolved conflicts, except for pmFPAfile.c, which uses psAbort in some instances where RHL's patch had psError; leave this for Gene to decide.

File:

• trunk/psModules/src/objects/pmPSF.h (modified) (3 diffs)

trunk/psModules/src/objects/pmPSF.h

@@ -31 +31 @@
     psArray *params;   ///< Model parameters (psPolynomial2D)
     psPolynomial1D *ChiTrend;  ///< Chisq vs flux fit (correction for systematic errors)
-    psPolynomial4D *ApTrend;  ///< ApResid vs (x,y,rflux) (rflux = ten(0.4*mInst)
-    pmGrowthCurve *growth;  ///< apMag vs Radius
+    psPolynomial4D *ApTrend;  ///< ApResid vs (x,y,rflux) (rflux = ten(0.4*mInst))
+    //pmGrowthCurve *growth;  ///< apMag vs Radius // move to end as gdb is confused by it here
     float ApResid;   ///< apMag - psfMag (for PSF stars)
     float dApResid;   ///< scatter of ApResid
@@ -41 +41 @@
     int nApResid;   ///< number of stars used to measure ApResid
     bool poissonErrors;
+    pmGrowthCurve *growth;  ///< apMag vs Radius
 }
 pmPSF;
@@ -100 +101 @@
 );
 
-bool pmPSF_MaskApTrend (pmPSF *psf, pmPSF_ApTrendOptions option);
+bool pmPSF_MaskApTrend (psPolynomial4D *trend, pmPSF_ApTrendOptions option);
 
 # endif