Changeset 18608

Timestamp:

Jul 17, 2008, 3:45:43 PM (18 years ago)

Author:

Paul Price

Message:

nChips is zero-indexed.

File:

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

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -232 +232 @@
     PS_ASSERT_INT_POSITIVE(sources->n, false);
 
-    float temp       = 0.0;             // Temperature
+    float temp = 0.0;                   // Temperature
     int x0 = 0, y0 = 0;                 // Offset
     int xParity = 0, yParity = 0;       // Parity
-    int xSize = 0, ySize = 0;
-    psString    id = NULL;
-
-    int nChips = 0;                     // Number of cells;
+    int xSize = 0, ySize = 0;           // Size
+    psString id = NULL;                 // Identifier
+
+    int nChips = 0;                     // Number of chips;
     psListIterator *sourcesIter = psListIteratorAlloc(sources, PS_LIST_HEAD, false); // Iterator for sources
-    pmChip *chip = NULL;                // Source cell from iteration
+    pmChip *chip = NULL;                // Source chip from iteration
     while ((chip = psListGetAndIncrement(sourcesIter))) {
         if (!chip) {
@@ -246 +246 @@
         }
         temp += psMetadataLookupF32(NULL, chip->concepts, "CHIP.TEMP");
-        if (nChips == 1) {
+        if (nChips == 0) {
             xSize = psMetadataLookupS32(NULL, chip->concepts, "CHIP.XSIZE");
             ySize = psMetadataLookupS32(NULL, chip->concepts, "CHIP.YSIZE");
@@ -256 +256 @@
         } else {
             if (xSize != psMetadataLookupS32(NULL, chip->concepts, "CHIP.XSIZE")) {
-                psWarning("Differing CHIP.XSIZE in use: %d vs %d\n", 
+                psWarning("Differing CHIP.XSIZE in use: %d vs %d\n",
                     xSize, psMetadataLookupS32(NULL, chip->concepts, "CHIP.XSIZE"));
             }
             if (ySize != psMetadataLookupS32(NULL, chip->concepts, "CHIP.YSIZE")) {
-                psWarning("Differing CHIP.YSIZE in use: %d vs %d\n", 
+                psWarning("Differing CHIP.YSIZE in use: %d vs %d\n",
                     ySize, psMetadataLookupS32(NULL, chip->concepts, "CHIP.YSIZE"));
             }
             if (xParity != psMetadataLookupS32(NULL, chip->concepts, "CHIP.XPARITY")) {
-                psWarning("Differing CHIP.XPARITY in use: %d vs %d\n", 
+                psWarning("Differing CHIP.XPARITY in use: %d vs %d\n",
                     xParity, psMetadataLookupS32(NULL, chip->concepts, "CHIP.XPARITY"));
             }
             if (yParity != psMetadataLookupS32(NULL, chip->concepts, "CHIP.YPARITY")) {
-                psWarning("Differing CHIP.YPARITY in use: %d vs %d\n", 
+                psWarning("Differing CHIP.YPARITY in use: %d vs %d\n",
                     yParity, psMetadataLookupS32(NULL, chip->concepts, "CHIP.YPARITY"));
             }
             if (x0 != psMetadataLookupS32(NULL, chip->concepts, "CHIP.X0")) {
-                psWarning("Differing CHIP.X0 in use: %d vs %d\n", 
+                psWarning("Differing CHIP.X0 in use: %d vs %d\n",
                     x0, psMetadataLookupS32(NULL, chip->concepts, "CHIP.X0"));
             }
             if (y0 != psMetadataLookupS32(NULL, chip->concepts, "CHIP.Y0")) {
-                psWarning("Differing CHIP.Y0 in use: %d vs %d\n", 
+                psWarning("Differing CHIP.Y0 in use: %d vs %d\n",
                     y0, psMetadataLookupS32(NULL, chip->concepts, "CHIP.Y0"));
             }
@@ -284 +284 @@
             }
         }
-    
+
         nChips++;
     }
     psFree(sourcesIter);
 
-    temp      /= (float)nChips;
+    temp /= (float)nChips;
 
     MD_UPDATE(target->concepts, "CHIP.TEMP", F32, temp);