IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 1, 2006, 2:55:23 PM (20 years ago)
Author:
Paul Price
Message:

Addition of a vast quantity of assertions in public functions. Adopted a policy of using assert() within file-static functions (since they are only called internally, any errors there are problems with the program) and using the PS_ASSERT_WHATEVER() macros within public functions. Cleaned a few things up in the process.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r7253 r7278  
    99#include "pmConceptsStandard.h"
    1010
     11// The functions in this file are intended to be called solely within the psModules concepts code.  For this
     12// reason, they use "assert" instead of the PS_ASSERT_WHATEVER functions --- if there's a problem, then
     13// there's a BIG problem that affects all of the code.
    1114
    1215#define COMPARE_REGIONS(a,b) (((a)->x0 == (b)->x0 && \
    … …  
    3841
    3942// FPA.RA and FPA.DEC
    40 psMetadataItem *pmConceptParse_FPA_Coords(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     43psMetadataItem *p_pmConceptParse_FPA_Coords(psMetadataItem *concept,
     44        psMetadataItem *pattern,
     45        psMetadata *cameraFormat,
     46        pmFPA *fpa,
     47        pmChip *chip,
     48        pmCell *cell)
    4149{
    4250    assert(concept);
    … …  
    102110
    103111// FPA.RA and FPA.DEC
    104 psMetadataItem *pmConceptFormat_FPA_Coords(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat)
    105 {
    106     assert(concept);
    107     assert(pattern);
     112psMetadataItem *p_pmConceptFormat_FPA_Coords(psMetadataItem *concept,
     113        psMetadata *cameraFormat,
     114        pmFPA *fpa,
     115        pmChip *chip,
     116        pmCell *cell)
     117{
     118    assert(concept);
    108119    assert(cameraFormat);
    109120
    … …  
    112123    // How to interpret the coordinates
    113124    bool mdok = true;                   // Status of MD lookup
    114     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     125    psMetadata *formats = psMetadataLookupMD(&mdok,
     126                          cameraFormat,
     127                          "FORMATS");
    115128    if (mdok && formats) {
    116         psString format = psMetadataLookupStr(&mdok, formats, pattern->name);
     129        psString format = psMetadataLookupStr(&mdok,formats, concept->name);
    117130        if (mdok && strlen(format) > 0) {
    118131            if (strcasecmp(format, "HOURS") == 0) {
    … …  
    123136                // No action required
    124137            } else {
    125                 coords /= defaultCoordScaling(pattern);
     138                coords /= defaultCoordScaling(concept);
    126139            }
    127140        } else {
    128             coords /= defaultCoordScaling(pattern);
     141            coords /= defaultCoordScaling(concept);
    129142        }
    130143    } else {
    131         coords /= defaultCoordScaling(pattern);
     144        coords /= defaultCoordScaling(concept);
    132145    }
    133146
    … …  
    140153    psString coordString = NULL;        // String with the coordinates in sexagesimal format
    141154    psStringAppend(&coordString, "%d:%d:%.2f", big, medium, small);
    142     psMetadataItem *coordItem = psMetadataItemAllocStr(pattern->name, pattern->comment, coordString);
     155    psMetadataItem *coordItem = psMetadataItemAllocStr(concept->name, concept->comment, coordString);
    143156    psFree(coordString);
    144157
    … …  
    147160
    148161
    149 psMetadataItem *pmConceptParse_CELL_TRIMSEC(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     162psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(psMetadataItem *concept,
     163        psMetadataItem *pattern,
     164        psMetadata *cameraFormat,
     165        pmFPA *fpa,
     166        pmChip *chip,
     167        pmCell *cell)
    150168{
    151169    assert(concept);
    … …  
    167185}
    168186
    169 psMetadataItem *pmConceptParse_CELL_BIASSEC(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     187psMetadataItem *p_pmConceptParse_CELL_BIASSEC(psMetadataItem *concept,
     188        psMetadataItem *pattern,
     189        psMetadata *cameraFormat,
     190        pmFPA *fpa,
     191        pmChip *chip,
     192        pmCell *cell)
    170193{
    171194    assert(concept);
    … …  
    218241
    219242// CELL.XBIN and CELL.YBIN
    220 psMetadataItem *pmConceptParse_CELL_Binning(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     243psMetadataItem *p_pmConceptParse_CELL_Binning(psMetadataItem *concept,
     244        psMetadataItem *pattern,
     245        psMetadata *cameraFormat,
     246        pmFPA *fpa,
     247        pmChip *chip,
     248        pmCell *cell)
    221249{
    222250    assert(concept);
    … …  
    249277
    250278
    251 psMetadataItem *pmConceptParse_CELL_TIMESYS(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     279psMetadataItem *p_pmConceptParse_CELL_TIMESYS(psMetadataItem *concept,
     280        psMetadataItem *pattern,
     281        psMetadata *cameraFormat,
     282        pmFPA *fpa,
     283        pmChip *chip,
     284        pmCell *cell)
    252285{
    253286    assert(concept);
    … …  
    274307
    275308
    276 psMetadataItem *pmConceptParse_CELL_TIME(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     309psMetadataItem *p_pmConceptParse_CELL_TIME(psMetadataItem *concept,
     310        psMetadataItem *pattern,
     311        psMetadata *cameraFormat,
     312        pmFPA *fpa,
     313        pmChip *chip,
     314        pmCell *cell)
    277315{
    278316    assert(concept);
    … …  
    466504}
    467505
    468 psMetadataItem *pmConceptParse_CELL_Positions(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     506psMetadataItem *p_pmConceptParse_CELL_Positions(psMetadataItem *concept,
     507        psMetadataItem *pattern,
     508        psMetadata *cameraFormat,
     509        pmFPA *fpa,
     510        pmChip *chip,
     511        pmCell *cell)
    469512{
    470513    assert(concept);
    … …  
    489532
    490533
    491 psMetadataItem *pmConceptFormat_CELL_TRIMSEC(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     534psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(psMetadataItem *concept,
     535        psMetadata *cameraFormat,
     536        pmFPA *fpa,
     537        pmChip *chip,
     538        pmCell *cell)
    492539{
    493540    assert(concept);
    … …  
    501548}
    502549
    503 psMetadataItem *pmConceptFormat_CELL_BIASSEC(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     550psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(psMetadataItem *concept,
     551        psMetadata *cameraFormat,
     552        pmFPA *fpa,
     553        pmChip *chip,
     554        pmCell *cell)
    504555{
    505556    // Return a metadata item containing a list of metadata items of region strings
    … …  
    523574// This function actually does both CELL.XBIN and CELL.YBIN if CELL.XBIN and CELL.YBIN are specified by the
    524575// same header.
    525 psMetadataItem *pmConceptFormat_CELL_XBIN(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     576psMetadataItem *p_pmConceptFormat_CELL_XBIN(psMetadataItem *concept,
     577        psMetadata *cameraFormat,
     578        pmFPA *fpa,
     579        pmChip *chip,
     580        pmCell *cell)
    526581{
    527582    assert(concept);
    … …  
    546601
    547602// Only need to format if both if CELL.XBIN and CELL.YBIN are not specified by the same header.
    548 psMetadataItem *pmConceptFormat_CELL_YBIN(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     603psMetadataItem *p_pmConceptFormat_CELL_YBIN(psMetadataItem *concept,
     604        psMetadata *cameraFormat,
     605        pmFPA *fpa,
     606        pmChip *chip,
     607        pmCell *cell)
    549608{
    550609    assert(concept);
    … …  
    565624
    566625
    567 psMetadataItem *pmConceptFormat_CELL_TIMESYS(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     626psMetadataItem *p_pmConceptFormat_CELL_TIMESYS(psMetadataItem *concept,
     627        psMetadata *cameraFormat,
     628        pmFPA *fpa,
     629        pmChip *chip,
     630        pmCell *cell)
    568631{
    569632    psString sys = NULL;            // String to store
    … …  
    590653}
    591654
    592 psMetadataItem *pmConceptFormat_CELL_TIME(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     655psMetadataItem *p_pmConceptFormat_CELL_TIME(psMetadataItem *concept,
     656        psMetadata *cameraFormat,
     657        pmFPA *fpa,
     658        pmChip *chip,
     659        pmCell *cell)
    593660{
    594661    psTime *time = concept->data.V;     // The time
    … …  
    699766}
    700767
    701 psMetadataItem *pmConceptFormat_CELL_Positions(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
     768psMetadataItem *p_pmConceptFormat_CELL_Positions(psMetadataItem *concept,
     769        psMetadata *cameraFormat,
     770        pmFPA *fpa,
     771        pmChip *chip,
     772        pmCell *cell)
    702773{
    703774    assert(concept);
Note: See TracChangeset for help on using the changeset viewer.