Changeset 18291

Timestamp:

Jun 23, 2008, 12:46:13 PM (18 years ago)

Author:

Paul Price

Message:

Updating API.

File:

• branches/pap_branch_080617/ppStack/src/ppStackMatch.c (modified) (3 diffs)

branches/pap_branch_080617/ppStack/src/ppStackMatch.c

@@ -37 +37 @@
     int renormWidth = psMetadataLookupS32(&mdok, config->arguments,
                                           "RENORM.WIDTH"); // Width for renormalisation box
+    float penalty = psMetadataLookupF32(NULL, config->arguments, "PENALTY"); // Penalty for wideness
 
     if (!pmReadoutMaskNonfinite(readout, maskBad)) {
@@ -61 +62 @@
         int ringsOrder = psMetadataLookupS32(NULL, recipe, "RINGS.ORDER"); // RINGS polynomial order
         int binning = psMetadataLookupS32(NULL, recipe, "SPAM.BINNING"); // Binning for SPAM kernel
-        float penalty = psMetadataLookupF32(NULL, config->arguments, "PENALTY"); // Penalty for wideness
         psMaskType maskBlank = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BLANK"),
                                             config); // Mask for blank reg.
@@ -140 +140 @@
                          PS_DATA_REGION | PS_META_DUPLICATE_OK, "Fake subtraction region", region);
         psFree(region);
-        pmSubtractionKernels *kernels = pmSubtractionKernelsPOIS(FAKE_SIZE, 0, PM_SUBTRACTION_MODE_1);
+        pmSubtractionKernels *kernels = pmSubtractionKernelsPOIS(FAKE_SIZE, 0, penalty,
+                                                                 PM_SUBTRACTION_MODE_1);
         // Set solution to delta function
         kernels->solution1 = psVectorAlloc(kernels->num + 2, PS_TYPE_F64);