Changeset 10854 for trunk/psModules/src/objects/pmSourceIO_CMP.c

Timestamp:

Dec 29, 2006, 8:32:01 AM (19 years ago)

Author:

magnier

Message:

catch errors in input file (nan)

File:

• trunk/psModules/src/objects/pmSourceIO_CMP.c (modified) (5 diffs)

trunk/psModules/src/objects/pmSourceIO_CMP.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-29 02:36:38 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-29 18:32:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -244 +244 @@
             psString line = psStringNCopy (&buffer[j*BYTES_STAR], BYTES_STAR);
 
-            psList *list = psStringSplit (line, " ", false);
-            psArray *array = psListToArray (list);
+            psArray *array = psStringSplitArray (line, " ", false);
 
             // XXX this is a bit cheap: I don't even attempt to interpret the
@@ -251 +250 @@
             // your milage may vary...
             pmSource *source = pmSourceAlloc ();
-            pmModel *model = pmModelAlloc (modelType);
-
-            PAR = model->params->data.F32;
-            dPAR = model->dparams->data.F32;
+            source->modelPSF = pmModelAlloc (modelType);
+            source->type = PM_SOURCE_TYPE_STAR;
+
+            PAR = source->modelPSF->params->data.F32;
+            dPAR = source->modelPSF->dparams->data.F32;
 
             PAR[PM_PAR_SKY] = pow (atof (array->data[5]), 10.0);
@@ -267 +267 @@
             axes.theta  = atof (array->data[10]);
 
+            if (!isfinite(axes.major))
+                goto skip_source;
+            if (!isfinite(axes.minor))
+                goto skip_source;
+            if (!isfinite(axes.theta))
+                goto skip_source;
+
             shape = psEllipseAxesToShape (axes);
 
@@ -273 +280 @@
             PAR[PM_PAR_SXY] = shape.sxy;
 
-            source->modelPSF = model;
-            source->type = PM_SOURCE_TYPE_STAR;
-
             psArrayAdd (sources, 100, source);
 
+skip_source:
             psFree (line);
-            psFree (list);
             psFree (array);
             psFree (source);