Changeset 6575 for branches/rel10_ifa/psModules/src/astrom/pmConceptsStandard.c

Timestamp:

Mar 13, 2006, 4:23:40 PM (20 years ago)

Author:

Paul Price

Message:

Getting code to compile; adding concept read to fpa construction and reading

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsStandard.c (modified) (16 diffs)

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

@@ -1 +1 @@
 #include <stdio.h>
+#include <assert.h>
 
 #include "pslib.h"
 
+#include "pmFPA.h"
 #include "pmConceptsRead.h"
 #include "pmConceptsWrite.h"
-#include "pmFPA.h"
 #include "pmConceptsStandard.h"
-#include "psAdditionals.h"
 
 
@@ -21 +21 @@
         psLogMsg(__func__, PS_LOG_WARN, "Assuming format for %s is HOURS.\n", pattern->name);
         return M_PI / 12.0;
-    } else if (strcmp(pattern->name, "FPA.DEC") == 0) {
+    }
+    if (strcmp(pattern->name, "FPA.DEC") == 0) {
         psLogMsg(__func__, PS_LOG_WARN, "Assuming format for %s is DEGREES.\n", pattern->name);
         return M_PI / 180.0;
-    } else {
-        psAbort("Should never ever get here.\n");
-    }
+    }
+    psAbort(__func__, "Should never ever get here.\n");
+    return NAN;
 }
 
@@ -73 +74 @@
     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     if (mdok && formats) {
-        psString format = psMetadataLookupStr(&mdok, formats, blank->name);
+        psString format = psMetadataLookupStr(&mdok, formats, pattern->name);
         if (mdok && strlen(format) > 0) {
             if (strcasecmp(format, "HOURS") == 0) {
@@ -95 +96 @@
 
 // FPA.RA and FPA.DEC
-psMetadataItem *pmConceptFormat_FPA_Coords(psMetadataItem *concept, psMetadataItem *pattern, pmConceptSpec *spec, psMetadata *cameraFormat)
+psMetadataItem *pmConceptFormat_FPA_Coords(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat)
 {
     assert(concept);
@@ -128 +129 @@
     int big, medium;
     float small;
-    big = (int)ra;
+    big = (int)coords;
     medium = (int)(60.0*(coords - (double)big));
     small = 3600.0*(coords - (double)big - 60.0 * (double)medium);
@@ -146 +147 @@
     assert(pattern);
 
-    psMetadata *cellConfig = cell->config; // The cell configuration
     psRegion *trimsec = psAlloc(sizeof(psRegion)); // Make space for a psRegion (usually passed by value)
 
@@ -166 +166 @@
     assert(cell);
     assert(pattern);
-    psMetadata *cellConfig = cell->config; // The cell configuration
 
     psList *biassecs = psListAlloc(NULL); // List of bias sections
-    psMetadataItem *item = psMetadataItemAlloc("CELL.BIASSEC", PS_DATA_LIST, "Bias sections", biassecs);
     psFree(biassecs);               // Drop reference
 
@@ -215 +213 @@
 
 // CELL.XBIN and CELL.YBIN
-psMetadataItem *pmConceptParse_CELL_BINNING(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
+psMetadataItem *pmConceptParse_CELL_Binning(psMetadataItem *concept, psMetadataItem *pattern, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
 {
     assert(concept);
@@ -226 +224 @@
                 sscanf(binString, "%d,%*d", &binning) != 1) ||
                 (strcmp(pattern->name, "CELL.YBIN") == 0 && sscanf(binString, "%*d %d", &binning) != 1 &&
-                 sscanf(binString, "%*d,%d", &binning) != 1) {
-                psError(PS_ERR_IO, true, "Unable to parse string to get %s: %s\n", pattern->name, binString)
-                    ;
-                }
-            } else if (concept->type == PS_TYPE_S32) {
-                binning = concept->data.S32;
-            } else {
-                psError(PS_ERR_IO, true, "Note sure how to parse %s of type %x --- assuming 1.\n", pattern->name,
-                        binItem->type);
-            }
-
-            return psMetadataItemAllocS32(pattern->name, pattern->comment, binning);
+                 sscanf(binString, "%*d,%d", &binning) != 1)) {
+            psError(PS_ERR_IO, true, "Unable to parse string to get %s: %s\n", pattern->name, binString);
+        }
+    } else if (concept->type == PS_TYPE_S32) {
+        binning = concept->data.S32;
+    } else {
+        psError(PS_ERR_IO, true, "Note sure how to parse %s of type %x --- assuming 1.\n", pattern->name,
+                concept->type);
+    }
+
+    return psMetadataItemAllocS32(pattern->name, pattern->comment, binning);
 }
 
@@ -247 +244 @@
 
     psTimeType timeSys = PS_TIME_UTC;   // The time system
+    psString sys = concept->data.V;     // The time system string
     if (concept->type != PS_DATA_STRING || strlen(sys) <= 0) {
         psError(PS_ERR_IO, true, "Can't interpret CELL.TIMESYS --- assuming UTC.\n");
@@ -273 +271 @@
 
     // Need CELL.TIMESYS first
-    bool mdok = false;                  // Result of MD lookup
+    bool mdok = true;                  // Result of MD lookup
     psTimeType timeSys = psMetadataLookupS32(&mdok, cell->concepts, "CELL.TIMESYS"); // The time system
     if (!mdok) {
@@ -281 +279 @@
 
     // Get format
-    bool mdok = true;               // Status of MD lookup
     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     if (!mdok || !formats) {
@@ -446 +443 @@
     psRegion *trimsec = concept->data.V; // The trimsec region
     psString trimsecString = psRegionToString(*trimsec);
-    psMetadataItem *formatted = psMetadataItemAllocStr(trimsecItem->name, trimsecItem->comment,
+    psMetadataItem *formatted = psMetadataItemAllocStr(concept->name, concept->comment,
                                 trimsecString);
     psFree(trimsecString);
@@ -543 +540 @@
     psFree(sys);
 
-    return success;
+    return newItem;
 }
 
@@ -602 +599 @@
     }
 
-    psError(PS_ERR_IO, true, "Not sure how to format concept CELL.TIME (%s)\n", dateTimeString);
+    psError(PS_ERR_IO, true, "Not sure how to format concept CELL.TIME\n");
     return NULL;
 }
 
-psMetadataItem *pmConceptFormat_CELL_Positions(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell *db)
+psMetadataItem *pmConceptFormat_CELL_Positions(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
 {
     assert(concept);
@@ -612 +609 @@
 
     if (concept->type != PS_TYPE_S32) {
-        psError(PS_ERR_IO, true, "Concept %s is not of type S32, as expected.\n", pattern->name);
+        psError(PS_ERR_IO, true, "Concept %s is not of type S32, as expected.\n", concept->name);
         return NULL;
     }