Changeset 18559 for trunk/ppSub/src/ppSubReadout.c

Timestamp:

Jul 15, 2008, 10:29:35 AM (18 years ago)

Author:

eugene

Message:

pmConfigMask renamed to pmConfigMaskGet

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (3 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -77 +77 @@
     int binning = psMetadataLookupS32(NULL, config->arguments, "SPAM.BINNING"); // Binning for SPAM kernel
     float penalty = psMetadataLookupF32(NULL, config->arguments, "PENALTY"); // Penalty for wideness
-    psMaskType maskBad = pmConfigMask(psMetadataLookupStr(NULL, config->arguments, "MASK.BAD"),
+    psMaskType maskBad = pmConfigMaskGet(psMetadataLookupStr(NULL, config->arguments, "MASK.BAD"),
                                     config); // Value to mask
-    psMaskType maskBlank = pmConfigMask(psMetadataLookupStr(NULL, config->arguments, "MASK.BLANK"),
+    psMaskType maskBlank = pmConfigMaskGet(psMetadataLookupStr(NULL, config->arguments, "MASK.BLANK"),
                                         config); // Mask for blank reg.
     float badFrac = psMetadataLookupF32(NULL, config->arguments, "BADFRAC"); // Maximum bad fraction
@@ -100 +100 @@
     if (!inRO->mask) {
         if (psMetadataLookupBool(NULL, config->arguments, "MASK.GENERATE")) {
-            pmReadoutSetMask(inRO, pmConfigMask("SAT", config), pmConfigMask("BAD", config));
+            pmReadoutSetMask(inRO, pmConfigMaskGet("SAT", config), pmConfigMaskGet("BAD", config));
         } else {
             inRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
@@ -108 +108 @@
     if (!refRO->mask) {
         if (psMetadataLookupBool(NULL, config->arguments, "MASK.GENERATE")) {
-            pmReadoutSetMask(refRO, pmConfigMask("SAT", config), pmConfigMask("BAD", config));
+            pmReadoutSetMask(refRO, pmConfigMaskGet("SAT", config), pmConfigMaskGet("BAD", config));
         } else {
             refRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_MASK);