Changeset 11687

Timestamp:

Feb 7, 2007, 1:58:17 PM (19 years ago)

Author:

jhoblitt

Message:

update psAbort() API

Location:

trunk/psModules/src

Files:

• astrom/pmAstrometryUtils.c (modified) (3 diffs)
• astrom/pmAstrometryWCS.c (modified) (4 diffs)
• camera/pmFPALevel.c (modified) (1 diff)
• camera/pmFPAMosaic.c (modified) (2 diffs)
• camera/pmFPARead.c (modified) (3 diffs)
• camera/pmFPAWrite.c (modified) (2 diffs)
• camera/pmFPAfileDefine.c (modified) (9 diffs)
• camera/pmFPAfileFitsIO.c (modified) (3 diffs)
• camera/pmFPAfileIO.c (modified) (4 diffs)
• camera/pmFPAview.c (modified) (2 diffs)
• camera/pmHDUGenerate.c (modified) (5 diffs)
• concepts/pmConceptsStandard.c (modified) (1 diff)
• config/pmConfig.c (modified) (3 diffs)
• config/pmConfigCamera.c (modified) (4 diffs)
• config/pmConfigRecipes.c (modified) (8 diffs)
• detrend/pmBias.c (modified) (1 diff)
• extras/psPipe.c (modified) (3 diffs)
• imcombine/pmReadoutCombine.c (modified) (1 diff)
• objects/models/pmModel_GAUSS.c (modified) (4 diffs)
• objects/models/pmModel_PGAUSS.c (modified) (5 diffs)
• objects/models/pmModel_QGAUSS.c (modified) (5 diffs)
• objects/models/pmModel_RGAUSS.c (modified) (1 diff)
• objects/pmPSF_IO.c (modified) (2 diffs)
• objects/pmSourceFitModel.c (modified) (4 diffs)
• objects/pmSourceIO.c (modified) (2 diffs)
• objects/pmSourceIO_CMP.c (modified) (1 diff)
• objects/pmSourcePhotometry.c (modified) (2 diffs)

trunk/psModules/src/astrom/pmAstrometryUtils.c

@@ -7 +7 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-01 21:04:10 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -134 +134 @@
 
     if (order < 1)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
     if (order > 3)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
 
     // all coeffs and masks initially set to 0
@@ -237 +237 @@
 
     if (order < 1)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
     if (order > 3)
-        psAbort ("psastro", "invalid order");
+        psAbort("invalid order");
 
     // all coeffs and masks initially set to 0

trunk/psModules/src/astrom/pmAstrometryWCS.c

@@ -7 +7 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 06:34:28 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -58 +58 @@
     // technically, we can have a plate scale here (fpa->toTPA:dx,dy != 1)
     if (!psPlaneTransformIsDiagonal (fpa->toTPA))
-        psAbort ("psastro", "invalid TPA transformation");
+        psAbort("invalid TPA transformation");
 
     pmAstromWCS *wcs = pmAstromWCSfromFPA(fpa, chip, tol);
@@ -396 +396 @@
 
         if (fpa->toTPA == NULL)
-            psAbort ("wcs", "projection defined, tangent-plane not defined");
+            psAbort("projection defined, tangent-plane not defined");
         if (fpa->fromTPA == NULL)
-            psAbort ("wcs", "projection defined, tangent-plane not defined");
+            psAbort("projection defined, tangent-plane not defined");
 
         // convert from pixels on this chip to pixels on reference chip
@@ -524 +524 @@
     // XXX not really: toTPA needs to have unity scale for distortion fitting function
     if (!psPlaneTransformIsDiagonal (fpa->toTPA))
-        psAbort ("psastro", "invalid TPA transformation");
+        psAbort("invalid TPA transformation");
 
     // XXX require chip->toFPA->x->nX == chip->toFPA->x->nY

trunk/psModules/src/camera/pmFPALevel.c

@@ -30 +30 @@
         return NameREADOUT;
     default:
-        psAbort(PS_FILE_LINE, "You can't get here; level = %d", level);
+        psAbort("You can't get here; level = %d", level);
     }
     return NULL;

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -497 +497 @@
                 COPY_WITH_PARITY_DIFFERENCE(U8);
             default:
-                psAbort(__func__, "Should never get here.\n");
+                psAbort("Should never get here.\n");
             }
 
@@ -526 +526 @@
                 FILL_IN(U8);
             default:
-                psAbort(__func__, "Should never get here.\n");
+                psAbort("Should never get here.\n");
             }
 

trunk/psModules/src/camera/pmFPARead.c

@@ -138 +138 @@
         }
     } else {
-        psAbort(__func__, "Read direction can only be 1 (rows) or 2 (cols).\n");
+        psAbort("Read direction can only be 1 (rows) or 2 (cols).\n");
     }
 
@@ -204 +204 @@
         break;
     default:
-        psAbort(__func__, "Unknown read type: %x\n", type);
+        psAbort("Unknown read type: %x\n", type);
     }
 
@@ -258 +258 @@
             break;
         default:
-            psAbort(__func__, "Unknown read type: %x\n", type);
+            psAbort("Unknown read type: %x\n", type);
         }
 

trunk/psModules/src/camera/pmFPAWrite.c

@@ -86 +86 @@
         return &hdu->weights;
     default:
-        psAbort(__func__, "Unknown write type: %x\n", type);
+        psAbort("Unknown write type: %x\n", type);
     }
     return NULL;
@@ -105 +105 @@
         return pmHDUWriteWeight(hdu, fits);
     default:
-        psAbort(__func__, "Unknown write type: %x\n", type);
+        psAbort("Unknown write type: %x\n", type);
     }
     return false;

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -768 +768 @@
     // a camera config is needed (as source of file rule)
     if (config->cameraName == NULL) {
-        psAbort ("pmFPAfileDefine", "camera defined but not cameraName!");
+        psAbort("camera defined but not cameraName!");
     }
 
@@ -807 +807 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PPIMAGE");
     if (!status)
-        psAbort ("psModules", "PPIMAGE recipe not found");
+        psAbort("PPIMAGE recipe not found");
     psMetadata *detConstraints = psMetadataLookupPtr (&status, recipe, "DETREND.CONSTRAINTS");
     if (!status)
-        psAbort ("psModules", "DETREND.CONSTRAINTS not found");
+        psAbort("DETREND.CONSTRAINTS not found");
     // XXX allow this and just skip?
 
@@ -816 +816 @@
     psMetadata *constraints = psMetadataLookupPtr (&status, detConstraints, typeName);
     if (!status) {
-        psAbort ("psModules", "DETREND.CONSTRAINTS for type %s not found", typeName);
+        psAbort("DETREND.CONSTRAINTS for type %s not found", typeName);
     }
     psFree(typeName);
@@ -825 +825 @@
     while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
         if (item->type != PS_DATA_STRING) {
-            psAbort ("psModules", "invalid type for DETREND.CONSTRAINT element");
+            psAbort("invalid type for DETREND.CONSTRAINT element");
         }
         char *option  = item->name;     // item->name must correspond to a valid detselect option
@@ -833 +833 @@
             options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "failed to find filter (concept %s)", concept);
+                psAbort("failed to find filter (concept %s)", concept);
 
         }
@@ -839 +839 @@
             options->exptime = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "exptime not found (concept %s)", concept);
+                psAbort("exptime not found (concept %s)", concept);
         }
         if (!strcasecmp (option, "airmass")) {
             options->airmass = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "airmass not found (concept %s)", concept);
+                psAbort("airmass not found (concept %s)", concept);
         }
         # if (0)
@@ -850 +850 @@
                 options->dettemp = psMetadataLookupF32 (&status, input->concepts, concept);
                 if (!status)
-                    psAbort ("psModules", "dettemp not found (concept %s)", concept);
+                    psAbort("dettemp not found (concept %s)", concept);
             }
         if (!strcasecmp (option, "version")) {
@@ -856 +856 @@
             options->version = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "version not found (concept %s)", concept);
+                psAbort("version not found (concept %s)", concept);
         }
         if (!strcasecmp (option, "twilight")) {
@@ -863 +863 @@
             options->twilight = psMetadataLookupF32 (&status, input->concepts, concept);
             if (!status)
-                psAbort ("psModules", "twilight not found (concept %s)", concept);
+                psAbort("twilight not found (concept %s)", concept);
         }
         # endif

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -47 +47 @@
     case PM_FPA_LEVEL_NONE:
     default:
-        psAbort(PS_FILE_LINE, "Should never get here: bad phu level.\n");
+        psAbort("Should never get here: bad phu level.\n");
     }
 
@@ -87 +87 @@
     case PM_FPA_LEVEL_NONE:
     default:
-        psAbort(PS_FILE_LINE, "Should never get here: bad phu level.\n");
+        psAbort("Should never get here: bad phu level.\n");
     }
     return NULL;
@@ -280 +280 @@
     case PM_FPA_LEVEL_NONE:
     default:
-        psAbort(PS_FILE_LINE, "Should never reach here: invalid file level.");
+        psAbort("Should never reach here: invalid file level.");
     }
 

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -75 +75 @@
             }
         default:
-            psAbort ("pmFPAfileIO", "fileLevel not correctly set");
+            psAbort("fileLevel not correctly set");
             break;
         }
@@ -126 +126 @@
             }
         default:
-            psAbort ("pmFPAfileIO", "fileLevel not correctly set");
+            psAbort("fileLevel not correctly set");
             break;
         }
@@ -800 +800 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "You can't get here");
+            psAbort("You can't get here");
         }
     }
@@ -821 +821 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "You can't get here");
+            psAbort("You can't get here");
         }
     }

trunk/psModules/src/camera/pmFPAview.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-21 04:02:36 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -289 +289 @@
         hdu  = pmHDUFromCell (cell);
         if (!hdu) {
-            psAbort("psModules", "a split readout is not covered by the current paradigm");
+            psAbort("a split readout is not covered by the current paradigm");
         }
         if (hdu->blankPHU)

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -119 +119 @@
         break;
     default:
-        psAbort(__func__, "Shouldn't ever get here!\n");
+        psAbort("Shouldn't ever get here!\n");
     }
 
@@ -381 +381 @@
             psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
             if (!mdok || !trimsec) {
-                psAbort(__func__, "Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n");
+                psAbort("Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n");
             }
             psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias secionts
             if (!mdok || !biassecs) {
-                psAbort(__func__, "Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n");
+                psAbort("Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n");
             }
             psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
@@ -557 +557 @@
         return pmHDUGenerateForChip(cell->parent);
     default:
-        psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
+        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
     }
     return false;
@@ -605 +605 @@
         return pmHDUGenerateForFPA(chip->parent);
     default:
-        psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
+        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
     }
     return false;
@@ -647 +647 @@
         }
     default:
-        psAbort(__func__, "Shouldn't ever get here: check your camera format configuration.\n");
+        psAbort("Shouldn't ever get here: check your camera format configuration.\n");
     }
     return false;

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -40 +40 @@
         return M_PI / 180.0;
     }
-    psAbort(__func__, "Should never ever get here.\n");
+    psAbort("Should never ever get here.\n");
     return NAN;
 }

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-30 00:05:16 $
+ *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1006 +1006 @@
         FILE *f = fopen (config->argv[Narg], "r");
         if (f == NULL) {
-            psAbort ("psphot", "unable to open specified list file");
+            psAbort("unable to open specified list file");
         }
         while (fgets (line, 1024, f) != NULL) {
@@ -1020 +1020 @@
             default:
                 // rigid format, no comments allowed?
-                psAbort ("pmConfig", "error parsing input list file");
+                psAbort("error parsing input list file");
                 break;
             }

trunk/psModules/src/config/pmConfigCamera.c

@@ -118 +118 @@
         break;
     default:
-        psAbort(PS_FILE_LINE, "Should never get here.\n");
+        psAbort("Should never get here.\n");
     }
 
@@ -144 +144 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -199 +199 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -252 +252 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 

trunk/psModules/src/config/pmConfigRecipes.c

@@ -126 +126 @@
     if (optionsItem) {
         if (optionsItem->type != PS_DATA_METADATA) {
-            psAbort(__func__, "OPTIONS is not of type METADATA.");
+            psAbort("OPTIONS is not of type METADATA.");
         }
         options = psMemIncrRefCounter(optionsItem->data.V);
@@ -220 +220 @@
     if (recipesItem) {
         if (recipesItem->type != PS_DATA_METADATA) {
-            psAbort(__func__, "RECIPES is not of type METADATA.");
+            psAbort("RECIPES is not of type METADATA.");
         }
         recipes = psMemIncrRefCounter(recipesItem->data.V);
@@ -256 +256 @@
                 psFree(recipe);                 // Drop reference
             } else {
-                psAbort ("pmConfig.c", "error reading config file %s\n", recipeSource);
+                psAbort("error reading config file %s\n", recipeSource);
             }
         } else {
@@ -284 +284 @@
     assert(config);
     if ((sourceType != PM_RECIPE_SOURCE_SITE) && (sourceType != PM_RECIPE_SOURCE_CAMERA)) {
-        psAbort ("pmConfig", "invalid source for loadRecipes");
+        psAbort("invalid source for loadRecipes");
     }
     if (!source) {
@@ -308 +308 @@
         // type mismatch is a serious error
         if (fileItem->type != PS_DATA_STRING) {
-            psAbort ("pmConfig", "%s in %s RECIPES is not of type STR", fileItem->name, sourceName);
+            psAbort("%s in %s RECIPES is not of type STR", fileItem->name, sourceName);
         }
 
@@ -323 +323 @@
         if (currentItem) {
             if (currentItem->type != PS_DATA_METADATA) {
-                psAbort(__func__, "Item from recipes is not of type METADATA.");
+                psAbort("Item from recipes is not of type METADATA.");
             }
             current = psMemIncrRefCounter(currentItem->data.V);
@@ -364 +364 @@
         // type mismatch is a serious error
         if (item->type != PS_DATA_METADATA) {
-            psAbort ("pmConfig", "%s in config arguments RECIPES is not of type METADATA", item->name);
+            psAbort("%s in config arguments RECIPES is not of type METADATA", item->name);
         }
         // increment the ref counter to protect the data
@@ -470 +470 @@
         // type mismatch is a serious error
         if (item->type != PS_DATA_METADATA) {
-            psAbort ("pmConfig", "%s in config arguments OPTIONS is not of type METADATA", item->name);
+            psAbort("%s in config arguments OPTIONS is not of type METADATA", item->name);
         }
         // increment the ref counter to protect the data

trunk/psModules/src/detrend/pmBias.c

@@ -400 +400 @@
                 break;
             default:
-                psAbort(__func__, "Should never get here!!!\n");
+                psAbort("Should never get here!!!\n");
             }
 

trunk/psModules/src/extras/psPipe.c

@@ -177 +177 @@
                 return 0x100;
             default:
-                psAbort ("psPipeClose", "unexpected response to waitpid: %d\n", result);
+                psAbort("unexpected response to waitpid: %d\n", result);
             }
             break;
@@ -187 +187 @@
         default:
             if (result != pipe->pid) {
-                psAbort ("psPipeClose", "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pipe->pid);
+                psAbort("waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pipe->pid);
             }
             if (WIFEXITED(wait_status)) {
@@ -202 +202 @@
             }
             if (WIFSTOPPED(wait_status)) {
-                psAbort ("psPipeClose", "waitpid returns 'stopped' programming error\n");
+                psAbort("waitpid returns 'stopped' programming error\n");
             }
         }

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -212 +212 @@
             break;
         default:
-            psAbort(__func__, "Should never get here --- checked params->combine before.\n");
+            psAbort("Should never get here --- checked params->combine before.\n");
         }
         stats->options |= combineStdev;

trunk/psModules/src/objects/models/pmModel_GAUSS.c

@@ -100 +100 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -131 +131 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -162 +162 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -170 +170 @@
         return true;
     default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }

trunk/psModules/src/objects/models/pmModel_PGAUSS.c

@@ -102 +102 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -133 +133 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -164 +164 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -172 +172 @@
         return true;
     default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }
@@ -262 +262 @@
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: radius is NaN");
+        psAbort("error in code: radius is NaN");
     if (radius < 0)
-        psAbort ("psphot.model", "error in code: radius is negative");
+        psAbort("error in code: radius is negative");
 
     return (radius);

trunk/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -120 +120 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -154 +154 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -188 +188 @@
             break;
         default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -196 +196 @@
         return true;
     default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }
@@ -321 +321 @@
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: radius is NaN");
+        psAbort("error in code: radius is NaN");
 
     return (radius);

trunk/psModules/src/objects/models/pmModel_RGAUSS.c

@@ -219 +219 @@
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: radius is NaN");
+        psAbort("error in code: radius is NaN");
 
     return (radius);

trunk/psModules/src/objects/pmPSF_IO.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-26 00:05:18 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87 +87 @@
     int nPar = psMetadataLookupS32 (&status, metadata, "PSF_MODEL_NPAR");
     if (nPar != pmModelParameterCount (psf->type))
-        psAbort ("read PSF" , "mismatch model par count");
+        psAbort("mismatch model par count");
 
     // un-fitted terms, not in the Metadata, are left NULL

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-29 02:41:31 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -112 +112 @@
     pmModelFunc modelFunc = pmModelFunc_GetFunction (model->type);
     if (!modelFunc)
-        psAbort ("pmSourceFitModel", "invalid model function");
+        psAbort("invalid model function");
     pmModelLimits checkLimits = pmModelLimits_GetFunction (model->type);
     if (!checkLimits)
-        psAbort ("pmSourceFitModel", "invalid model limits function");
+        psAbort("invalid model limits function");
 
     // create the minimization constraints
@@ -146 +146 @@
         break;
     default:
-        psAbort ("pmSourceFitModel", "invalid fitting mode");
+        psAbort("invalid fitting mode");
     }
     // force the floating parameters to fall within the contraint ranges
@@ -448 +448 @@
         break;
     default:
-        psAbort ("pmSourceFitModel", "invalid fitting mode");
+        psAbort("invalid fitting mode");
     }
 

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-26 04:40:42 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -494 +494 @@
             dataname = pmFPAfileNameFromRule (file->extrule, file, view);
             if (!dataname)
-                psAbort ("pmSourceIO", "cannot determine data EXTNAME");
+                psAbort("cannot determine data EXTNAME");
         }
         if (!psFitsMoveExtName (file->fits, dataname)) {
-            psAbort ("pmSourceIO", "cannot find data extension %s in %s", dataname, file->filename);
+            psAbort("cannot find data extension %s in %s", dataname, file->filename);
         }
         sources = pmSourcesReadCMF (file->fits, hdu->header);

trunk/psModules/src/objects/pmSourceIO_CMP.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-02 19:55:15 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-01 03:15:13 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -507 +507 @@
                 break;
             default:
-                psAbort ("models/objects", "invalid term for pmSourceWeight");
+                psAbort("invalid term for pmSourceWeight");
             }