IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6221


Ignore:
Timestamp:
Jan 26, 2006, 4:43:36 PM (20 years ago)
Author:
jhoblitt
Message:

rename:

ppRawFrame -> rawScienceFrame
ppRawFrameFree() -> rawScienceFrameFree()
ppRawFrameAlloc() -> rawScienceFrameAlloc()

Location:
trunk/ippTools/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/chiptool.c

    r6220 r6221  
    5353    psArray *rawFrames = p2searchRawFrames(config);
    5454    if (!rawFrames) {
    55         psError(PS_ERR_UNKNOWN, false, "no ppRawFrames found");
     55        psError(PS_ERR_UNKNOWN, false, "no rawScienceFrames found");
    5656        return false;
    5757    }
    … …  
    7474    psArray *rawFrames = p2searchRawFrames(config);
    7575    if (!rawFrames) {
    76         psError(PS_ERR_UNKNOWN, false, "no ppRawFrames found");
     76        psError(PS_ERR_UNKNOWN, false, "no rawScienceFrames found");
    7777        return false;
    7878    }
    … …  
    8484    if (pendingFrames) {
    8585        for (int i = 0; i < rawFrames->n; i++) {
    86             ppRawFrame *rawFrame = rawFrames->data[i];
     86            rawScienceFrame *rawFrame = rawFrames->data[i];
    8787            for (int j = 0; j < pendingFrames->n; j++) {
    8888                p2PendingFrame *pendingFrame = pendingFrames->data[j];
    … …  
    104104    if (doneFrames && (rawFrames->n > 0)) {
    105105        for (int i = 0; i < rawFrames->n; i++) {
    106             ppRawFrame *rawFrame = rawFrames->data[i];
     106            rawScienceFrame *rawFrame = rawFrames->data[i];
    107107            for (int j = 0; j < pendingFrames->n; j++) {
    108108                p2DoneFrame *doneFrame = pendingFrames->data[j];
    … …  
    122122
    123123    if (!rawFrames->n > 0) {
    124         psError(PS_ERR_UNKNOWN, false, "no unprocessed ppRawFrames found");
     124        psError(PS_ERR_UNKNOWN, false, "no unprocessed rawScienceFrames found");
    125125        psFree(rawFrames);
    126126        return false;

  • trunk/ippTools/src/p2insertPendingFrames.c

    r6217 r6221  
    1010    // can we use p2rawToPending() here?
    1111    for (int i = 0; i < rawFrames->n; i++) {
    12         ppRawFrame *rawFrame = rawFrames->data[i];
     12        rawScienceFrame *rawFrame = rawFrames->data[i];
    1313
    1414        // find the next available version numbers

  • trunk/ippTools/src/p2rawToPending.c

    r6210 r6221  
    1010
    1111    for (int i = 0; i < rawFrames->n; i++) {
    12         ppRawFrame *rawFrame = rawFrames->data[i];
     12        rawScienceFrame *rawFrame = rawFrames->data[i];
    1313
    1414        p2PendingExpRow *pendingExposure = p2PendingExpRowAlloc(

  • trunk/ippTools/src/p2searchDoneFrames.c

    r6214 r6221  
    1313    }
    1414
    15     // output array of ppRawFrame
     15    // output array of rawScienceFrame
    1616    psArray *frames = psArrayAlloc(exposures->n);
    1717    frames->n = 0;

  • trunk/ippTools/src/p2searchRawFrames.c

    r6214 r6221  
    1313    }
    1414
    15     // output array of ppRawFrame
     15    // output array of rawScienceFrame
    1616    psArray *frames = psArrayAlloc(exposures->n);
    1717    frames->n = 0;
    … …  
    3333        }
    3434
    35         ppRawFrame *rawFrame = ppRawFrameAlloc(exposure, images);
     35        rawScienceFrame *rawFrame = rawScienceFrameAlloc(exposure, images);
    3636        psArrayAdd(frames, 100, rawFrame);
    3737    }

  • trunk/ippTools/src/pxalloc.c

    r6210 r6221  
    11#include "pxtools.h"
    22
    3 static void ppRawFrameFree(ppRawFrame *ptr);
     3static void rawScienceFrameFree(rawScienceFrame *ptr);
    44static void p2PendingFrameFree(p2PendingFrame *ptr);
    55static void p2DoneFrameFree(p2DoneFrame *ptr);
    66
    7 ppRawFrame *ppRawFrameAlloc(
     7rawScienceFrame *rawScienceFrameAlloc(
    88    rawScienceExpRow *exposure,
    99    psArray *images
    1010)
    1111{
    12     ppRawFrame *frame;
     12    rawScienceFrame *frame;
    1313
    1414    PS_ASSERT_PTR_NON_NULL(exposure, NULL);
    1515    PS_ASSERT_PTR_NON_NULL(images, NULL);
    1616
    17     frame = psAlloc(sizeof(ppRawFrame));
    18     psMemSetDeallocator(frame, (psFreeFunc)ppRawFrameFree);
     17    frame = psAlloc(sizeof(rawScienceFrame));
     18    psMemSetDeallocator(frame, (psFreeFunc)rawScienceFrameFree);
    1919
    2020    frame->exposure = exposure;
    … …  
    2424}
    2525
    26 static void ppRawFrameFree(ppRawFrame *ptr)
     26static void rawScienceFrameFree(rawScienceFrame *ptr)
    2727{
    2828    psFree(ptr->exposure);

  • trunk/ippTools/src/pxtools.h

    r6220 r6221  
    5050    rawScienceExpRow *exposure;
    5151    psArray *images;
    52 } ppRawFrame;
     52} rawScienceFrame;
    5353
    54 ppRawFrame *ppRawFrameAlloc(
     54rawScienceFrame *rawScienceFrameAlloc(
    5555    rawScienceExpRow *exposure,
    5656    psArray *images
    … …  
    8181bool pxAdminConfig (pxConfig *config, int argc, char **argv);
    8282bool p2searchConfig (pxConfig *config, int argc, char **argv);
     83
    8384psArray *p2rawToPending (pxConfig *config, psArray *rawFrames);
    8485psArray *p2searchRawFrames (pxConfig *config);
Note: See TracChangeset for help on using the changeset viewer.