Changeset 20215

Timestamp:

Oct 16, 2008, 4:00:57 PM (18 years ago)

Author:

Paul Price

Message:

Turning off systematic error --- doesn't have a large effect.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -30 +30 @@
 #define MIN_SAMPLE_STATS    7           // Minimum number to use sample statistics; otherwise use quartiles
 
-#define SYS_ERROR 0.05                  // Relative error in derived convolution kernel pixels
+//#define SYS_ERROR 0.00                  // Relative error in derived convolution kernel pixels
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -462 +462 @@
                                        )
 {
+#ifndef SYS_ERROR
+    return NULL;
+#else
     int numCols = image->numCols, numRows = image->numRows; // Size of image
     psImage *sys = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Systematic error image
@@ -472 +475 @@
 
     return sys;
+#endif
 }
 
@@ -1194 +1198 @@
     if (kernels->mode == PM_SUBTRACTION_MODE_1 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
         sys1 = subtractionSysErrImage(ro1->image);
-        if (threaded) {
+        if (threaded && sys1) {
             psMutexInit(sys1);
         }
@@ -1200 +1204 @@
     if (kernels->mode == PM_SUBTRACTION_MODE_2 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
         sys2 = subtractionSysErrImage(ro2->image);
-        if (threaded) {
+        if (threaded && sys2) {
             psMutexInit(sys2);
         }