IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 7, 2009, 4:50:25 PM (17 years ago)
Author:
Paul Price
Message:

Merging branches/pap from r23739 onto trunk. No conflicts, ppSub builds fine.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ppSub

  • trunk/ppSub/src

    • Property svn:ignore

      •  

        old new  
        1010stamp-h1
        1111ppSubKernel
         12ppSubErrorCodes.h
         13ppSubErrorCodes.c

  • trunk/ppSub/src/ppSub.c

    r23242 r23740  
    2828    psLibInit(NULL);
    2929
     30    ppSubData *data = NULL;             // Processing data
    3031    pmConfig *config = pmConfigRead(&argc, argv, PPSUB_RECIPE); // Configuration
    3132    if (!config) {
    … …  
    4950    }
    5051
    51     if (!ppSubArgumentsSetup(argc, argv, config)) {
     52    data = ppSubDataAlloc(); // Processing data
     53
     54    if (!ppSubArguments(argc, argv, config, data)) {
    5255        psErrorStackPrint(stderr, "Error reading arguments.\n");
    5356        exitValue = PS_EXIT_CONFIG_ERROR;
    … …  
    5558    }
    5659
    57     if (!ppSubCamera(config)) {
     60    if (!ppSubCamera(config, data)) {
    5861        psErrorStackPrint(stderr, "Error setting up camera.\n");
    5962        exitValue = PS_EXIT_CONFIG_ERROR;
    … …  
    6164    }
    6265
    63     if (!ppSubArgumentsParse(config)) {
    64         psErrorStackPrint(stderr, "Error reading arguments.\n");
    65         exitValue = PS_EXIT_CONFIG_ERROR;
    66         goto die;
    67     }
    68 
    69     if (!ppSubLoop(config)) {
     66    if (!ppSubLoop(config, data)) {
    7067        psErrorStackPrint(stderr, "Error performing subtraction.\n");
    7168        exitValue = PS_EXIT_SYS_ERROR;
    … …  
    7774    psTimerStop();
    7875
     76    psFree(data);
     77    psFree(config);
     78
    7979    pmVisualClose(); //close plot windows, if -visual is set
    80     psFree(config);
    8180    pmModelClassCleanup();
    8281    pmConfigDone();
Note: See TracChangeset for help on using the changeset viewer.