Changeset 8669 for trunk/psModules/src/objects

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/objects

Files:

• pmPSFtry.c (modified) (3 diffs)
• pmPeaks.c (modified) (2 diffs)
• pmSourceIO.c (modified) (4 diffs)

trunk/psModules/src/objects/pmPSFtry.c

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

trunk/psModules/src/objects/pmPeaks.c

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-28 19:21:00 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70 +70 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %d)", view->chip, fpa->chips->n);
+        psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %ld)", view->chip, fpa->chips->n);
         return false;
     }
@@ -84 +84 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %d)",
+        psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %ld)",
                 view->cell, chip->cells->n);
         return false;
@@ -100 +100 @@
 
     if (view->readout >= cell->readouts->n) {
-        psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %d)",
+        psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %ld)",
                 view->readout, cell->readouts->n);
         return false;