Changeset 39926 for trunk/psLib/src/fits/psFitsScale.c

Timestamp:

Jan 6, 2017, 11:30:10 AM (9 years ago)

Author:

eugene

Message:

merging changes from czw dev branch (compare with r39924)

Location:

trunk

Files:

• . (modified) (1 prop)
• psLib/src/fits/psFitsScale.c (modified) (3 diffs)

trunk/psLib/src/fits/psFitsScale.c

@@ -189 +189 @@
                 // Desperate retry
                 mean = psStatsGetValue(stats, DESPERATE_MEAN_STAT);
-                stdev = psStatsGetValue(stats, DESPERATE_STDEV_STAT);
+                if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+                  stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ);
+                }
+                else { 
+                  stdev = psStatsGetValue(stats, DESPERATE_STDEV_STAT);
+                }
             }
         } else {
             // Retry with all available pixels
             mean = psStatsGetValue(stats, MEAN_STAT);
-            stdev = psStatsGetValue(stats, STDEV_STAT);
+            if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+              stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ);
+            }
+            else {
+              stdev = psStatsGetValue(stats, STDEV_STAT);
+            }
         }
     } else {
         // First attempt
         mean = psStatsGetValue(stats, MEAN_STAT);
-        stdev = psStatsGetValue(stats, STDEV_STAT);
+        if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+          stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ);
+        }
+        else {
+          stdev = psStatsGetValue(stats, STDEV_STAT);
+        }
     }
     psFree(rng);
@@ -554 +569 @@
                 // Desperate retry
                 mean = psStatsGetValue(stats, DESPERATE_MEAN_STAT);
-                stdev = psStatsGetValue(stats, DESPERATE_STDEV_STAT);
-            }
+                if ((DESPERATE_STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(DESPERATE_STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+                  stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ); // Calculate a "sigma" based on the interquartile distance.
+                }
+                else {
+                  
+                  stdev = psStatsGetValue(stats, DESPERATE_STDEV_STAT);
+                }
+            }   
         } else {
             // Retry with all available pixels
             mean = psStatsGetValue(stats, MEAN_STAT);
-            stdev = psStatsGetValue(stats, STDEV_STAT);
+            if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+              stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ); // Calculate a "sigma" based on the interquartile distance.
+            }
+            else {
+              stdev = psStatsGetValue(stats, STDEV_STAT);
+            }
         }
     } else {
         // First attempt
         mean = psStatsGetValue(stats, MEAN_STAT);
-        stdev = psStatsGetValue(stats, STDEV_STAT);
+        if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+          stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ); // Calculate a "sigma" based on the interquartile distance.
+        }
+        else { 
+          stdev = psStatsGetValue(stats, STDEV_STAT);
+        }
     }
     psFree(rng);
@@ -723 +754 @@
                 // Desperate retry
                 mean = psStatsGetValue(stats, DESPERATE_MEAN_STAT);
-                stdev = psStatsGetValue(stats, DESPERATE_STDEV_STAT);
+                if ((DESPERATE_STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(DESPERATE_STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+                  stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ); // Calculate a "sigma" based on the interquartile distance.
+                }
+                else { 
+                  stdev = psStatsGetValue(stats, DESPERATE_STDEV_STAT);
+                }
             }
         } else {
             // Retry with all available pixels
             mean = psStatsGetValue(stats, MEAN_STAT);
-            stdev = psStatsGetValue(stats, STDEV_STAT);
+            if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+              stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ); // Calculate a "sigma" based on the interquartile distance.
+            }
+            else {
+              stdev = psStatsGetValue(stats, STDEV_STAT);
+            }
         }
     } else {
         // First attempt
         mean = psStatsGetValue(stats, MEAN_STAT);
-        stdev = psStatsGetValue(stats, STDEV_STAT);
+        if ((STDEV_STAT == PS_STAT_SAMPLE_QUARTILE)||(STDEV_STAT == PS_STAT_ROBUST_QUARTILE)) {
+          stdev = 0.7415 * (stats->sampleUQ - stats->sampleLQ); // Calculate a "sigma" based on the interquartile distance.
+        }
+        else {
+          stdev = psStatsGetValue(stats, STDEV_STAT);
+        }
     }
     psFree(rng);