Changeset 18559

Timestamp:

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

Author:

eugene

Message:

pmConfigMask renamed to pmConfigMaskGet

Location:

trunk

Files:

• ppStack/src/ppStackArguments.c (modified) (1 diff)
• ppStack/src/ppStackMatch.c (modified) (2 diffs)
• ppSub/src/ppSubLoop.c (modified) (1 diff)
• ppSub/src/ppSubReadout.c (modified) (3 diffs)
• pstamp/src/ppstampMosaic.c (modified) (1 diff)

trunk/ppStack/src/ppStackArguments.c

@@ -80 +80 @@
         } \
     } \
-    psMaskType value = pmConfigMask(name, config); \
+    psMaskType value = pmConfigMaskGet(name, config); \
     psMetadataAddU8(config->arguments, PS_LIST_TAIL, RECIPENAME, 0, NULL, value); \
 }

trunk/ppStack/src/ppStackMatch.c

@@ -30 +30 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, "PPSUB"); // PPSUB recipe
     int size = psMetadataLookupS32(NULL, recipe, "KERNEL.SIZE"); // Kernel half-size
-    psMaskType maskBad = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BAD"), config); // Value to mask
+    psMaskType maskBad = pmConfigMaskGet(psMetadataLookupStr(NULL, recipe, "MASK.BAD"), config); // Value to mask
     bool mdok;                          // Status of MD lookup
     bool renorm = psMetadataLookupBool(&mdok, config->arguments, "RENORM"); // Renormalise variances?
@@ -64 +64 @@
         int ringsOrder = psMetadataLookupS32(NULL, recipe, "RINGS.ORDER"); // RINGS polynomial order
         int binning = psMetadataLookupS32(NULL, recipe, "SPAM.BINNING"); // Binning for SPAM kernel
-        psMaskType maskBlank = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BLANK"),
+        psMaskType maskBlank = pmConfigMaskGet(psMetadataLookupStr(NULL, recipe, "MASK.BLANK"),
                                             config); // Mask for blank reg.
         float badFrac = psMetadataLookupF32(NULL, recipe, "BADFRAC"); // Maximum bad fraction

trunk/ppSub/src/ppSubLoop.c

@@ -15 +15 @@
 {
     // Value to mask
-    psMaskType maskBlank = pmConfigMask(psMetadataLookupStr(NULL, config->arguments, "MASK.BLANK"), config) |
-        pmConfigMask(psMetadataLookupStr(NULL, config->arguments, "MASK.BAD"),
+    psMaskType maskBlank = pmConfigMaskGet(psMetadataLookupStr(NULL, config->arguments, "MASK.BLANK"), config) |
+        pmConfigMaskGet(psMetadataLookupStr(NULL, config->arguments, "MASK.BAD"),
                      config); // Mask for subtracted image
 

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);

trunk/pstamp/src/ppstampMosaic.c

@@ -29 +29 @@
     psFree(mosaicView);
 
-    psMaskType blankMask = pmConfigMask("BLANK", config);
+    psMaskType blankMask = pmConfigMaskGet("BLANK", config);
 
     status = pmChipMosaic(mChip, inChip, true, blankMask);