IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7581


Ignore:
Timestamp:
Jun 15, 2006, 3:03:49 PM (20 years ago)
Author:
eugene
Message:

substantial work on the image loop, support for DetDB

Location:
trunk/ppImage/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppImage/src/ppImage.c

    r7531 r7581  
    2424
    2525    // Image Arithmetic Loop
    26     ppImageLoop(config, options);
     26    if (!ppImageLoop(config, options)) {
     27        psErrorStackPrint(stderr, "");
     28        exit(1);
     29    }
    2730
    28     psLogMsg ("ppImage", 3, "complete ppImage run: %f sec\n", psTimerMark ("complete"));
     31    psLogMsg ("ppImage", 3, "complete ppImage run: %f sec\n", psTimerMark (TIMERNAME));
    2932
    3033    // Cleaning up

  • trunk/ppImage/src/ppImageAstrom.c

    r7531 r7581  
    1313        // mode is 'REFERENCE' to prevent double frees of the fpa
    1414        pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
    15         input = pmFPAfileDefine (config->files, config->camera, output->fpa, "PSASTRO.INPUT");
     15        input = pmFPAfileDefineInput (config->files, config->camera, output->fpa, "PSASTRO.INPUT");
    1616        input->mode = PM_FPA_MODE_REFERENCE;
    1717
    18         pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
     18        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
    1919
    2020        // supply the output name (from cmd-line) to all output (WRITE) files

  • trunk/ppImage/src/ppImageCleanup.c

    r7531 r7581  
    1111    pmConceptsDone();
    1212    pmConfigDone();
    13     fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
    14     // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppImage");
     13    pmModelGroupCleanup();
     14    // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
     15    fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppImage");
    1516    return;
    1617}

  • trunk/ppImage/src/ppImageDetrendReadout.c

    r7531 r7581  
    3939
    4040    // Bias, dark and overscan subtraction are all merged.
    41     if (options->doBias || options->doDark) {
     41    if (options->doBias || options->doDark || options->doOverscan) {
    4242        ppImageDetrendBias(input, bias, dark, options);
    4343    }

  • trunk/ppImage/src/ppImageLoop.c

    r7531 r7581  
    1717
    1818    // files associated with the science image
    19     pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
     19    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
    2020
    2121    while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
    2222        psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
    2323        if (!chip->process || !chip->file_exists) { continue; }
    24         pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
     24        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
    2525
    2626        while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
    2727            psLogMsg ("ppImageLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
    2828            if (!cell->process || !cell->file_exists) { continue; }
    29             pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
     29            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
    3030
    3131            // process each of the readouts
    3232            while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
    33                 pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
    34                 if (! readout->data_exists) { continue; }
     33                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
     34                if (!readout->data_exists) { continue; }
    3535
    3636                // perform the detrend analysis
    … …  
    4040                if (options->doBin2) ppImageRebinReadout (config, view, "PPIMAGE.BIN2");
    4141
    42                 pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
     42                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
    4343            }
    44             pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
     44            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
    4545        }
    4646
    … …  
    5050        if (options->doPhotom) ppImagePhotom (config, view);
    5151
    52         pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
     52        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
    5353
    5454        // XXX paul added these frees: make sure the same is happening in the pmFileIOChecks
    … …  
    6868    // ppImageJpegFPA (config, view);
    6969
    70     pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
     70    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
    7171
    7272    psFree (view);

  • trunk/ppImage/src/ppImageParseCamera.c

    r7531 r7581  
    77
    88    // the input image defines the camera
    9     pmFPAfile *input = pmFPAfileFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
     9    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
    1010    if (!status) {
    1111        psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT");
    … …  
    2222
    2323    // the following files are output targets
    24     pmFPAfileDefine (config->files, config->camera, input->fpa, "PPIMAGE.OUTPUT");
     24    pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PPIMAGE.OUTPUT");
    2525
    2626    // the following are defined from the argument list, if given,
    … …  
    2929    if (options->doBias) {
    3030        bool status = false;
    31         pmFPAfileFromArgs (&status, config, "PPIMAGE.BIAS", "BIAS");
    32         pmFPAfileFromConf (&status, config, "PPIMAGE.BIAS", input->fpa);
     31        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.BIAS", "BIAS");
     32        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.BIAS");
     33        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS);
    3334        if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source");
    3435    }
    3536    if (options->doDark) {
    3637        bool status = false;
    37         pmFPAfileFromArgs (&status, config, "PPIMAGE.DARK", "DARK");
    38         pmFPAfileFromConf (&status, config, "PPIMAGE.DARK", input->fpa);
     38        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.DARK", "DARK");
     39        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.DARK");
     40        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK);
    3941        if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source");
    4042    }
    4143    if (options->doMask) {
    4244        bool status = false;
    43         pmFPAfileFromArgs (&status, config, "PPIMAGE.MASK", "MASK");
    44         pmFPAfileFromConf (&status, config, "PPIMAGE.MASK", input->fpa);
     45        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.MASK", "MASK");
     46        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.MASK");
     47        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK);
    4548        if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source");
    4649    }
    4750    if (options->doFlat) {
    4851        bool status = false;
    49         pmFPAfileFromArgs (&status, config, "PPIMAGE.FLAT", "FLAT");
    50         pmFPAfileFromConf (&status, config, "PPIMAGE.FLAT", input->fpa);
     52        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.FLAT", "FLAT");
     53        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.FLAT");
     54        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT);
    5155        if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source");
    5256    }
    5357    if (options->doBin1) {
    54         pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
     58        pmFPAfile *file = pmFPAfileDefineFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
    5559        if (options->doBin1JPG) {
    56             pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
     60            pmFPAfileDefineOutput (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
    5761        }
    5862    }
    5963    if (options->doBin2) {
    60         pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
     64        pmFPAfile *file = pmFPAfileDefineFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
    6165        if (options->doBin2JPG) {
    62             pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
     66            pmFPAfileDefineOutput (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
    6367        }
    6468    }

  • trunk/ppImage/src/ppImagePhotom.c

    r7522 r7581  
    2929        // mode is 'REFERENCE' to prevent double frees of the fpa
    3030        pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PPIMAGE.OUTPUT");
    31         input = pmFPAfileDefine (config->files, config->camera, output->fpa, "PSPHOT.INPUT");
     31        input = pmFPAfileDefineInput (config->files, config->camera, output->fpa, "PSPHOT.INPUT");
    3232        input->mode = PM_FPA_MODE_REFERENCE;
    3333
    34         pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
     34        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
    3535
    3636        // supply the output name (from cmd-line) to all output (WRITE) files
    … …  
    6262        psLogMsg ("ppImagePhot", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
    6363        if (! cell->process || ! cell->file_exists) { continue; }
    64         pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
     64        pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
    6565
    6666        // process each of the readouts
    6767        while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
    68             pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
     68            pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
    6969            if (! readout->data_exists) { continue; }
    7070
    … …  
    7272            psphotReadout (config, view);
    7373
    74             pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
     74            pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
    7575        }
    76         pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
     76        pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
    7777    }
    7878
Note: See TracChangeset for help on using the changeset viewer.