Changeset 31153 for trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.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_CAL_0.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_CAL_0.c
r30621 r31153 91 91 92 92 // let's write these out in S/N order 93 sources = psArraySort (sources, pmSourceSortBy SN);93 sources = psArraySort (sources, pmSourceSortByFlux); 94 94 95 95 table = psArrayAllocEmpty (sources->n); … … 136 136 137 137 float calMag = source->psfMag + magOffset; 138 float peakMag = (source->peak-> flux > 0) ? -2.5*log10(source->peak->flux) : NAN;138 float peakMag = (source->peak->rawFlux > 0) ? -2.5*log10(source->peak->rawFlux) : NAN; 139 139 psS16 nImageOverlap = 1; 140 140 … … 294 294 295 295 source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE); 296 source->peak->flux = peakFlux; 296 source->peak->rawFlux = peakFlux; 297 source->peak->smoothFlux = peakFlux; 297 298 source->peak->dx = dPAR[PM_PAR_XPOS]; 298 299 source->peak->dy = dPAR[PM_PAR_YPOS]; … … 357 358 358 359 // let's write these out in S/N order 359 sources = psArraySort (sources, pmSourceSortBy SN);360 sources = psArraySort (sources, pmSourceSortByFlux); 360 361 361 362 table = psArrayAllocEmpty (sources->n); … … 576 577 577 578 // let's write these out in S/N order 578 sources = psArraySort (sources, pmSourceSortBy SN);579 sources = psArraySort (sources, pmSourceSortByFlux); 579 580 580 581 // 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.
