Changeset 15477 for trunk/psModules/src/camera/pmFPAFlags.c

Timestamp:

Nov 6, 2007, 1:15:12 PM (19 years ago)

Author:

Paul Price

Message:

Replacing psLogMsg with psWarning

File:

• trunk/psModules/src/camera/pmFPAFlags.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAFlags.c

@@ -136 +136 @@
 
     for (int i = 0; i < fpa->chips->n; i++) {
-        pmChip *chip = fpa->chips->data[i];
-        if (chip == NULL) continue;
-        if (chip->data_exists) return true;
+        pmChip *chip = fpa->chips->data[i];
+        if (chip == NULL) continue;
+        if (chip->data_exists) return true;
     }
     return false;
@@ -170 +170 @@
 
     if (view->chip == -1) {
-        bool exists = pmFPACheckDataStatus (fpa);
-        return exists;
+        bool exists = pmFPACheckDataStatus (fpa);
+        return exists;
     }
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
-        return false;
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
+        return false;
     }
     pmChip *chip = fpa->chips->data[view->chip];
 
     if (view->cell == -1) {
-        bool exists = pmChipCheckDataStatus (chip);
-        return exists;
+        bool exists = pmChipCheckDataStatus (chip);
+        return exists;
     }
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
-        return false;
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
+        return false;
     }
     pmCell *cell = chip->cells->data[view->cell];
 
     if (view->readout == -1) {
-        bool exists = pmCellCheckDataStatus (cell);
-        return exists;
+        bool exists = pmCellCheckDataStatus (cell);
+        return exists;
     }
 
     if (view->readout >= cell->readouts->n) {
-        psError(PS_ERR_IO, true, "Requested readout == %d >= cell->readouds->n == %ld", view->readout, cell->readouts->n);
-        return false;
+        psError(PS_ERR_IO, true, "Requested readout == %d >= cell->readouds->n == %ld", view->readout, cell->readouts->n);
+        return false;
     }
     pmReadout *readout = cell->readouts->data[view->readout];
@@ -290 +290 @@
     psArray *chips = fpa->chips;        // Component chips
     if (chips == NULL) {
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: fpa->chips == NULL\n");
+        psWarning("WARNING: fpa->chips == NULL\n");
         return(0);
     }
     if ((chipNum >= chips->n) || (NULL == (pmChip *) chips->data[chipNum])) {
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: the specified chip (%d) does not exist.\n", chipNum);
+        psWarning("WARNING: the specified chip (%d) does not exist.\n", chipNum);
         return(0);
     }