Changeset 31153 for trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c
- Timestamp:
- Apr 4, 2011, 1:04:41 PM (15 years ago)
- Location:
- trunk/psModules
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/objects/pmSourceIO_PS1_DEV_1.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psModules
- Property svn:ignore
-
old new 28 28 ChangeLog 29 29 psmodules-*.tar.* 30 a.out.dSYM
-
- Property svn:ignore
-
trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c
r30621 r31153 73 73 74 74 // let's write these out in S/N order 75 sources = psArraySort (sources, pmSourceSortBy SN);75 sources = psArraySort (sources, pmSourceSortByFlux); 76 76 77 77 table = psArrayAllocEmpty (sources->n); … … 117 117 } 118 118 119 float peakMag = (source->peak-> flux > 0) ? -2.5*log10(source->peak->flux) : NAN;119 float peakMag = (source->peak->rawFlux > 0) ? -2.5*log10(source->peak->rawFlux) : NAN; 120 120 psS16 nImageOverlap = 1; 121 121 … … 263 263 264 264 source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE); 265 source->peak->flux = peakFlux; 265 source->peak->rawFlux = peakFlux; 266 source->peak->smoothFlux = peakFlux; 266 267 source->peak->dx = dPAR[PM_PAR_XPOS]; 267 268 source->peak->dy = dPAR[PM_PAR_YPOS]; … … 307 308 308 309 // let's write these out in S/N order 309 sources = psArraySort (sources, pmSourceSortBy SN);310 sources = psArraySort (sources, pmSourceSortByFlux); 310 311 311 312 table = psArrayAllocEmpty (sources->n); … … 480 481 481 482 // let's write these out in S/N order 482 sources = psArraySort (sources, pmSourceSortBy SN);483 sources = psArraySort (sources, pmSourceSortByFlux); 483 484 484 485 // we are writing one row per model; we need to write out same number of columns for each row: find the max Nparams
Note:
See TracChangeset
for help on using the changeset viewer.
