IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 8669 for trunk/psModules


Ignore:
Timestamp:
Aug 29, 2006, 11:39:44 AM (20 years ago)
Author:
jhoblitt
Message:

fix a wide range of format string errors

Location:
trunk/psModules/src
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/pmAstrometryObjects.c

    r7953 r8669  
    88*  @author EAM, IfA
    99*
    10 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2006-07-24 23:56:26 $
     10*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2006-08-29 21:39:44 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    177177    psFree(y2); \
    178178    \
    179     psLogMsg (__func__, 3, "radius match: %d pairs (radius: %f)\n", matches->n, RADIUS); \
     179    psLogMsg (__func__, 3, "radius match: %ld pairs (radius: %f)\n", matches->n, RADIUS); \
    180180    return (matches); \
    181181}
    … …  
    263263    // fit chip-to-FPA transformation
    264264    psVectorClipFitPolynomial2D (map->x, stats, xMask, 0, x, wt, X, Y);
    265     psLogMsg ("psModules.astrom", 3, "x resid: %f +/- %f (%d of %d)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, x->n);
     265    psLogMsg ("psModules.astrom", 3, "x resid: %f +/- %f (%ld of %ld)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, x->n);
    266266
    267267    psVectorClipFitPolynomial2D (map->y, stats, yMask, 0, y, wt, X, Y);
    268     psLogMsg ("psModules.astrom", 3, "y resid: %f +/- %f (%d of %d)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, y->n);
     268    psLogMsg ("psModules.astrom", 3, "y resid: %f +/- %f (%ld of %ld)\n", stats->clippedMean, stats->clippedStdev, stats->clippedNvalues, y->n);
    269269
    270270    psFree (x);

  • trunk/psModules/src/camera/pmFPA.c

    r8246 r8669  
    1212* XXX: Should we implement non-linear cell->chip transforms?
    1313*
    14 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2006-08-09 02:37:07 $
     14*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2006-08-29 21:39:44 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838    // if this readout has a parent, drop that instance
    3939    if (readout->parent) {
    40         psTrace("psModules.camera", 9, "Removing readout %lx from cell %lx...\n", (size_t)readout, (size_t)readout->parent);
     40        psTrace("psModules.camera", 9, "Removing readout %zd from cell %zd...\n", (size_t)readout, (size_t)readout->parent);
    4141        psArray *readouts = readout->parent->readouts;
    4242        for (int i = 0; i < readouts->n; i++) {
    … …  
    4646        }
    4747    }
    48     psTrace("psModules.camera", 9, "Freeing readout %lx\n", (size_t) readout);
     48    psTrace("psModules.camera", 9, "Freeing readout %zd\n", (size_t) readout);
    4949    psFree(readout->image);
    5050    psFree(readout->mask);
    … …  
    5959    // if this cell has a parent, drop that instance
    6060    if (cell->parent) {
    61         psTrace("psModules.camera", 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
     61        psTrace("psModules.camera", 9, "Removing cell %zd from chip %zd...\n", (size_t)cell, (size_t)cell->parent);
    6262        psArray *cells = cell->parent->cells;
    6363        for (int i = 0; i < cells->n; i++) {
    … …  
    6767        }
    6868    }
    69     psTrace("psModules.camera", 9, "Freeing cell %lx\n", (size_t)cell);
     69    psTrace("psModules.camera", 9, "Freeing cell %zd\n", (size_t)cell);
    7070    pmCellFreeReadouts(cell);
    7171    psFree(cell->readouts);
    … …  
    8181    // if this chip has a parent, drop that instance
    8282    if (chip->parent) {
    83         psTrace("psModules.camera", 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
     83        psTrace("psModules.camera", 9, "Removing chip %zd from fpa %zd...\n", (size_t)chip, (size_t)chip->parent);
    8484        psArray *chips = chip->parent->chips;
    8585        for (int i = 0; i < chips->n; i++) {
    … …  
    9090    }
    9191
    92     psTrace("psModules.camera", 9, "Freeing chip %lx\n", (size_t)chip);
     92    psTrace("psModules.camera", 9, "Freeing chip %zd\n", (size_t)chip);
    9393    pmChipFreeCells(chip);
    9494    psFree(chip->cells);
    … …  
    109109static void FPAFree(pmFPA *fpa)
    110110{
    111     psTrace("psModules.camera", 9, "Freeing fpa %lx\n", (size_t)fpa);
     111    psTrace("psModules.camera", 9, "Freeing fpa %zd\n", (size_t)fpa);
    112112
    113113    // NULL the parent pointers
    … …  
    149149        }
    150150        tmpReadout->parent = NULL;
    151         psTrace("psModules.camera", 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
     151        psTrace("psModules.camera", 9, "Will now free readout %zd...\n", (size_t)tmpReadout);
    152152    }
    153153    cell->readouts = psArrayRealloc(cell->readouts, 0);

  • trunk/psModules/src/camera/pmFPACopy.c

    r8246 r8669  
    289289    psArray *sourceCells = source->cells; // The source cells
    290290    if (targetCells->n != sourceCells->n) {
    291         psError(PS_ERR_IO, true, "Number of source cells (%d) differs from the number of target cells (%d)\n",
     291        psError(PS_ERR_IO, true, "Number of source cells (%ld) differs from the number of target cells (%ld)\n",
    292292                sourceCells->n, targetCells->n);
    293293        return false;
    … …  
    326326    psArray *sourceChips = source->chips; // The source chips
    327327    if (targetChips->n != sourceChips->n) {
    328         psError(PS_ERR_IO, true, "Number of source chips (%d) differs from the number of target chips (%d)\n",
     328        psError(PS_ERR_IO, true, "Number of source chips (%ld) differs from the number of target chips (%ld)\n",
    329329                sourceChips->n, targetChips->n);
    330330        return false;

  • trunk/psModules/src/camera/pmFPAMosaic.c

    r8246 r8669  
    586586        good = false;
    587587    }
    588     psTrace("psModules.camera", 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
     588    psTrace("psModules.camera", 5, "Cell %ld: x0=%d y0=%d\n", index, x0Cell, y0Cell);
    589589
    590590    // Offset of the chip on the FPA
    … …  
    682682    masks->data[index]   = psMemIncrRefCounter(readout->mask);
    683683
    684     psTrace("psModules.camera", 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
     684    psTrace("psModules.camera", 9, "Added cell (%p) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
    685685            x0->data.S32[index], y0->data.S32[index], xBin->data.S32[index], yBin->data.S32[index],
    686686            xFlip->data.U8[index], yFlip->data.U8[index]);

  • trunk/psModules/src/camera/pmFPAfile.c

    r7727 r8669  
    218218    }
    219219    if (view->chip >= in->chips->n) {
    220         psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %d", view->chip, in->chips->n);
     220        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n);
    221221        return false;
    222222    }
    … …  
    229229    }
    230230    if (view->cell >= inChip->cells->n) {
    231         psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %d",
     231        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
    232232                view->cell, inChip->cells->n);
    233233        return false;
    … …  
    261261    }
    262262    if (view->chip >= in->chips->n) {
    263         psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %d", view->chip, in->chips->n);
     263        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n);
    264264        return false;
    265265    }
    … …  
    272272    }
    273273    if (view->cell >= inChip->cells->n) {
    274         psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %d",
     274        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
    275275                view->cell, inChip->cells->n);
    276276        return false;

  • trunk/psModules/src/camera/pmFPAfileDefine.c

    r8246 r8669  
    243243            file->camera = pmConfigCameraByName(config, words->data[0]);
    244244            if (!file->camera) {
    245                 psError(PS_ERR_IO, false, "camera %s not found\n", words->data[0]);
     245                psError(PS_ERR_IO, false, "camera %s not found\n", (char *)words->data[0]);
    246246                psFree(words);
    247247                return NULL;
    … …  
    305305    }
    306306    if (infiles->n < 1) {
    307         psError(PS_ERR_IO, false, "Found n == %d files in %s in arguments\n", infiles->n, argname);
     307        psError(PS_ERR_IO, false, "Found n == %ld files in %s in arguments\n", infiles->n, argname);
    308308        return NULL;
    309309    }
    … …  
    318318    format = pmConfigCameraFormatFromHeader (config, phu);
    319319    if (!format) {
    320         psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
     320        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
    321321        psFree(phu);
    322322        return NULL;
    … …  
    326326    fpa = pmFPAConstruct (config->camera);
    327327    if (!fpa) {
    328         psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
     328        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
    329329        return NULL;
    330330    }
    … …  
    433433    }
    434434    if (infiles->n <= entry) {
    435         psError(PS_ERR_IO, false, "only %d files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
     435        psError(PS_ERR_IO, false, "only %ld files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
    436436        return NULL;
    437437    }
    … …  
    448448    format = pmConfigCameraFormatFromHeader (config, phu);
    449449    if (!format) {
    450         psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
     450        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
    451451        psFree(phu);
    452452        return NULL;
    … …  
    456456    fpa = pmFPAConstruct (config->camera);
    457457    if (!fpa) {
    458         psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
     458        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
    459459        return NULL;
    460460    }

  • trunk/psModules/src/camera/pmFPAfileFitsIO.c

    r7726 r8669  
    3030
    3131    if (view->chip >= fpa->chips->n) {
    32         psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
     32        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
    3333        return false;
    3434    }
    … …  
    4141
    4242    if (view->cell >= chip->cells->n) {
    43         psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
     43        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
    4444        return false;
    4545    }
    … …  
    9393
    9494    if (view->chip >= fpa->chips->n) {
    95         psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
     95        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
    9696        return false;
    9797    }
    … …  
    104104
    105105    if (view->cell >= chip->cells->n) {
    106         psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
     106        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
    107107        return false;
    108108    }
    … …  
    178178
    179179    if (view->chip >= fpa->chips->n) {
    180         psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
     180        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
    181181        return false;
    182182    }
    … …  
    190190
    191191    if (view->cell >= chip->cells->n) {
    192         psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
     192        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
    193193        return false;
    194194    }

  • trunk/psModules/src/camera/pmHDUGenerate.c

    r8582 r8669  
    252252                numReadouts = readouts->n;
    253253            } else if (readouts->n != numReadouts) {
    254                 psError(PS_ERR_IO, true, "Number of readouts doesn't match: %d vs %d\n", readouts->n,
     254                psError(PS_ERR_IO, true, "Number of readouts doesn't match: %ld vs %d\n", readouts->n,
    255255                        numReadouts);
    256256                return false;
    … …  
    336336
    337337                if (biassecs->n != readout->bias->n) {
    338                     psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%d) and number of biases (%d)"
     338                    psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%ld) and number of biases (%ld)"
    339339                             " do not match.\n", biassecs->n, readout->bias->n);
    340340                }

  • trunk/psModules/src/camera/pmHDUUtils.c

    r8246 r8669  
    102102    }
    103103
    104     psTrace("psModules.camera", level + 1, "Format: %x\n", hdu->format);
     104    psTrace("psModules.camera", level + 1, "Format: %p\n", hdu->format);
    105105    if (header) {
    106106        if (hdu->header) {

  • trunk/psModules/src/concepts/pmConcepts.c

    r8246 r8669  
    189189    }
    190190
    191     psTrace("psModules.concepts", 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
     191    psTrace("psModules.concepts", 3, "Writing concepts (%p %p %p): %d\n", fpa, chip, cell, source);
    192192
    193193    if (source & PM_CONCEPT_SOURCE_CAMERA) {
    … …  
    212212{
    213213    PS_ASSERT_PTR_NON_NULL(fpa, false);
    214     psTrace("psModules.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     214    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
    215215    return conceptsBlank(&conceptsFPA, fpa->concepts);
    216216}
    … …  
    225225{
    226226    PS_ASSERT_PTR_NON_NULL(fpa, false);
    227     psTrace("psModules.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     227    psTrace("psModules.concepts", 5, "Reading FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
    228228    bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
    229229    if (propagateDown) {
    … …  
    248248{
    249249    PS_ASSERT_PTR_NON_NULL(fpa, false);
    250     psTrace("psModules.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     250    psTrace("psModules.concepts", 5, "Writing FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
    251251    bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
    252252    if (propagateDown) {
    … …  
    267267{
    268268    PS_ASSERT_PTR_NON_NULL(chip, false);
    269     psTrace("psModules.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
     269    psTrace("psModules.concepts", 5, "Blanking chip concepts: %p %p\n", conceptsChip, chip->concepts);
    270270    return conceptsBlank(&conceptsChip, chip->concepts);
    271271}
    … …  
    280280{
    281281    PS_ASSERT_PTR_NON_NULL(chip, false);
    282     psTrace("psModules.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
     282    psTrace("psModules.concepts", 5, "Reading chip concepts: %p %p\n", conceptsChip, chip->concepts);
    283283    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
    284284    bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db,
    … …  
    308308{
    309309    PS_ASSERT_PTR_NON_NULL(chip, false);
    310     psTrace("psModules.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
     310    psTrace("psModules.concepts", 5, "Writing chip concepts: %p %p\n", conceptsChip, chip->concepts);
    311311    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
    312312    bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
    … …  
    331331{
    332332    PS_ASSERT_PTR_NON_NULL(cell, false);
    333     psTrace("psModules.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
     333    psTrace("psModules.concepts", 5, "Blanking cell concepts: %p %p\n", conceptsCell, cell->concepts);
    334334    return conceptsBlank(&conceptsCell, cell->concepts);
    335335}
    … …  
    343343{
    344344    PS_ASSERT_PTR_NON_NULL(cell, false);
    345     psTrace("psModules.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
     345    psTrace("psModules.concepts", 5, "Reading cell concepts: %p %p\n", conceptsCell, cell->concepts);
    346346    pmChip *chip = cell->parent;        // Chip to which the cell belongs
    347347    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
    … …  
    371371{
    372372    PS_ASSERT_PTR_NON_NULL(cell, false);
    373     psTrace("psModules.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
     373    psTrace("psModules.concepts", 5, "Writing cell concepts: %p %p\n", conceptsCell, cell->concepts);
    374374    pmChip *chip = cell->parent;        // Chip to which the cell belongs
    375375    pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
    … …  
    704704    psArray *sourceChips = source->chips; // Chips in source
    705705    if (targetChips->n != sourceChips->n) {
    706         psError(PS_ERR_IO, true, "Number of chips in target (%d) and source (%d) differ --- unable to copy "
     706        psError(PS_ERR_IO, true, "Number of chips in target (%ld) and source (%ld) differ --- unable to copy "
    707707                "concepts.\n", targetChips->n, sourceChips->n);
    708708        return false;
    … …  
    720720        psArray *sourceCells = sourceChip->cells; // Cells in source
    721721        if (targetCells->n != sourceCells->n) {
    722             psError(PS_ERR_IO, true, "Number of cells in target (%d) and source (%d) differ for chip %d ---"
     722            psError(PS_ERR_IO, true, "Number of cells in target (%ld) and source (%ld) differ for chip %d ---"
    723723                    " unable to copy concepts.\n", targetCells->n, sourceCells->n, i);
    724724            return false;

  • trunk/psModules/src/concepts/pmConceptsRead.c

    r8246 r8669  
    156156                if (!conceptParse(spec, conceptItem, cameraFormat, target, NULL, NULL, cell)) {
    157157                    psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from camera "
    158                             "configuration.  It has a weird %s.SOURCE: %s\n", name, name);
     158                            "configuration.\n", name);
    159159                    status = false;
    160160                }
    … …  
    199199        psString name = specItem->name; // The concept name
    200200        psMetadataItem *conceptItem = psMetadataLookup(defaults, name); // The concept, or NULL
    201         psTrace("psModules.concepts", 10, "%s: %x\n", name, conceptItem);
     201        psTrace("psModules.concepts", 10, "%s: %p\n", name, conceptItem);
    202202        if (conceptItem && conceptItem->type == PS_DATA_METADATA) {
    203203            psTrace("psModules.concepts", 5, "%s is of type METADATA.\n", name);

  • trunk/psModules/src/concepts/pmConceptsStandard.c

    r7743 r8669  
    6969                    sscanf(concept->data.V, "%d %d %f", &big, &medium, &small) != 3)
    7070            {
    71                 psError(PS_ERR_UNKNOWN, true, "Cannot interpret FPA.RA: %s\n", concept->data.V);
     71                psError(PS_ERR_UNKNOWN, true, "Cannot interpret FPA.RA: %s\n", concept->data.str);
    7272                break;
    7373            }

  • trunk/psModules/src/concepts/pmConceptsWrite.c

    r8246 r8669  
    140140    switch (item->type) {
    141141    case PS_DATA_STRING:
    142         psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.V);
     142        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.str);
    143143        return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
    144144                                item->data.V);
    … …  
    190190        psList *keys = psStringSplit(keywords, " ,;", true); // List of keywords
    191191        if (keys->n != values->n) {
    192             psLogMsg(__func__, PS_LOG_WARN, "Number of keywords (%d) does not match number of values (%d).\n",
     192            psLogMsg(__func__, PS_LOG_WARN, "Number of keywords (%ld) does not match number of values (%ld).\n",
    193193                     keys->n, values->n);
    194194        }
    … …  
    259259                        continue;
    260260                    }
    261                     psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.V);
     261                    psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.str);
    262262                    writeHeader(hdu, cameraItem->data.V, formatted);
    263263                } else if (strcasecmp(source, "VALUE") == 0) {
    … …  
    384384                continue;
    385385            }
    386             psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.V);
     386            psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.str);
    387387            psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
    388388            psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);

  • trunk/psModules/src/config/pmConfig.c

    r8624 r8669  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-08-26 03:14:40 $
     5 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-08-29 21:39:44 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    931931
    932932            if (globList.gl_pathc == 0) {
    933                 psError(PS_ERR_IO, true, "No match for %s", words->data[i]);
     933                psError(PS_ERR_IO, true, "No match for %s", (char *)words->data[i]);
    934934                return input;
    935935            }

  • trunk/psModules/src/detrend/pmFlatNormalize.c

    r8397 r8669  
    2828        if (*expFluxesPtr) {
    2929            PS_ASSERT_VECTOR_TYPE(*expFluxesPtr, PS_TYPE_F32, false);
    30             PS_ASSERT_VECTOR_SIZE(*expFluxesPtr, numExps, false);
     30            PS_ASSERT_VECTOR_SIZE(*expFluxesPtr, (long)numExps, false);
    3131        } else {
    3232            *expFluxesPtr = psVectorAlloc(numExps, PS_TYPE_F32);
    … …  
    4343        if (*chipGainsPtr) {
    4444            PS_ASSERT_VECTOR_TYPE(*chipGainsPtr, PS_TYPE_F32, false);
    45             PS_ASSERT_VECTOR_SIZE(*chipGainsPtr, numChips, false);
     45            PS_ASSERT_VECTOR_SIZE(*chipGainsPtr, (long)numChips, false);
    4646        } else {
    4747            *chipGainsPtr = psVectorAlloc(numChips, PS_TYPE_F32);

  • trunk/psModules/src/detrend/pmFringeStats.c

    r8246 r8669  
    33 *  @author Eugene Magnier, IfA
    44 *
    5  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-08-09 02:37:07 $
     5 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-08-29 21:39:44 $
    77 *
    88 *  Copyright 2004 IfA
    … …  
    115115    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, false);
    116116    PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, false);
    117     PS_ASSERT_VECTOR_SIZE(x, numRows, false);
    118     PS_ASSERT_VECTOR_SIZE(y, numRows, false);
     117    PS_ASSERT_VECTOR_SIZE(x, (long)numRows, false);
     118    PS_ASSERT_VECTOR_SIZE(y, (long)numRows, false);
    119119    if (mask) {
    120120        PS_ASSERT_VECTOR_NON_NULL(mask, false);
    121121        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, false);
    122         PS_ASSERT_VECTOR_SIZE(mask, numRows, false);
     122        PS_ASSERT_VECTOR_SIZE(mask, (long)numRows, false);
    123123    }
    124124
    … …  
    356356    PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F32, false);
    357357    PS_ASSERT_VECTOR_TYPE(df, PS_TYPE_F32, false);
    358     PS_ASSERT_VECTOR_SIZE(f, numRows, false);
    359     PS_ASSERT_VECTOR_SIZE(df, numRows, false);
     358    PS_ASSERT_VECTOR_SIZE(f, (long)numRows, false);
     359    PS_ASSERT_VECTOR_SIZE(df, (long)numRows, false);
    360360
    361361    // We need to write:
    … …  
    388388    PS_ASSERT_INT_POSITIVE(regions->nRequested, NULL);
    389389    PS_ASSERT_VECTORS_SIZE_EQUAL(regions->x, regions->y, NULL);
    390     PS_ASSERT_VECTOR_SIZE(regions->x, regions->nRequested, NULL);
     390    PS_ASSERT_VECTOR_SIZE(regions->x, (long)regions->nRequested, NULL);
    391391
    392392    if (extname && strlen(extname) > 0) {

  • trunk/psModules/src/detrend/pmNonLinear.c

    r7604 r8669  
    1010 *  @author GLG, MHPCC
    1111 *
    12  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2006-06-21 03:21:16 $
     12 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-08-29 21:39:44 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8080        tableSize = PS_MIN(inFlux->n, outFlux->n);
    8181        psLogMsg(__func__, PS_LOG_WARN,
    82                  "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
     82                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%ld, %ld)\n", inFlux->n, outFlux->n);
    8383    }
    8484    PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL);

  • trunk/psModules/src/detrend/pmSubtractBias.c

    r8246 r8669  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2006-08-09 02:37:07 $
     13 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2006-08-29 21:39:44 $
    1515 *
    1616 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    288288        psStatsOptions statistic = psStatsSingleOption(overscanOpts->stat->options); // Statistic to use
    289289        if (statistic == 0) {
    290             psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %x\n",
     290            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %p\n",
    291291                    overscanOpts->stat);
    292292            return false;

  • trunk/psModules/src/imcombine/pmImageCombine.c

    r8246 r8669  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2006-08-09 02:37:07 $
     10 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2006-08-29 21:39:44 $
    1212 *
    1313 *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
    … …  
    5050    PS_ASSERT_PTR_NON_NULL(images, combine);
    5151    psU32 numImages = images->n;
    52     psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%d)\n", images->n);
     52    psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%ld)\n", images->n);
    5353
    5454    if (errors != NULL) {
    5555        if (images->n != errors->n) {
    56             psError(PS_ERR_UNKNOWN, true, "images and errors args must have same length (%d != %d)\n",
     56            psError(PS_ERR_UNKNOWN, true, "images and errors args must have same length (%ld != %ld)\n",
    5757                    images->n, errors->n);
    5858            return(combine);
    … …  
    6161    if (masks != NULL) {
    6262        if (images->n != masks->n) {
    63             psError(PS_ERR_UNKNOWN, true, "images and masks args must have same length (%d != %d)\n",
     63            psError(PS_ERR_UNKNOWN, true, "images and masks args must have same length (%ld != %ld)\n",
    6464                    images->n, masks->n);
    6565            return(combine);
    … …  
    297297    psFree(qpPtr);
    298298
    299     psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%d)\n", images->n);
     299    psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%ld)\n", images->n);
    300300    return(combine);
    301301}

  • trunk/psModules/src/imcombine/pmImageSubtract.c

    r8246 r8669  
    77 *  @author GLG, MHPCC
    88 *
    9  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2006-08-09 02:37:07 $
     9 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2006-08-29 21:39:44 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    191191    PS_ASSERT_VECTOR_NON_NULL(orders, NULL);
    192192    psTrace("psModules.imcombine", 3,
    193             "Calling pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
     193            "Calling pmSubtractionKernelsAllocISIS(%ld, %ld, %d, %d)\n",
    194194            sigmas->n, orders->n, size, spatialOrder);
    195195    PS_ASSERT_INT_POSITIVE(size, NULL);
    … …  
    307307
    308308    psTrace("psModules.imcombine", 3,
    309             "Exiting pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
     309            "Exiting pmSubtractionKernelsAllocISIS(%ld, %ld, %d, %d)\n",
    310310            sigmas->n, orders->n, size, spatialOrder);
    311311    return(tmp);
    … …  
    679679    }
    680680    psS32 nBF = kernels->u->n;
    681     PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
     681    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, NULL);
    682682
    683683    psS32 numCols = input->numCols;
    … …  
    826826            } else {
    827827                PS_ASSERT_VECTOR_TYPE(stampVector, PS_TYPE_F64, false);
    828                 PS_ASSERT_VECTOR_SIZE(stampVector, numSolveParams, false);
     828                PS_ASSERT_VECTOR_SIZE(stampVector, (long)numSolveParams, false);
    829829            }
    830830            psVectorInit(stampVector, 0.0);
    … …  
    10381038    if (solution != NULL) {
    10391039        PS_ASSERT_VECTOR_TYPE(solution, PS_TYPE_F64, NULL);
    1040         PS_ASSERT_VECTOR_SIZE(solution, size, NULL);
     1040        PS_ASSERT_VECTOR_SIZE(solution, (long)size, NULL);
    10411041    } else {
    10421042        solution = psVectorAlloc(size, PS_TYPE_F64);
    … …  
    10701070            psVector *stampVector = stamp->vector;
    10711071            PS_ASSERT_VECTOR_TYPE(stampVector, PS_TYPE_F64, NULL);
    1072             PS_ASSERT_VECTOR_SIZE(stampVector, size, NULL);
     1072            PS_ASSERT_VECTOR_SIZE(stampVector, (long)size, NULL);
    10731073            PS_ASSERT_IMAGE_TYPE(stampMatrix, PS_TYPE_F64, NULL);
    10741074            PS_ASSERT_IMAGE_SIZE(stampMatrix, size, size, NULL);
    … …  
    11771177    }
    11781178    psS32 nBF = kernels->u->n;
    1179     PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
     1179    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, NULL);
    11801180
    11811181    psS32 kernelSize = kernels->size;
    … …  
    12691269
    12701270    psS32 nBF = kernels->u->n;
    1271     PS_ASSERT_VECTOR_SIZE(solution, nBF+1, false);
     1271    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, false);
    12721272
    12731273    psVector *deviations = CalculateDeviations(NULL,

  • trunk/psModules/src/imcombine/pmReadoutCombine.c

    r8246 r8669  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-08-09 02:37:07 $
     7 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-08-29 21:39:44 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    136136
    137137        if (!readout || !readout->image) {
    138             psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %d is NULL or has NULL image.\n", i);
     138            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %ld is NULL or has NULL image.\n", i);
    139139            return false;
    140140        }
    … …  
    151151        if (readout->weight) {
    152152            if (valid && !haveWeights) {
    153                 psLogMsg(__func__, PS_LOG_WARN, "Readout %d has a weight map, but others don't --- "
     153                psLogMsg(__func__, PS_LOG_WARN, "Readout %ld has a weight map, but others don't --- "
    154154                         "weights ignored.\n", i);
    155155            } else {
    … …  
    157157            }
    158158        } else if (haveWeights) {
    159             psLogMsg(__func__, PS_LOG_WARN, "Readout %d doesn't have a weight map, but others do --- "
     159            psLogMsg(__func__, PS_LOG_WARN, "Readout %ld doesn't have a weight map, but others do --- "
    160160                     "weights ignored.\n", i);
    161161            haveWeights = false;
    … …  
    168168        minInputCols = PS_MIN(minInputCols, readout->col0);
    169169        maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
    170         psTrace("psModules.imcombine", 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
     170        psTrace("psModules.imcombine", 7, "Readout %ld: offset %d,%d; size %dx%d\n", i,
    171171                readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
    172172    }

  • trunk/psModules/src/objects/pmPSFtry.c

    r8436 r8669  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-08-21 14:52:02 $
     7 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-08-29 21:39:44 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    128128        Next ++;
    129129    }
    130     psLogMsg ("psphot.psftry", 4, "fit ext:   %f sec for %d of %d sources\n", psTimerMark ("fit"), Next, sources->n);
    131     psTrace ("psphot.psftry", 3, "keeping %d of %d PSF candidates (EXT)\n", Next, sources->n);
     130    psLogMsg ("psphot.psftry", 4, "fit ext:   %f sec for %d of %ld sources\n", psTimerMark ("fit"), Next, sources->n);
     131    psTrace ("psphot.psftry", 3, "keeping %d of %ld PSF candidates (EXT)\n", Next, sources->n);
    132132
    133133    // stage 2: construct a psf (pmPSF) from this collection of model fits
    … …  
    184184    psfTry->psf->nPSFstars = Npsf;
    185185
    186     psLogMsg ("psphot.psftry", 4, "fit psf:   %f sec for %d of %d sources\n", psTimerMark ("fit"), Npsf, sources->n);
    187     psTrace ("psphot.psftry", 3, "keeping %d of %d PSF candidates (PSF)\n", Npsf, sources->n);
     186    psLogMsg ("psphot.psftry", 4, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("fit"), Npsf, sources->n);
     187    psTrace ("psphot.psftry", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, sources->n);
    188188
    189189    // measure the chi-square trend as a function of flux (PAR[1])

  • trunk/psModules/src/objects/pmPeaks.c

    r8422 r8669  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-08-18 14:13:29 $
     8 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-08-29 21:39:44 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    543543    output->n = 0;
    544544
    545     psTrace (".pmObjects.pmCullPeaks", 3, "list size is %d\n", peaks->n);
     545    psTrace (".pmObjects.pmCullPeaks", 3, "list size is %ld\n", peaks->n);
    546546
    547547    for (int i = 0; i < peaks->n; i++) {

  • trunk/psModules/src/objects/pmSourceIO.c

    r7725 r8669  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-06-28 19:21:00 $
     5 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-08-29 21:39:44 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7070
    7171    if (view->chip >= fpa->chips->n) {
    72         psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %d)", view->chip, fpa->chips->n);
     72        psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %ld)", view->chip, fpa->chips->n);
    7373        return false;
    7474    }
    … …  
    8484
    8585    if (view->cell >= chip->cells->n) {
    86         psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %d)",
     86        psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %ld)",
    8787                view->cell, chip->cells->n);
    8888        return false;
    … …  
    100100
    101101    if (view->readout >= cell->readouts->n) {
    102         psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %d)",
     102        psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %ld)",
    103103                view->readout, cell->readouts->n);
    104104        return false;
Note: See TracChangeset for help on using the changeset viewer.