Changeset 7441

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.

Location:

trunk/psModules/src/concepts

Files:

• pmConcepts.c (modified) (4 diffs)
• pmConceptsStandard.c (modified) (3 diffs)
• pmConceptsStandard.h (modified) (2 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);
         }

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -520 +520 @@
 }
 
-psMetadataItem *p_pmConceptParse_CELL_Positions(psMetadataItem *concept,
+psMetadataItem *p_pmConceptParse_Positions(psMetadataItem *concept,
         psMetadataItem *pattern,
         psMetadata *cameraFormat,
@@ -530 +530 @@
     assert(cameraFormat);
 
-    int offset = 0;                     // Offset of cell (0,0) corner from the chip (0,0) corner
+    int offset = 0;                     // Offset of component (0,0) corner from the parent (0,0) corner
 
     switch (concept->type) {
@@ -782 +782 @@
 }
 
-psMetadataItem *p_pmConceptFormat_CELL_Positions(psMetadataItem *concept,
+psMetadataItem *p_pmConceptFormat_Positions(psMetadataItem *concept,
         psMetadata *cameraFormat,
         pmFPA *fpa,

trunk/psModules/src/concepts/pmConceptsStandard.h

@@ -48 +48 @@
         pmChip *chip,
         pmCell *cell);
-psMetadataItem *p_pmConceptParse_CELL_Positions(psMetadataItem *concept,
+psMetadataItem *p_pmConceptParse_Positions(psMetadataItem *concept,
         psMetadataItem *pattern,
         psMetadata *cameraFormat,
@@ -84 +84 @@
         pmChip *chip,
         pmCell *cell);
-psMetadataItem *p_pmConceptFormat_CELL_Positions(psMetadataItem *concept,
+psMetadataItem *p_pmConceptFormat_Positions(psMetadataItem *concept,
         psMetadata *cameraFormat,
         pmFPA *fpa,