IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 8, 2006, 4:37:08 PM (20 years ago)
Author:
jhoblitt
Message:

normalize psTrace() facility names

Location:
trunk/psModules/src/concepts
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r7752 r8246  
    8989    psMetadataItem *specItem = NULL;    // Item from the specs metadata
    9090    while ((specItem = psMetadataGetAndIncrement(specsIter))) {
    91         psTrace(__func__, 9, "Blanking %s...\n", specItem->name);
     91        psTrace("psModules.concepts", 9, "Blanking %s...\n", specItem->name);
    9292        pmConceptSpec *spec = specItem->data.V; // The specification
    9393        psMetadataItem *blank = spec->blank; // The concept
    … …  
    189189    }
    190190
    191     psTrace(__func__, 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
     191    psTrace("psModules.concepts", 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
    192192
    193193    if (source & PM_CONCEPT_SOURCE_CAMERA) {
    … …  
    212212{
    213213    PS_ASSERT_PTR_NON_NULL(fpa, false);
    214     psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     214    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
    215215    return conceptsBlank(&conceptsFPA, fpa->concepts);
    216216}
    … …  
    225225{
    226226    PS_ASSERT_PTR_NON_NULL(fpa, false);
    227     psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     227    psTrace("psModules.concepts", 5, "Reading FPA concepts: %x %x\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("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     250    psTrace("psModules.concepts", 5, "Writing FPA concepts: %x %x\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("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
     269    psTrace("psModules.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
    270270    return conceptsBlank(&conceptsChip, chip->concepts);
    271271}
    … …  
    280280{
    281281    PS_ASSERT_PTR_NON_NULL(chip, false);
    282     psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
     282    psTrace("psModules.concepts", 5, "Reading chip concepts: %x %x\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("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
     310    psTrace("psModules.concepts", 5, "Writing chip concepts: %x %x\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("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
     333    psTrace("psModules.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
    334334    return conceptsBlank(&conceptsCell, cell->concepts);
    335335}
    … …  
    343343{
    344344    PS_ASSERT_PTR_NON_NULL(cell, false);
    345     psTrace("psModule.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
     345    psTrace("psModules.concepts", 5, "Reading cell concepts: %x %x\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("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
     373    psTrace("psModules.concepts", 5, "Writing cell concepts: %x %x\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

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

    r7923 r8246  
    177177    PS_ASSERT_PTR_NON_NULL(target, false);
    178178
    179     psTrace(__func__, 3, "Reading concepts from defaults...\n");
     179    psTrace("psModules.concepts", 3, "Reading concepts from defaults...\n");
    180180
    181181    pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
    … …  
    199199        psString name = specItem->name; // The concept name
    200200        psMetadataItem *conceptItem = psMetadataLookup(defaults, name); // The concept, or NULL
    201         psTrace(__func__, 10, "%s: %x\n", name, conceptItem);
     201        psTrace("psModules.concepts", 10, "%s: %x\n", name, conceptItem);
    202202        if (conceptItem && conceptItem->type == PS_DATA_METADATA) {
    203             psTrace(__func__, 5, "%s is of type METADATA.\n", name);
     203            psTrace("psModules.concepts", 5, "%s is of type METADATA.\n", name);
    204204            // Check for DEPEND
    205205            psMetadata *dependMenu = conceptItem->data.V; // The DEPEND menu
    … …  
    236236            }
    237237            const char *dependKey = dependValue->data.V; // The key to the DEPEND menu
    238             psTrace(__func__, 7, "%s.DEPEND resolves to %s....\n", name, dependKey);
     238            psTrace("psModules.concepts", 7, "%s.DEPEND resolves to %s....\n", name, dependKey);
    239239
    240240            conceptItem = psMetadataLookup(dependMenu, dependKey);

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

    r7835 r8246  
    140140    switch (item->type) {
    141141    case PS_DATA_STRING:
    142         psTrace(__func__, 9, "Writing header %s: %s\n", keyword, item->data.V);
     142        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.V);
    143143        return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
    144144                                item->data.V);
    145145    case PS_DATA_S32:
    146         psTrace(__func__, 9, "Writing header %s: %d\n", keyword, item->data.S32);
     146        psTrace("psModules.concepts", 9, "Writing header %s: %d\n", keyword, item->data.S32);
    147147        return psMetadataAddS32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
    148148                                item->data.S32);
    149149    case PS_DATA_F32:
    150         psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F32);
     150        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F32);
    151151        return psMetadataAddF32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
    152152                                item->data.F32);
    153153    case PS_DATA_F64:
    154         psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F64);
     154        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F64);
    155155        return psMetadataAddF64(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
    156156                                item->data.F64);
    157157    case PS_DATA_REGION: {
    158158            psString region = psRegionToString(*(psRegion*)item->data.V);
    159             psTrace(__func__, 9, "Writing header %s: %s\n", keyword, region);
     159            psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, region);
    160160            bool result = psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
    161161                                           region);
    … …  
    252252            psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
    253253            if (mdok && strlen(source) > 0) {
    254                 psTrace(__func__, 8, "%s is %s\n", nameSource, source);
     254                psTrace("psModules.concepts", 8, "%s is %s\n", nameSource, source);
    255255                if (strcasecmp(source, "HEADER") == 0) {
    256256                    if (cameraItem->type != PS_DATA_STRING) {
    … …  
    259259                        continue;
    260260                    }
    261                     psTrace(__func__, 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.V);
    262262                    writeHeader(hdu, cameraItem->data.V, formatted);
    263263                } else if (strcasecmp(source, "VALUE") == 0) {
    264                     psTrace(__func__, 8, "Checking %s against camera format.\n", name);
     264                    psTrace("psModules.concepts", 8, "Checking %s against camera format.\n", name);
    265265                    if (! compareConcepts(formatted, cameraItem)) {
    266266                        psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
    … …  
    384384                continue;
    385385            }
    386             psTrace(__func__, 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.V);
    387387            psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
    388388            psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
Note: See TracChangeset for help on using the changeset viewer.