Changeset 16947

Timestamp:

Mar 12, 2008, 10:34:01 AM (18 years ago)

Author:

Paul Price

Message:

Warning rather than error when concepts don't match.

File:

• trunk/psModules/src/concepts/pmConceptsAverage.c (modified) (6 diffs)

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -33 +33 @@
     PS_ASSERT_PTR_NON_NULL(sources, false);
     PS_ASSERT_INT_POSITIVE(sources->n, false);
-    bool success = true;                // Result of setting everything
 
     double time      = 0.0;             // Time of observation
@@ -56 +55 @@
         } else {
             if (timeSys != psMetadataLookupS32(NULL, fpa->concepts, "FPA.TIMESYS")) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing FPA.TIMESYS in use: %d vs %d\n",
-                        timeSys, psMetadataLookupS32(NULL, fpa->concepts, "FPA.TIMESYS"));
-                success = false;
+                psWarning("Differing FPA.TIMESYS in use: %d vs %d\n",
+                          timeSys, psMetadataLookupS32(NULL, fpa->concepts, "FPA.TIMESYS"));
             }
             if (strcmp(filter, psMetadataLookupStr(NULL, fpa->concepts, "FPA.FILTER")) != 0) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing FPA.FILTER in use: %s vs %s\n",
-                        filter, psMetadataLookupStr(NULL, fpa->concepts, "FPA.FILTER"));
-                success = false;
+                psWarning("Differing FPA.FILTER in use: %s vs %s\n",
+                          filter, psMetadataLookupStr(NULL, fpa->concepts, "FPA.FILTER"));
             }
         }
@@ -81 +78 @@
     }
 
-    return success;
+    return true;
 }
 
@@ -93 +90 @@
     PS_ASSERT_INT_POSITIVE(sources->n, false);
 
-    bool success = true;                // Result of setting everything
     float gain       = 0.0;             // Gain
     float readnoise  = 0.0;             // Read noise
@@ -137 +133 @@
         } else {
             if (timeSys != psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS")) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.TIMESYS in use: %d vs %d\n",
-                        timeSys, psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS"));
-                success = false;
+                psWarning("Differing CELL.TIMESYS in use: %d vs %d\n",
+                          timeSys, psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS"));
             }
             if (readdir != psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR")) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.READDIR in use: %d vs %d\n",
-                        readdir, psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"));
-                success = false;
+                psWarning("Differing CELL.READDIR in use: %d vs %d\n",
+                          readdir, psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"));
             }
             if (xBin != psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN")) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.XBIN in use: %d vs %d\n",
-                        xBin, psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"));
-                success = false;
+                psWarning("Differing CELL.XBIN in use: %d vs %d\n",
+                          xBin, psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"));
             }
             if (yBin != psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN")) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.YBIN in use: %d vs %d\n",
-                        yBin, psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"));
-                success = false;
+                psWarning("Differing CELL.YBIN in use: %d vs %d\n",
+                          yBin, psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"));
             }
             if (same) {
                 if (x0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.X0")) {
-                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.X0 in use: %d vs %d\n",
-                            x0, psMetadataLookupS32(NULL, cell->concepts, "CELL.X0"));
-                    success = false;
+                    psWarning("Differing CELL.X0 in use: %d vs %d\n",
+                              x0, psMetadataLookupS32(NULL, cell->concepts, "CELL.X0"));
                 }
                 if (y0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0")) {
-                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.Y0 in use: %d vs %d\n",
-                            y0, psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"));
-                    success = false;
+                    psWarning("Differing CELL.Y0 in use: %d vs %d\n",
+                              y0, psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"));
                 }
                 if (xParity != psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY")) {
-                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.XPARITY in use: %d vs %d\n",
-                            xParity, psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY"));
-                    success = false;
+                    psWarning("Differing CELL.XPARITY in use: %d vs %d\n",
+                              xParity, psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY"));
                 }
                 if (yParity != psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY")) {
-                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.YPARITY in use: %d vs %d\n",
-                            yParity, psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY"));
-                    success = false;
+                    psWarning("Differing CELL.YPARITY in use: %d vs %d\n",
+                              yParity, psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY"));
                 }
             }
@@ -235 +223 @@
     }
 
-    return success;
-}
-
+    return true;
+}
+