Changeset 6859 for branches/rel10_ifa/psModules/src/pslib

Timestamp:

Apr 14, 2006, 11:43:59 AM (20 years ago)

Author:

magnier

Message:

added JPEG and PSF I/O methods to pmFPAfile, added pmSourcePixelWeights

Location:

branches/rel10_ifa/psModules/src/pslib

Files:

• psAdditionals.c (modified) (2 diffs)
• psAdditionals.h (modified) (1 diff)
• psImageUnbin.c (modified) (4 diffs)
• psImageUnbin.h (modified) (1 diff)

branches/rel10_ifa/psModules/src/pslib/psAdditionals.c

@@ -143 +143 @@
 {
     psList *values = psListAlloc(NULL); // The list of values to return
+    if (string == NULL)
+        return values;  // NULL string is not an error, just an empty list
+
     unsigned int length = strlen(string); // The length of the string
     unsigned int numSplitters = strlen(splitters); // Number of characters that might split
@@ -176 +179 @@
 }
 
+psArray *psStringSplitArray (const char *string, const char *splitters)
+{
+
+    psList *list = psStringSplit (string, splitters);
+    psArray *array = psListToArray (list);
+    psFree (list);
+    return array;
+}
+
 #ifndef whitespace
 #define whitespace(c) (((c) == ' ') || ((c) == '\t'))

branches/rel10_ifa/psModules/src/pslib/psAdditionals.h

@@ -30 +30 @@
                      );
 
+// Split string on given characters
+psArray *psStringSplitArray(const char *string, // String to split
+                            const char *splitters // Characters on which to split
+                           );
+
 // strip whitespace from head and tail of string
 int psStringStrip (char *string);

branches/rel10_ifa/psModules/src/pslib/psImageUnbin.c

@@ -179 +179 @@
 }
 
-double psImageClippedStats (psImage *image, psImage *mask, psU8 maskValue, double fmin, double fmax)
+psStats *psImageClippedStats (psImage *image, psImage *mask, psU8 maskValue, double fmin, double fmax)
 {
     double value;
@@ -185 +185 @@
     int ny = image->numRows;
 
+    psStats *stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_QUARTILE);
     if (nx*ny <= 0)
-        return 0.0;
+        return stats;
 
     int Nsubset = PS_MIN (MAX_SAMPLE_PIXELS, nx*ny);
@@ -203 +204 @@
         int iy = pixel / nx;
 
-        if (mask->data.U8[iy][ix] & maskValue)
+        if (mask && mask->data.U8[iy][ix] & maskValue)
             continue;
 
@@ -226 +227 @@
     value = value / npts;
 
+    stats->robustMedian = value;
+    stats->robustUQ = values->data.F32[imax];
+    stats->robustLQ = values->data.F32[imin];
+
+    psFree (values);
+    return stats;
     // XXX correct for selection bias??
-
-    psFree (values);
-    return value;
 }
 

branches/rel10_ifa/psModules/src/pslib/psImageUnbin.h

@@ -11 +11 @@
 
 // my temporary image stats function; seems to be much faster than psLib???
-double psImageClippedStats (psImage *image, psImage *mask, psU8 maskValue, double fmin, double fmax);
+psStats *psImageClippedStats (psImage *image, psImage *mask, psU8 maskValue, double fmin, double fmax);
 
 // my temporary sort which is based on N.R.; seems to be faster than psLib sort???