Changeset 30049 for trunk/psModules

Timestamp:

Dec 15, 2010, 1:29:28 PM (16 years ago)

Author:

watersc1

Message:

Merge of realtime burntool and new nightly science code into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules/src/concepts/pmConcepts.c (modified) (2 diffs)
• psModules/src/concepts/pmConceptsStandard.c (modified) (1 diff)
• psModules/src/concepts/pmConceptsStandard.h (modified) (1 diff)
• psModules/src/objects (modified) (1 prop)

trunk/psModules/src/concepts/pmConcepts.c

@@ -249 +249 @@
 CONCEPT_REGISTER_FUNCTION(S32, Enum, -1); // For enums: set default to -1
 CONCEPT_REGISTER_FUNCTION(S32, S32, 0); // For values: set default to 0
-//CONCEPT_REGISTER_FUNCTION(Bool, Bool, NULL); // For values: set default to 0
+CONCEPT_REGISTER_FUNCTION(Bool, Bool, NULL); // For values: set default to 0
 
 static void conceptRegisterTime(const char *name, /* Name of concept */ \
@@ -353 +353 @@
         conceptRegisterStr("CHIP.ID", "Chip identifier", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
         conceptRegisterF32("CHIP.SEEING", "Seeing FWHM (pixels)", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
+        conceptRegisterBool("CHIP.VIDEOCELL", "Does this OTA have any video cells", p_pmConceptParse_VideoCell,NULL,NULL,false,PM_FPA_LEVEL_CHIP);
     }
 

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -737 +737 @@
     return psMetadataItemAllocS32(pattern->name, pattern->comment, binning);
 }
+
+// VIDEOCELLS
+psMetadataItem *p_pmConceptParse_VideoCell(const psMetadataItem *concept,
+                                          const psMetadataItem *pattern,
+                                          pmConceptSource source,
+                                          const psMetadata *cameraFormat,
+                                          const pmFPA *fpa,
+                                          const pmChip *chip,
+                                          const pmCell *cell)
+{
+  assert(concept);
+  assert(pattern);
+  bool has_video_cell = false;
+
+  if (concept->type != PS_DATA_STRING) {
+    psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Type for %s (%x) is not string\n",
+            concept->name, concept->type);
+    return NULL;
+  }
+
+  char *Vptr = strchr(concept->data.V,'V');
+  if (Vptr) {
+    has_video_cell = true;
+  }
+
+  return psMetadataItemAllocBool(pattern->name, pattern->comment, has_video_cell);
+}
+  
+   
 
 // BTOOLAPP

trunk/psModules/src/concepts/pmConceptsStandard.h

@@ -136 +136 @@
     );
 
+// Parse the CHIP.VIDEOCELL concept
+psMetadataItem *p_pmConceptParse_VideoCell(
+   const psMetadataItem *concept, ///< Concept to parse
+   const psMetadataItem *pattern, ///< Pattern to use in parsing
+   pmConceptSource source, ///< Source for concept
+   const psMetadata *cameraFormat, ///< Camera format definition
+   const pmFPA *fpa, ///< FPA for concept, or NULL
+   const pmChip *chip, ///< Chip for concept, or NULL
+   const pmCell *cell ///< Cell for concept, or NULL
+   );
+
 /// Format for the BTOOLAPP conceptn
 psMetadataItem *p_pmConceptParse_BTOOLAPP(