Changeset 12464 for trunk/psModules/src/objects

Timestamp:

Mar 15, 2007, 3:48:55 PM (19 years ago)

Author:

magnier

Message:

free tableHeader, error message on OBJ and SX as input file

File:

• trunk/psModules/src/objects/pmSourceIO.c (modified) (14 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-16 00:32:46 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-16 01:48:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
     switch (source->type) {
 
-    case PM_SOURCE_TYPE_DEFECT:
-    case PM_SOURCE_TYPE_SATURATED:
+      case PM_SOURCE_TYPE_DEFECT:
+      case PM_SOURCE_TYPE_SATURATED:
         return (8);
 
-    case PM_SOURCE_TYPE_STAR:
+      case PM_SOURCE_TYPE_STAR:
         if (source->mode & PM_SOURCE_MODE_SATSTAR)
             return (10);
@@ -50 +50 @@
         return (1);
 
-    case PM_SOURCE_TYPE_EXTENDED:
+      case PM_SOURCE_TYPE_EXTENDED:
         return (2);
 
-    default:
+      default:
         return (0);
     }
@@ -185 +185 @@
 
     switch (file->type) {
-    case PM_FPA_FILE_RAW:
+      case PM_FPA_FILE_RAW:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
         realname = pmConfigConvertFilename (filename, config, create);
@@ -193 +193 @@
         break;
 
-    case PM_FPA_FILE_OBJ:
+      case PM_FPA_FILE_OBJ:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
         realname = pmConfigConvertFilename (filename, config, create);
@@ -201 +201 @@
         break;
 
-    case PM_FPA_FILE_SX:
+      case PM_FPA_FILE_SX:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
         realname = pmConfigConvertFilename (filename, config, create);
@@ -209 +209 @@
         break;
 
-    case PM_FPA_FILE_CMP:
+      case PM_FPA_FILE_CMP:
         // a SPLIT format : only one header and object table per file
         hdu = pmFPAviewThisHDU (view, file->fpa);
@@ -241 +241 @@
         break;
 
-    case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_CMF:
         // write a PHU? (only if input image is MEF)
         // write a header? (only if this is the first readout for cell)
@@ -350 +350 @@
         psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
         if (!status) {
-          psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
-          return false;
+            psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
+            return false;
         }
         exttype = psMemIncrRefCounter (psMetadataLookupStr(&status, recipe, "OUTPUT.FORMAT"));
@@ -365 +365 @@
         status = false;
         if (!strcmp (exttype, "SMPDATA")) {
-          status = pmSourcesWrite_SMPDATA (file->fits, sources, outhead, dataname);
+            status = pmSourcesWrite_SMPDATA (file->fits, sources, outhead, dataname);
         }
         if (!strcmp (exttype, "PS1_DEV_0")) {
-          status = pmSourcesWrite_PS1_DEV_0 (file->fits, sources, outhead, dataname);
+            status = pmSourcesWrite_PS1_DEV_0 (file->fits, sources, outhead, dataname);
         }
 
@@ -386 +386 @@
         break;
 
-    default:
+      default:
         fprintf (stderr, "warning: type mismatch\n");
         break;
@@ -480 +480 @@
 
     switch (file->type) {
-    case PM_FPA_FILE_OBJ:
-        fprintf (stderr, "warning: OBJ is not supported as an input object format\n");
-        break;
-
-    case PM_FPA_FILE_SX:
-        fprintf (stderr, "warning: SX is not supported as an input object format\n");
-        break;
-
-    case PM_FPA_FILE_CMP:
+      case PM_FPA_FILE_OBJ:
+        psError(PS_ERR_UNKNOWN, true, "OBJ is not supported as an input object format");
+        return false;
+
+      case PM_FPA_FILE_SX:
+        psError(PS_ERR_UNKNOWN, true, "SX is not supported as an input object format");
+        return false;
+
+      case PM_FPA_FILE_CMP:
         // a SPLIT format : only one header and object table per file
 
@@ -523 +523 @@
         break;
 
-    case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_CMF:
         // read in header, if not yet loaded
         hdu = pmFPAviewThisHDU (view, file->fpa);
@@ -584 +584 @@
         }
 
+        psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);
         psFree (headname);
         psFree (dataname);
-        break;
-
-    default:
+        psFree (tableHeader);
+        break;
+
+      default:
         fprintf (stderr, "warning: type mismatch\n");
         break;