Changeset 7441 for trunk/psModules/src/concepts/pmConcepts.c

Timestamp:

Jun 8, 2006, 12:08:03 PM (20 years ago)

Author:

Paul Price

Message:

Need to check the FORMAT for CHIP.X0 and CHIP.Y0. For this, we use the p_pmConceptParse_CELL_Positions and p_pmConceptFormat_CELL_Positions that we had already defined. Renamed these functions, and now use them for both CELL and CHIP X0 and Y0.

File:

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

trunk/psModules/src/concepts/pmConcepts.c

@@ -407 +407 @@
         {
             psMetadataItem *chipX0 = psMetadataItemAllocF32("CHIP.X0", "Position of (0,0) on the FPA", NAN);
-            pmConceptRegister(chipX0, NULL, NULL, PM_FPA_LEVEL_CHIP);
+            pmConceptRegister(chipX0, (pmConceptParseFunc)p_pmConceptParse_Positions,
+                              (pmConceptFormatFunc)p_pmConceptFormat_Positions, PM_FPA_LEVEL_CHIP);
             psFree(chipX0);
         }
@@ -414 +415 @@
         {
             psMetadataItem *chipY0 = psMetadataItemAllocF32("CHIP.Y0", "Position of (0,0) on the FPA", NAN);
-            pmConceptRegister(chipY0, NULL, NULL, PM_FPA_LEVEL_CHIP);
+            pmConceptRegister(chipY0, (pmConceptParseFunc)p_pmConceptParse_Positions,
+                              (pmConceptFormatFunc)p_pmConceptFormat_Positions, PM_FPA_LEVEL_CHIP);
             psFree(chipY0);
         }
@@ -567 +569 @@
         {
             psMetadataItem *cellX0 = psMetadataItemAllocS32("CELL.X0", "Position of (0,0) on the chip", 0);
-            pmConceptRegister(cellX0, (pmConceptParseFunc)p_pmConceptParse_CELL_Positions,
-                              (pmConceptFormatFunc)p_pmConceptFormat_CELL_Positions, PM_FPA_LEVEL_CELL);
+            pmConceptRegister(cellX0, (pmConceptParseFunc)p_pmConceptParse_Positions,
+                              (pmConceptFormatFunc)p_pmConceptFormat_Positions, PM_FPA_LEVEL_CELL);
             psFree(cellX0);
         }
@@ -575 +577 @@
         {
             psMetadataItem *cellY0 = psMetadataItemAllocS32("CELL.Y0", "Position of (0,0) on the chip", 0);
-            pmConceptRegister(cellY0, (pmConceptParseFunc)p_pmConceptParse_CELL_Positions,
-                              (pmConceptFormatFunc)p_pmConceptFormat_CELL_Positions, PM_FPA_LEVEL_CELL);
+            pmConceptRegister(cellY0, (pmConceptParseFunc)p_pmConceptParse_Positions,
+                              (pmConceptFormatFunc)p_pmConceptFormat_Positions, PM_FPA_LEVEL_CELL);
             psFree(cellY0);
         }