IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 7, 2007, 1:58:17 PM (19 years ago)
Author:
jhoblitt
Message:

update psAbort() API

Location:
trunk/psModules/src/camera
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r9621 r11687  
    3030        return NameREADOUT;
    3131    default:
    32         psAbort(PS_FILE_LINE, "You can't get here; level = %d", level);
     32        psAbort("You can't get here; level = %d", level);
    3333    }
    3434    return NULL;

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

    r11255 r11687  
    497497                COPY_WITH_PARITY_DIFFERENCE(U8);
    498498            default:
    499                 psAbort(__func__, "Should never get here.\n");
     499                psAbort("Should never get here.\n");
    500500            }
    501501
    … …  
    526526                FILL_IN(U8);
    527527            default:
    528                 psAbort(__func__, "Should never get here.\n");
     528                psAbort("Should never get here.\n");
    529529            }
    530530

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

    r11624 r11687  
    138138        }
    139139    } else {
    140         psAbort(__func__, "Read direction can only be 1 (rows) or 2 (cols).\n");
     140        psAbort("Read direction can only be 1 (rows) or 2 (cols).\n");
    141141    }
    142142
    … …  
    204204        break;
    205205    default:
    206         psAbort(__func__, "Unknown read type: %x\n", type);
     206        psAbort("Unknown read type: %x\n", type);
    207207    }
    208208
    … …  
    258258            break;
    259259        default:
    260             psAbort(__func__, "Unknown read type: %x\n", type);
     260            psAbort("Unknown read type: %x\n", type);
    261261        }
    262262

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

    r11626 r11687  
    8686        return &hdu->weights;
    8787    default:
    88         psAbort(__func__, "Unknown write type: %x\n", type);
     88        psAbort("Unknown write type: %x\n", type);
    8989    }
    9090    return NULL;
    … …  
    105105        return pmHDUWriteWeight(hdu, fits);
    106106    default:
    107         psAbort(__func__, "Unknown write type: %x\n", type);
     107        psAbort("Unknown write type: %x\n", type);
    108108    }
    109109    return false;

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

    r11475 r11687  
    768768    // a camera config is needed (as source of file rule)
    769769    if (config->cameraName == NULL) {
    770         psAbort ("pmFPAfileDefine", "camera defined but not cameraName!");
     770        psAbort("camera defined but not cameraName!");
    771771    }
    772772
    … …  
    807807    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PPIMAGE");
    808808    if (!status)
    809         psAbort ("psModules", "PPIMAGE recipe not found");
     809        psAbort("PPIMAGE recipe not found");
    810810    psMetadata *detConstraints = psMetadataLookupPtr (&status, recipe, "DETREND.CONSTRAINTS");
    811811    if (!status)
    812         psAbort ("psModules", "DETREND.CONSTRAINTS not found");
     812        psAbort("DETREND.CONSTRAINTS not found");
    813813    // XXX allow this and just skip?
    814814
    … …  
    816816    psMetadata *constraints = psMetadataLookupPtr (&status, detConstraints, typeName);
    817817    if (!status) {
    818         psAbort ("psModules", "DETREND.CONSTRAINTS for type %s not found", typeName);
     818        psAbort("DETREND.CONSTRAINTS for type %s not found", typeName);
    819819    }
    820820    psFree(typeName);
    … …  
    825825    while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
    826826        if (item->type != PS_DATA_STRING) {
    827             psAbort ("psModules", "invalid type for DETREND.CONSTRAINT element");
     827            psAbort("invalid type for DETREND.CONSTRAINT element");
    828828        }
    829829        char *option  = item->name;     // item->name must correspond to a valid detselect option
    … …  
    833833            options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
    834834            if (!status)
    835                 psAbort ("psModules", "failed to find filter (concept %s)", concept);
     835                psAbort("failed to find filter (concept %s)", concept);
    836836
    837837        }
    … …  
    839839            options->exptime = psMetadataLookupF32 (&status, input->concepts, concept);
    840840            if (!status)
    841                 psAbort ("psModules", "exptime not found (concept %s)", concept);
     841                psAbort("exptime not found (concept %s)", concept);
    842842        }
    843843        if (!strcasecmp (option, "airmass")) {
    844844            options->airmass = psMetadataLookupF32 (&status, input->concepts, concept);
    845845            if (!status)
    846                 psAbort ("psModules", "airmass not found (concept %s)", concept);
     846                psAbort("airmass not found (concept %s)", concept);
    847847        }
    848848        # if (0)
    … …  
    850850                options->dettemp = psMetadataLookupF32 (&status, input->concepts, concept);
    851851                if (!status)
    852                     psAbort ("psModules", "dettemp not found (concept %s)", concept);
     852                    psAbort("dettemp not found (concept %s)", concept);
    853853            }
    854854        if (!strcasecmp (option, "version")) {
    … …  
    856856            options->version = psMetadataLookupF32 (&status, input->concepts, concept);
    857857            if (!status)
    858                 psAbort ("psModules", "version not found (concept %s)", concept);
     858                psAbort("version not found (concept %s)", concept);
    859859        }
    860860        if (!strcasecmp (option, "twilight")) {
    … …  
    863863            options->twilight = psMetadataLookupF32 (&status, input->concepts, concept);
    864864            if (!status)
    865                 psAbort ("psModules", "twilight not found (concept %s)", concept);
     865                psAbort("twilight not found (concept %s)", concept);
    866866        }
    867867        # endif

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

    r11339 r11687  
    4747    case PM_FPA_LEVEL_NONE:
    4848    default:
    49         psAbort(PS_FILE_LINE, "Should never get here: bad phu level.\n");
     49        psAbort("Should never get here: bad phu level.\n");
    5050    }
    5151
    … …  
    8787    case PM_FPA_LEVEL_NONE:
    8888    default:
    89         psAbort(PS_FILE_LINE, "Should never get here: bad phu level.\n");
     89        psAbort("Should never get here: bad phu level.\n");
    9090    }
    9191    return NULL;
    … …  
    280280    case PM_FPA_LEVEL_NONE:
    281281    default:
    282         psAbort(PS_FILE_LINE, "Should never reach here: invalid file level.");
     282        psAbort("Should never reach here: invalid file level.");
    283283    }
    284284

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

    r11450 r11687  
    7575            }
    7676        default:
    77             psAbort ("pmFPAfileIO", "fileLevel not correctly set");
     77            psAbort("fileLevel not correctly set");
    7878            break;
    7979        }
    … …  
    126126            }
    127127        default:
    128             psAbort ("pmFPAfileIO", "fileLevel not correctly set");
     128            psAbort("fileLevel not correctly set");
    129129            break;
    130130        }
    … …  
    800800            break;
    801801        default:
    802             psAbort(PS_FILE_LINE, "You can't get here");
     802            psAbort("You can't get here");
    803803        }
    804804    }
    … …  
    821821            break;
    822822        default:
    823             psAbort(PS_FILE_LINE, "You can't get here");
     823            psAbort("You can't get here");
    824824        }
    825825    }

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

    r9710 r11687  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-10-21 04:02:36 $
     5 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-02-07 23:58:17 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    289289        hdu  = pmHDUFromCell (cell);
    290290        if (!hdu) {
    291             psAbort("psModules", "a split readout is not covered by the current paradigm");
     291            psAbort("a split readout is not covered by the current paradigm");
    292292        }
    293293        if (hdu->blankPHU)

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

    r11254 r11687  
    119119        break;
    120120    default:
    121         psAbort(__func__, "Shouldn't ever get here!\n");
     121        psAbort("Shouldn't ever get here!\n");
    122122    }
    123123
    … …  
    381381            psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
    382382            if (!mdok || !trimsec) {
    383                 psAbort(__func__, "Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n");
     383                psAbort("Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n");
    384384            }
    385385            psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias secionts
    386386            if (!mdok || !biassecs) {
    387                 psAbort(__func__, "Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n");
     387                psAbort("Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n");
    388388            }
    389389            psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
    … …  
    557557        return pmHDUGenerateForChip(cell->parent);
    558558    default:
    559         psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
     559        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
    560560    }
    561561    return false;
    … …  
    605605        return pmHDUGenerateForFPA(chip->parent);
    606606    default:
    607         psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
     607        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
    608608    }
    609609    return false;
    … …  
    647647        }
    648648    default:
    649         psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
     649        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
    650650    }
    651651    return false;
Note: See TracChangeset for help on using the changeset viewer.