IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36213


Ignore:
Timestamp:
Oct 13, 2013, 1:35:03 PM (13 years ago)
Author:
eugene
Message:

set up the rawFlux,smoothFlux,detValue correctly for external sources; remove some deprecated test code

Location:
branches/eam_branches/ipp-20130904/psphot/src
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20130904/psphot/src/Makefile.am

    r36148 r36213  
    8989psphotFullForce_SOURCES = \
    9090        psphotFullForce.c             \
    91         psphotFullForceArguments.c         \
     91        psphotFullForceArguments.c    \
    9292        psphotParseCamera.c        \
    9393        psphotImageLoop.c          \
    … …  
    169169        psphotForcedReadout.c          \
    170170        psphotFullForceReadout.c       \
     171        psphotFullForce.SourceStats.c \
    171172        psphotMakePSFReadout.c         \
    172173        psphotModelBackground.c        \

  • branches/eam_branches/ipp-20130904/psphot/src/psphot.h

    r36198 r36213  
    8181bool            psphotSourceStats (pmConfig *config, const pmFPAview *view, const char *filerule, bool setWindow);
    8282bool            psphotSourceStatsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, bool setWindow);
     83
     84bool            psphotFullForceSourceStats (pmConfig *config, const pmFPAview *view, const char *filerule, bool setWindow);
     85bool            psphotFullForceSourceStatsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, bool setWindow);
    8386
    8487bool            psphotDeblendSatstars (pmConfig *config, const pmFPAview *view, const char *filerule);

  • branches/eam_branches/ipp-20130904/psphot/src/psphotKronFlux.c

    r36148 r36213  
    4040        }
    4141    }
     42
    4243    return true;
    4344}

  • branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

    r36198 r36213  
    3838    psArray *newSources = detections->newSources;
    3939    psAssert (newSources, "missing sources?");
    40 
    41     // XXX TEST:
    42     if (detections->allSources) {
    43         psphotMaskCosmicRayFootprintCheck(detections->allSources);
    44     }
    45     if (detections->newSources) {
    46         psphotMaskCosmicRayFootprintCheck(detections->newSources);
    47     }
    4840
    4941    if (!detections->allSources) {
    … …  
    139131            for (int i = 0; i < extCFF->allSources->n; i++) {
    140132                pmSource *source = extCFF->allSources->data[i];
     133
     134                // setting this bit not only tracks the inputs, it makes pmSourceMoments
     135                // keep the Mx,My values for the centroid. 
    141136                source->mode |= PM_SOURCE_MODE_EXTERNAL;
    142137
    143                 // the supplied peak flux needs to be re-normalized
    144                 source->peak->rawFlux = 1.0;
    145                 source->peak->smoothFlux = 1.0;
    146                 source->peak->detValue = 1.0;
     138                // source->peak->detValue,rawFlux,smoothFlux all set to input flux value
     139                // source->peak->xf,yf, moments->Mx,My all set to input position
    147140
    148141                // drop the loaded source modelPSF

  • branches/eam_branches/ipp-20130904/psphot/src/psphotModelTestReadout.c

    r35769 r36213  
    125125
    126126            // get the source moments
    127             status = pmSourceMoments (source, radius, 0.25*radius, 0.0, MIN_KRON_RADIUS, maskVal);
     127          status = pmSourceMoments (source, radius, 0.25*radius, 0.0, MIN_KRON_RADIUS, maskVal);
    128128            if (!status) psAbort("psSourceMoments error");
    129129

  • branches/eam_branches/ipp-20130904/psphot/src/psphotSetThreads.c

    r36148 r36213  
    5757    psFree(task);
    5858
    59     task = psThreadTaskAlloc("PSPHOT_GALAXY_SHAPE", 6);
     59    task = psThreadTaskAlloc("PSPHOT_GALAXY_SHAPES", 6);
    6060    task->function = &psphotGalaxyShape_Threaded;
    6161    psThreadTaskAdd(task);

  • branches/eam_branches/ipp-20130904/psphot/src/psphotSourceStats.c

    r35112 r36213  
    5858    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
    5959    psAssert (detections, "missing detections?");
    60 
    61     // XXX TEST:
    62     if (detections->allSources) {
    63         psphotMaskCosmicRayFootprintCheck(detections->allSources);
    64     }
    65     if (detections->newSources) {
    66         psphotMaskCosmicRayFootprintCheck(detections->newSources);
    67     }
    6860
    6961    // determine the number of allowed threads
    … …  
    246238    psphotVisualShowMoments (sources);
    247239
    248     // clear the mark bits
    249     // psImageMaskPixels (readout->mask, "AND", PS_NOT_IMAGE_MASK(markVal));
    250 
    251     if (detections->allSources) {
    252         psphotMaskCosmicRayFootprintCheck(detections->allSources);
    253     }
    254     if (detections->newSources) {
    255         psphotMaskCosmicRayFootprintCheck(detections->newSources);
    256     }
    257 
    258240    return true;
    259241}
    … …  
    572554
    573555            // measure basic source moments (no S/N clipping on input pixels)
     556            // sources with (mode & MODE_EXTERNAL) or (mode2 & MODE2_MATCHED) use the
     557            // supplied Mx,My value for the centroid (not recalculated)
    574558            status = pmSourceMoments (source, 4*sigma[i], sigma[i], 0.0, 0.0, maskVal);
    575559        }
Note: See TracChangeset for help on using the changeset viewer.