IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31159


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

minor updates from eam branch

Location:
trunk/pswarp
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/pswarp

    • Property svn:ignore

      •  

        old new  
        1818pswarp.pc
        1919Doxyfile
         20a.out.dSYM

  • trunk/pswarp/src/pswarpArguments.c

    r27227 r31159  
    4242    }
    4343
     44    // generic arguments (version, dumpconfig)
     45    PS_ARGUMENTS_GENERIC( pswarp, config, argc, argv );
     46
     47    // thread arguments
     48    PS_ARGUMENTS_THREADS( pswarp, config, argc, argv )
     49
    4450    // save the following additional recipe values based on command-line options
    4551    // these options override the PSWARP recipe values loaded from recipe files
    … …  
    7682    }
    7783
    78     // Number of threads
    79     if ((N = psArgumentGet(argc, argv, "-threads"))) {
    80         psArgumentRemove(N, &argc, argv);
    81         int nThreads = atoi(argv[N]);
    82         psMetadataAddS32(config->arguments, PS_LIST_TAIL, "NTHREADS", 0, "number of warp threads", nThreads);
    83         psArgumentRemove(N, &argc, argv);
    84 
    85         // create the thread pool with number of desired threads, supplying our thread launcher function
    86         // XXX need to determine the number of threads from the config data
    87         psThreadPoolInit (nThreads);
    88     }
    8984    pswarpSetThreads();
    90 
    91     if ((N = psArgumentGet(argc, argv, "-dumpconfig"))) {
    92         psArgumentRemove(N, &argc, argv);
    93         psMetadataAddStr(config->arguments, PS_LIST_TAIL, "DUMP_CONFIG", PS_META_REPLACE,
    94                          "Filename for configuration dump", argv[N]);
    95         psArgumentRemove(N, &argc, argv);
    96     }
    97 
    9885
    9986    pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");

  • trunk/pswarp/src/pswarpTransformSources.c

    r29000 r31159  
    9494        // relative flux) that's OK.
    9595        pmSource *new = pmSourceAlloc(); ///< New source
    96         new->peak = pmPeakAlloc(xOut, yOut, source->peak->flux, PM_PEAK_LONE);
    97         new->peak->flux = source->peak->flux;
     96        new->peak = pmPeakAlloc(xOut, yOut, source->peak->detValue, PM_PEAK_LONE);
     97        new->peak->rawFlux = source->peak->rawFlux;
     98        new->peak->smoothFlux = source->peak->smoothFlux;
    9899        new->type = source->type;
    99100        new->mode = source->mode;
Note: See TracChangeset for help on using the changeset viewer.