Changeset 34271 for trunk/psModules/src/objects/pmSourceIO.c

Timestamp:

Aug 1, 2012, 2:32:05 PM (14 years ago)

Author:

eugene

Message:

do not raise an error if we cannot find the XRAD, XFIT, XSRC extensions; do not attempt to tranform nan ellipses; plug possible leak

File:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -1226 +1226 @@
 static bool pmReadoutReadXSRC(pmFPAfile *file, char *exttype, psMetadata *hduHeader, psString xsrcname, psArray *sources, long *sourceIndex) 
 {
-    if (!psFitsMoveExtName (file->fits, xsrcname)) {
+    if (!psFitsMoveExtNameClean (file->fits, xsrcname)) {
         psWarning ("cannot find xsrc extension %s in %s, skipping", xsrcname, file->filename);
         return false;
@@ -1262 +1262 @@
 static bool pmReadoutReadXFIT(pmFPAfile *file, char *exttype, psMetadata *hduHeader, psString extname, psArray *sources, long *sourceIndex) 
 {
-    if (!psFitsMoveExtName (file->fits, extname)) {
+    if (!psFitsMoveExtNameClean (file->fits, extname)) {
         psWarning ("cannot find xfit extension %s in %s, skipping", extname, file->filename);
         return false;
@@ -1297 +1297 @@
 static bool pmReadoutReadXRAD(pmFPAfile *file, pmReadout *readout, char *exttype, psMetadata *hduHeader, psString extname, psArray *sources, long *sourceIndex) 
 {
-    if (!psFitsMoveExtName (file->fits, extname)) {
+    if (!psFitsMoveExtNameClean (file->fits, extname)) {
         psWarning ("cannot find xrad extension %s in %s, skipping", extname, file->filename);
         return false;