Changeset 37035 for trunk/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

Timestamp:

Jul 17, 2014, 10:10:16 AM (12 years ago)

Author:

eugene

Message:

major re-work of dvo photcode-based-field parsing; adding PS1_V5 and lensing parameters, adding reference colors blue & red

File:

• trunk/Ohana/src/libdvo/src/LoadPhotcodesFITS.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

@@ -64 +64 @@
   CONVERT_FORMAT("DVO_PHOTCODE_PS1_V3",    PS1_V3);
   CONVERT_FORMAT("DVO_PHOTCODE_PS1_V4",    PS1_V4);
+  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V5",    PS1_V5);
 
   table = GetPhotcodeTable ();
@@ -100 +101 @@
   // photcode.equiv of 0 means "undefined"
   for (i = 0; i < Ncode; i++) {
+    if (!strcasecmp(photcode[i].name, "MAG")) {
+      fprintf (stderr, "MAG is not an allowed photcode name (reserved to DVO internals)\n");
+      free (photcode);
+      return FALSE;
+    }
+    if (!strcasecmp(photcode[i].name, "FLUX")) {
+      fprintf (stderr, "FLUX is not an allowed photcode name (reserved to DVO internals)\n");
+      free (photcode);
+      return FALSE;
+    }
+
     if (photcode[i].type == PHOT_DEP) {
       if (photcode[i].equiv == 0) continue;