Changeset 7840

Timestamp:

Jul 7, 2006, 11:35:51 AM (20 years ago)

Author:

Paul Price

Message:

Darks weren't getting scaled, because it was simply returning without any operations.

File:

• trunk/ppMerge/src/ppMergeScaleZero.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -46 +46 @@
     assert(config);
 
-    if (!options->scale && !options->zero) {
+    if (!options->scale && !options->zero && !options->exptime) {
         return true;                    // We did everything we were asked for
     }
@@ -137 +137 @@
                         (*zeros)->data.F32[i][cellNum] = zero;
                         psTrace(__func__, 9, "Zero for input %ld, chip %ld, cell %ld: %f\n", i, j, k, zero);
-                   } else if (!first && fromConcepts) {
+                    } else if (!first && fromConcepts) {
                         psLogMsg(__func__, PS_LOG_WARN, "PPMERGE.SCALE and PPMERGE.ZERO have been set "
                                  "for some, but not all cells --- we will re-measure it for all cells.");