IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31156 for trunk/ppSub


Ignore:
Timestamp:
Apr 4, 2011, 1:13:59 PM (15 years ago)
Author:
eugene
Message:

minor fixes from eam branch

Location:
trunk/ppSub
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppSub

    • Property svn:ignore

      •  

        old new  
        1717test
        1818Doxyfile
         19a.out.dSYM

  • trunk/ppSub/src/ppSub.h

    r29937 r31156  
    128128void ppSubVersionPrint(void);
    129129
     130/// write the version info to a string
     131psString ppSubVersionLong(void);
     132
    130133/// Mark the data quality as bad and prepare to suspend processing
    131134void ppSubDataQuality(ppSubData *data,  ///< Processing data
    … …  
    185188bool ppSubSetSourceImageIDs (psArray *sources, int imageID);
    186189
     190void ppSubSetThreads (void);
     191
    187192///@}
    188193#endif

  • trunk/ppSub/src/ppSubArguments.c

    r29937 r31156  
    5757}
    5858
     59void ppSubSetThreads (void) {
     60    // ppSub does not have any of its own thread handlers
     61    return;
     62}
     63
    5964bool ppSubArguments(int argc, char *argv[], ppSubData *data)
    6065{
    … …  
    6267    pmConfig *config = data->config;
    6368    assert(config);
     69
     70    // generic arguments (version, dumpconfig)
     71    PS_ARGUMENTS_GENERIC( ppSub, config, argc, argv );
     72
     73    // thread arguments
     74    PS_ARGUMENTS_THREADS( ppSub, config, argc, argv )
    6475
    6576    int argNum = psArgumentGet(argc, argv, "-debug"); // Debugging argument number
    … …  
    8293    psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
    8394    psMetadataAddStr(arguments,  PS_LIST_TAIL, "-stamps", 0, "Stamps filename; x,y on each line", NULL);
    84     psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Number of threads", 0);
    85     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dumpconfig", 0, "file to dump configuration to", NULL);
    8695    psMetadataAddS32(arguments, PS_LIST_TAIL, "-convolve", 0, "Image to convolve [1 or 2]", 0);
    8796    psMetadataAddBool(arguments, PS_LIST_TAIL, "-photometry", 0, "Perform photometry?", NULL);
    … …  
    166175    }
    167176
    168     int threads = psMetadataLookupS32(NULL, arguments, "-threads"); // Number of threads
    169     if (threads > 0) {
    170         if (!psThreadPoolInit(threads)) {
    171             psError(psErrorCodeLast(), false, "Unable to setup %d threads", threads);
    172             return false;
    173         }
    174     }
    175 
    176177    psTrace("ppSub", 1, "Done reading command-line arguments\n");
    177178

  • trunk/ppSub/src/ppSubConvolve.c

    r29551 r31156  
    3939}
    4040
     41void ppSubSetThreads (void) {
     42    // ppSub does not have any of its own thread handlers
     43    return;
     44}
    4145
    4246int main(int argc, char *argv[])
    … …  
    4953        goto die;
    5054    }
     55
     56    // generic arguments (version, dumpconfig)
     57    PS_ARGUMENTS_GENERIC( ppSub, config, argc, argv );
     58
     59    // thread arguments
     60    PS_ARGUMENTS_THREADS( ppSub, config, argc, argv )
    5161
    5262    bool reference = false;             // Input is actually the reference image?
    … …  
    5969        psMetadataAddStr(arguments, PS_LIST_TAIL, "-kernel", 0, "Convolution kernel", NULL);
    6070        psMetadataAddBool(arguments, PS_LIST_TAIL, "-reference", 0, "Input is actually reference?", false);
    61         psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Threads to use", 0);
    6271        psMetadataAddBool(arguments, PS_LIST_TAIL, "-save-all", 0, "Save all outputs?", false);
    6372
    … …  
    7584
    7685        reference = psMetadataLookupBool(NULL, arguments, "-reference");
    77         threads = psMetadataLookupS32(NULL, arguments, "-threads");
     86        threads = psMetadataLookupS32(NULL, arguments, "NTHREADS");
    7887        fileList("PPSUB.INPUT", inImage, "Input image", config);
    7988        fileList("PPSUB.INPUT.MASK", inMask, "Input mask", config);
    … …  
    239248        if (threads > 0) {
    240249            pmSubtractionThreadsInit();
    241             psThreadPoolInit(threads);
    242250        }
    243251

  • trunk/ppSub/src/ppSubDefineOutput.c

    r28255 r31156  
    7373    pmFPAfile *inFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
    7474
    75     // We should be using the GNU version of basename() which doesn't modify its argument, but just in case,
    76     // we'll copy the string.
    77     psString refName = psStringCopy(refFile->filename); // Filename of reference
    78     const char *refBase = basename(refName);            // Basename of reference
    79     psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0,
    80                      "Subtraction reference", refBase);
    81     psFree(refName);
    82     psString inName = psStringCopy(inFile->filename);   // Filename of input
    83     const char *inBase = basename(inName);              // Basename of input
    84     psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0,
    85                      "Subtraction input", inBase);
    86     psFree(inName);
     75    // save the names of the input and reference image in the header
     76    psString refBase = psStringFileBasename(refFile->origname);            // Basename of reference
     77    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0, "Subtraction reference", refBase);
     78    psFree(refBase);
     79
     80    psString inBase = psStringFileBasename(inFile->origname);              // Basename of input
     81    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0, "Subtraction input", inBase);
     82    psFree(inBase);
    8783
    8884    ppSubVersionHeader(outHDU->header);

  • trunk/ppSub/src/ppSubFlagNeighbors.c

    r29937 r31156  
    189189        if (!src) NEXT1;
    190190        if (!src->peak) NEXT1;
    191         if (!finite(src->peak->xf)) NEXT1;
    192         if (!finite(src->peak->yf)) NEXT1;
    193         if (!finite(src->peak->SN)) NEXT1;
    194         if (src->peak->SN < MIN_SN) NEXT1;
     191        if (!isfinite(src->peak->xf)) NEXT1;
     192        if (!isfinite(src->peak->yf)) NEXT1;
     193        if (!isfinite(src->peak->detValue)) NEXT1;
     194        if (sqrt(src->peak->detValue) < MIN_SN) NEXT1;
    195195 
    196196        if (!obj) NEXT2;
    197         if (!finite(obj->x)) NEXT2;
    198         if (!finite(obj->y)) NEXT2;
     197        if (!isfinite(obj->x)) NEXT2;
     198        if (!isfinite(obj->y)) NEXT2;
    199199 
    200200        dx = src->peak->xf - obj->x;
    … …  
    211211            if (!src) NEXT1;
    212212            if (!src->peak) NEXT1;
    213             if (!finite(src->peak->xf)) NEXT1;
    214             if (!finite(src->peak->yf)) NEXT1;
    215             if (!finite(src->peak->SN)) NEXT1;
    216             if (src->peak->SN < MIN_SN) NEXT1;
     213            if (!isfinite(src->peak->xf)) NEXT1;
     214            if (!isfinite(src->peak->yf)) NEXT1;
     215            if (!isfinite(src->peak->detValue)) NEXT1;
     216            if (sqrt(src->peak->detValue) < MIN_SN) NEXT1;
    217217
    218218            dx = src->peak->xf - obj->x;
    … …  
    235235        src = sources->data[Imin];
    236236
    237         // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, src->peak->SN, src->id);
     237        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, sqrt(src->peak->detValue), src->id);
    238238
    239239        // add source to object

  • trunk/ppSub/src/ppSubMakePSF.c

    r30619 r31156  
    158158psArray *ppSubSelectPSFSources(psArray *sources){
    159159
    160     sources = psArraySort (sources, pmSourceSortBySN);
     160    sources = psArraySort (sources, pmSourceSortByFlux);
    161161
    162162    psArray *subset = psArrayAllocEmpty(MAX_NPSF);

  • trunk/ppSub/src/ppSubMatchPSFs.c

    r30619 r31156  
    374374    }
    375375
    376     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
     376    int threads = psMetadataLookupS32(NULL, config->arguments, "NTHREADS"); // Number of threads
    377377    if (threads > 0) {
    378378        pmSubtractionThreadsInit();
Note: See TracChangeset for help on using the changeset viewer.