Changeset 6673 for branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c

Timestamp:

Mar 22, 2006, 5:09:57 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmFPAUtils.[ch], moving findChip and findCell in, renaming those

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c (modified) (11 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c

@@ -9 +9 @@
 #include "pmFPAConstruct.h"
 #include "pmFPAview.h"
+#include "pmFPAUtils.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -32 +33 @@
 
     return cellData;
-}
-
-// Find a chip by name; return the index
-static int findChip(pmFPA *fpa, // FPA in which to find the chip
-                    const char *name // Name of the chip
-                   )
-{
-    psArray *chips = fpa->chips;    // Array of chips
-    for (int i = 0; i < chips->n; i++) {
-        pmChip *chip = chips->data[i]; // The chip of interest
-        psString testName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // Name of this chip
-        if (strcmp(name, testName) == 0) {
-            return i;
-        }
-    }
-
-    psError(PS_ERR_IO, true, "Unable to find chip %s\n", name);
-    return -1;
-}
-
-// Find a cell by name; return the index
-static int findCell(pmChip *chip, // Chip in which to find the cell
-                    const char *name // Name of the cell
-                   )
-{
-    psArray *cells = chip->cells;    // Array of cells
-    for (int i = 0; i < cells->n; i++) {
-        pmCell *cell = cells->data[i]; // The cell of interest
-        psString testName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of this cell
-        if (strcmp(name, testName) == 0) {
-            return i;
-        }
-    }
-
-    psError(PS_ERR_IO, true, "Unable to find cell %s\n", name);
-    return -1;
 }
 
@@ -232 +197 @@
         // Get the chip
         phuChipName = phuNameFromHeader("CHIP.NAME", formatSpec, phu); // Name of the chip
-        int chipNum = findChip(fpa, phuChipName); // Chip number
+        int chipNum = pmFPAFindChip(fpa, phuChipName); // Chip number
         if (chipNum == -1) {
             psError(PS_ERR_IO, true, "Unable to find chip %s in FPA.\n", phuChipName);
@@ -257 +222 @@
             // Added this for possible future plans which might allow PHU=CELL
             phuCellName = phuNameFromHeader("CELL.NAME", formatSpec, phu); // Name of the cell
-            int cellNum = findCell(chip, phuCellName); // Cell number
+            int cellNum = pmChipFindCell(chip, phuCellName); // Cell number
             if (cellNum == -1) {
                 psError(PS_ERR_IO, true, "Unable to find cell %s in chip %s.\n", phuCellName, phuChipName);
@@ -330 +295 @@
                          "(%s) --- there may be problems when reading!\n", chipName, phuChipName);
                 // Find the other chip
-                int chipNum = findChip(fpa, chipName); // The chip we're looking for
+                int chipNum = pmFPAFindChip(fpa, chipName); // The chip we're looking for
                 if (chipNum == -1) {
                     psLogMsg(__func__, PS_LOG_WARN, "Unable to find chip %s in fpa --- ignored.\n", chipName);
@@ -338 +303 @@
             }
             psString cellName = values->data[i]; // The name of the cell specified
-            int cellNum = findCell(chip, cellName); // The cell we're looking for
+            int cellNum = pmChipFindCell(chip, cellName); // The cell we're looking for
             if (cellNum == -1) {
                 psLogMsg(__func__, PS_LOG_WARN, "Unable to find cell %s in chip %s --- ignored.\n",
@@ -388 +353 @@
                 psString chipName = names->data[i]; // The name of the chip
                 psString cellName = values->data[i]; // The name of the cell
-                int chipNum = findChip(fpa, chipName); // The chip we're looking for
+                int chipNum = pmFPAFindChip(fpa, chipName); // The chip we're looking for
                 if (chipNum == -1) {
                     psLogMsg(__func__, PS_LOG_WARN, "Unable to find chip %s in FPA --- ignored.\n", chipName);
@@ -394 +359 @@
                 }
                 chip = fpa->chips->data[chipNum];
-                int cellNum = findCell(chip, cellName); // The cell we're looking for
+                int cellNum = pmChipFindCell(chip, cellName); // The cell we're looking for
                 if (cellNum == -1) {
                     psLogMsg(__func__, PS_LOG_WARN, "Unable to find cell %s in chip %s --- ignored\n",
@@ -429 +394 @@
                 // Need to look up the name of the chip
                 chipName = phuNameFromHeader("CHIP.NAME", formatSpec, phu);
-                int chipNum = findChip(fpa, chipName);
+                int chipNum = pmFPAFindChip(fpa, chipName);
                 if (chipNum == -1) {
                     psLogMsg(__func__, PS_LOG_WARN, "Unable to find chip %s in FPA --- ignored.\n", chipName);
@@ -444 +409 @@
                     chipName = names->data[i];
                     cellName = cellType;
-                    int chipNum = findChip(fpa, chipName); // The chip we're looking for
+                    int chipNum = pmFPAFindChip(fpa, chipName); // The chip we're looking for
                     if (chipNum == -1) {
                         psLogMsg(__func__, PS_LOG_WARN, "Unable to find chip %s in FPA --- ignored.\n",
@@ -455 +420 @@
                     cellName = names->data[i];
                 }
-                int cellNum = findCell(chip, cellName); // The cell we're looking for
+                int cellNum = pmChipFindCell(chip, cellName); // The cell we're looking for
                 if (cellNum == -1) {
                     psLogMsg(__func__, PS_LOG_WARN, "Unable to find cell %s in chip %s --- ignored.\n",