IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7677 for trunk/ppImage/src


Ignore:
Timestamp:
Jun 23, 2006, 5:33:37 PM (20 years ago)
Author:
Paul Price
Message:

Fixing code after pushing argc,argv into pmConfig.

Location:
trunk/ppImage/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppImage/src/ppImage.c

    r7647 r7677  
    1111    // Determine camera, format from header if not already defined
    1212    // Construct camera in preparation for reading
    13     pmConfig *config = ppImageArguments(&argc, argv);
     13    pmConfig *config = ppImageArguments(argc, argv);
    1414    if (config == NULL) {
    1515        psErrorStackPrint(stderr, "");

  • trunk/ppImage/src/ppImage.h

    r7639 r7677  
    1313
    1414// Get the configuration
    15 pmConfig *ppImageArguments(int *argc, char **argv);
     15pmConfig *ppImageArguments(int argc, char **argv);
    1616
    1717// Determine what type of camera, and initialise

  • trunk/ppImage/src/ppImageArguments.c

    r7531 r7677  
    66}
    77
    8 pmConfig *ppImageArguments(int *argc, char **argv) {
     8pmConfig *ppImageArguments(int argc, char **argv) {
    99
    1010    int N;
    1111    bool status;
    1212
    13     if (*argc == 1) usage ();
     13    if (argc == 1) usage ();
    1414
    1515    // load the site-wide configuration information
    … …  
    3030
    3131    // recipe option: -usemask : override MASK setting in phase2.recipe
    32     if ((N = psArgumentGet (*argc, argv, "-usemask"))) {
    33         psArgumentRemove (N, argc, argv);
    34         psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
    35         psArgumentRemove (N, argc, argv);
     32    if ((N = psArgumentGet(config->argc, config->argv, "-usemask"))) {
     33        psArgumentRemove (N, &config->argc, config->argv);
     34        psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
     35        psArgumentRemove (N, &config->argc, config->argv);
    3636    }
    3737
    38     // XXX add other PPIMAGE recipe options here 
     38    // XXX add other PPIMAGE recipe options here
    3939
    4040    // drop the local view on the options (saved on config->arguments)
    … …  
    4242
    4343    // the input file is a required argument; if not found, we will exit
    44     status = pmConfigFileSetsMD (config->arguments, argc, argv, "INPUT", "-file", "-list");
     44    status = pmConfigFileSetsMD (config->arguments, config, "INPUT", "-file", "-list");
    4545    if (!status) { usage ();}
    4646
    4747    // if these command-line options are supplied, load the file name lists into config->arguments
    4848    // override any configuration-specified source for these files
    49     pmConfigFileSetsMD (config->arguments, argc, argv, "BIAS", "-bias", "-biaslist");
    50     pmConfigFileSetsMD (config->arguments, argc, argv, "DARK", "-dark", "-darklist");
    51     pmConfigFileSetsMD (config->arguments, argc, argv, "FLAT", "-flat", "-flatlist");
    52     pmConfigFileSetsMD (config->arguments, argc, argv, "MASK", "-mask", "-masklist");
    53     pmConfigFileSetsMD (config->arguments, argc, argv, "FRINGE", "-fringe", "-fringelist");
     49    pmConfigFileSetsMD (config->arguments, config, "BIAS", "-bias", "-biaslist");
     50    pmConfigFileSetsMD (config->arguments, config, "DARK", "-dark", "-darklist");
     51    pmConfigFileSetsMD (config->arguments, config, "FLAT", "-flat", "-flatlist");
     52    pmConfigFileSetsMD (config->arguments, config, "MASK", "-mask", "-masklist");
     53    pmConfigFileSetsMD (config->arguments, config, "FRINGE", "-fringe", "-fringelist");
    5454
    5555    // chip selection is used to limit chips to be processed
    56     if ((N = psArgumentGet (*argc, argv, "-chip"))) {
    57         psArgumentRemove (N, argc, argv);
    58         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", argv[N]);
    59         psArgumentRemove (N, argc, argv);
     56    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
     57        psArgumentRemove (N, &config->argc, config->argv);
     58        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "",
     59                          config->argv[N]);
     60        psArgumentRemove (N, &config->argc, config->argv);
    6061    }
    6162
    62     if (*argc != 2) usage ();
     63    if (config->argc != 2) usage ();
    6364
    6465    // Add the input and output images (which remain on the command-line) to the arguments list
    65     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image", argv[1]);
     66    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
     67                     config->argv[1]);
    6668
    6769    return config;

  • trunk/ppImage/src/ppTest.c

    r7494 r7677  
    1111// ppImageConfig.c
    1212//////////////////////////////////////////////////////////////////////////////////////////////////////////////
    13     pmConfig *config = pmConfigRead(&argc, argv);
     13    pmConfig *config = pmConfigRead(argc, argv);
    1414    if (! config) {
    1515        psErrorStackPrint(stderr, "Can't find site configuration!\n");
    … …  
    2727    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-chip", 0, "Chip number to process (if positive)", -1);
    2828
    29     if (! psArgumentParse(config->arguments, &argc, argv) || argc != 3) {
     29    if (! psArgumentParse(config->arguments, &config->argc, config->argv) || argc != 3) {
    3030        printf("\nPan-STARRS Phase 2 processing\n\n");
    31         printf("Usage: %s INPUT.fits OUTPUT.fits\n\n", argv[0]);
     31        printf("Usage: %s INPUT.fits OUTPUT.fits\n\n", config->argv[0]);
    3232        psArgumentHelp(config->arguments);
    3333        psFree(config->arguments);
    … …  
    3636
    3737    // Add the input and output images (which remain on the command-line) to the arguments list
    38     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-input",  0, "Name of the input image",  argv[1]);
    39     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[2]);
     38    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-input",  0, "Name of the input image",
     39                     config->argv[1]);
     40    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image",
     41                     config->argv[2]);
    4042
    4143    // Define database handle, if used
    … …  
    103105    pmFPAview *mosaicView = pmFPAviewAlloc(0);
    104106    pmFPAAddSourceFromView(mosaicFPA, mosaicView, mosaicFormat);
     107    psFree(mosaicView);
    105108#endif
    106109
    … …  
    110113#if 0
    111114    psArray *chips = fpa->chips;
    112     //pmFPAWrite(fpa, outFile, NULL, false);
     115    pmFPAWrite(fpa, outFile, NULL, false, false);
    113116    for (int i = 0; i < chips->n; i++) {
     117        printf("Chip %d\n", i);
    114118        pmChip *chip = chips->data[i];
     119        pmChipRead(chip, inFile, NULL);
     120#if 0
    115121        //pmChipRead(chip, inFile, NULL);
    116122        //pmChipWrite(chip, outFile, NULL, false);
    … …  
    129135            psFree(readout);
    130136        }
    131         pmChipMosaic(mosaicFPA->chips->data[0], chip);
     137#endif
     138        pmChipMosaic(mosaicFPA->chips->data[i], chip);
     139        pmChipWrite(mosaicFPA->chips->data[i], outFile, NULL, true, true);
     140        pmChipFreeData(chip);
     141        pmChipFreeData(mosaicFPA->chips->data[i]);
    132142    }
    133143#endif
    134144
     145#if 1
    135146    pmFPAMosaic(mosaicFPA, fpa);
    136 
    137 #if 1
    138147    pmFPAWrite(mosaicFPA, outFile, NULL, true, true);
    139     pmFPAPrint(stdout, mosaicFPA, true, true);
     148    //pmFPAPrint(stdout, mosaicFPA, true, true);
    140149    psFree(mosaicCamera);
    141150    psFree(mosaicFormat);
    142151    psFree(mosaicView);
    143     psFree(mosaicFPA);
     152    //psFree(mosaicFPA);
    144153#endif
    145154
Note: See TracChangeset for help on using the changeset viewer.