Changeset 36315
- Timestamp:
- Nov 26, 2013, 5:52:40 AM (13 years ago)
- Location:
- branches/eam_branches/ipp-20130904/psphot
- Files:
-
- 4 edited
-
src/psphotExtendedSourceFits.c (modified) (1 diff)
-
src/psphotGalaxyShape.c (modified) (1 diff)
-
src/psphotSourceFits.c (modified) (5 diffs)
-
test/tap_psphot_galaxygrid.pro (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c
r36311 r36315 315 315 316 316 // XXX TEST 317 if ( false && !isInteractive) {317 if (true && !isInteractive) { 318 318 if (!psThreadJobAddPending(job)) { 319 319 psError(PS_ERR_UNKNOWN, false, "Unable to guess model."); -
branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c
r36304 r36315 315 315 // generate the modelFlux 316 316 // need to reset here each time since we assign below to calculate the flux 317 // XXX note that this does not add sky to model 317 318 pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize); 318 319 pcm->modelConv->params->data.F32[PM_PAR_I0] = 1.0; -
branches/eam_branches/ipp-20130904/psphot/src/psphotSourceFits.c
r36311 r36315 653 653 if (TIMING) { t4 = psTimerMark ("psphotFitPCM"); } 654 654 655 psphotPCMfitCheckSize (pcm, source, maskVal, psfSize); 655 656 if (pcm->modelConv->nIter == fitOptions->nIter) { 656 657 psphotPCMfitRetry (pcm, source, &options, maskVal, markVal, psfSize); 657 658 } 658 // psphotPCMfitCheckSize (pcm, source, maskVal, psfSize);659 659 if (TIMING) { t5 = psTimerMark ("psphotFitPCM"); } 660 660 … … 872 872 873 873 // generated the modelFlux 874 // XXX note that this does not add sky to model 874 875 pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize); 875 876 … … 1290 1291 1291 1292 // generated the modelFlux 1293 // XXX note that this does not add sky to model 1292 1294 pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize); 1293 1295 … … 1329 1331 rMin = dref; 1330 1332 } 1331 fprintf (stderr, "%d | %f %f %f | %f %f %f\n", j, dref, Io, Chisq, rMin, iMin, xMin);1333 // fprintf (stderr, "%d | %f %f %f | %f %f %f\n", j, dref, Io, Chisq, rMin, iMin, xMin); 1332 1334 } 1333 1335 … … 1372 1374 1373 1375 // generated the modelFlux 1376 // XXX note that this does not add sky to model 1374 1377 pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize); 1375 1378 -
branches/eam_branches/ipp-20130904/psphot/test/tap_psphot_galaxygrid.pro
r36311 r36315 1277 1277 $Nrun = 0 1278 1278 foreach radius 1.0 1.5 2.0 2.5 3.0 4.0 6.0 8.0 1279 #mkexp.devexp.single tests.20131120/testrad.ps1v1.exp.$Nrun EXP $radius 1.01279 mkexp.devexp.single tests.20131120/testrad.ps1v1.exp.$Nrun EXP $radius 1.0 1280 1280 fitexp tests.20131120/testrad.ps1v1.exp.$Nrun tests.20131120/testrad.ps1v1.exp.$Nrun.t4p EXP_CONV 1281 1281 $Nrun ++
Note:
See TracChangeset
for help on using the changeset viewer.
