Changeset 21365 for trunk/ppMerge
- Timestamp:
- Feb 5, 2009, 4:47:00 PM (17 years ago)
- Location:
- trunk/ppMerge/src
- Files:
-
- 7 edited
-
ppMergeArguments.c (modified) (4 diffs)
-
ppMergeCamera.c (modified) (6 diffs)
-
ppMergeFiles.c (modified) (8 diffs)
-
ppMergeLoop_Threaded.c (modified) (8 diffs)
-
ppMergeMask.c (modified) (13 diffs)
-
ppMergeReadChunk.c (modified) (4 diffs)
-
ppMergeScaleZero.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ppMerge/src/ppMergeArguments.c
r21244 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1.1 6$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 1 21:43:05$8 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 25 25 "\tIMAGE(STR): Image filename\n" 26 26 "\tMASK(STR): Mask filename\n" 27 "\t WEIGHT(STR) Weightmap filename\n"28 "where MASK and WEIGHTare optional.",27 "\tVARIANCE(STR) Variance map filename\n" 28 "where MASK and VARIANCE are optional.", 29 29 program); 30 30 fprintf(stderr, "\n"); … … 155 155 psMetadataAddF32(arguments, PS_LIST_TAIL, "-frachigh", 0, "Fraction of low pixels to discard", NAN); 156 156 psMetadataAddS32(arguments, PS_LIST_TAIL, "-nkeep", 0, "Minimum number of pixels in stack to keep", 0); 157 psMetadataAddBool(arguments, PS_LIST_TAIL, "- weights", 0, "Use image weights in combination?", false);157 psMetadataAddBool(arguments, PS_LIST_TAIL, "-variances", 0, "Use image variances in combination?", false); 158 158 159 159 // XXX EAM : not clear this should be allowed on the command line. … … 300 300 VALUE_ARG_RECIPE_FLOAT("-frachigh", "FRACHIGH", F32); 301 301 VALUE_ARG_RECIPE_INT("-nkeep", "NKEEP", S32, 0); 302 VALUE_ARG_RECIPE_BOOL("- weights", "WEIGHTS");302 VALUE_ARG_RECIPE_BOOL("-variances", "VARIANCES"); 303 303 304 304 // XXX we do not supply this on the command line -
trunk/ppMerge/src/ppMergeCamera.c
r21244 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 1 21:43:05$8 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 96 96 { 97 97 bool haveMasks = false; // Do we have masks? 98 bool have Weights = false; // Do we have weightmaps?98 bool haveVariances = false; // Do we have variance maps? 99 99 100 100 ppMergeType type = psMetadataLookupS32(NULL, config->arguments, "TYPE"); ///< Type of frame … … 121 121 122 122 bool mdok; 123 psString mask = psMetadataLookupStr(&mdok, input, "MASK"); // /<Name of mask124 psString weight = psMetadataLookupStr(&mdok, input, "WEIGHT"); ///< Name of weightmap123 psString mask = psMetadataLookupStr(&mdok, input, "MASK"); // Name of mask 124 psString variance = psMetadataLookupStr(&mdok, input, "VARIANCE"); // Name of variance map 125 125 126 126 // Add the image file … … 164 164 } 165 165 166 // Optionally add the weightfile167 if ( weight && strlen(weight) > 0) {168 have Weights = true;169 psArray * weightFiles = psArrayAlloc(1); ///<Array of filenames for this FPA170 weightFiles->data[0] = psMemIncrRefCounter(weight);171 psMetadataAddArray(config->arguments, PS_LIST_TAIL, " WEIGHT.FILENAMES", PS_META_REPLACE,172 "Filenames of weight files", weightFiles);173 psFree( weightFiles);166 // Optionally add the variance file 167 if (variance && strlen(variance) > 0) { 168 haveVariances = true; 169 psArray *varianceFiles = psArrayAlloc(1); // Array of filenames for this FPA 170 varianceFiles->data[0] = psMemIncrRefCounter(variance); 171 psMetadataAddArray(config->arguments, PS_LIST_TAIL, "VARIANCE.FILENAMES", PS_META_REPLACE, 172 "Filenames of variance files", varianceFiles); 173 psFree(varianceFiles); 174 174 175 175 bool status; 176 pmFPAfile * weightFile = pmFPAfileBindFromArgs(&status, imageFile, config, "PPMERGE.INPUT.WEIGHT",177 "WEIGHT.FILENAMES");176 pmFPAfile *varianceFile = pmFPAfileBindFromArgs(&status, imageFile, config, 177 "PPMERGE.INPUT.VARIANCE", "VARIANCE.FILENAMES"); 178 178 if (!status) { 179 psError(PS_ERR_UNKNOWN, false, "Unable to define file from weight %d (%s)", numFiles, weight); 180 return false; 181 } 182 if (weightFile->type != PM_FPA_FILE_WEIGHT) { 183 psError(PS_ERR_IO, true, "PPMERGE.INPUT.WEIGHT is not of type WEIGHT"); 184 return false; 185 } 186 haveWeights = true; 179 psError(PS_ERR_UNKNOWN, false, "Unable to define file from variance %d (%s)", 180 numFiles, variance); 181 return false; 182 } 183 if (varianceFile->type != PM_FPA_FILE_VARIANCE) { 184 psError(PS_ERR_IO, true, "PPMERGE.INPUT.VARIANCE is not of type VARIANCE"); 185 return false; 186 } 187 haveVariances = true; 187 188 } 188 189 … … 194 195 psMetadataRemoveKey(config->arguments, "MASK.FILENAMES"); 195 196 } 196 if (psMetadataLookup(config->arguments, " WEIGHT.FILENAMES")) {197 psMetadataRemoveKey(config->arguments, " WEIGHT.FILENAMES");197 if (psMetadataLookup(config->arguments, "VARIANCE.FILENAMES")) { 198 psMetadataRemoveKey(config->arguments, "VARIANCE.FILENAMES"); 198 199 } 199 200 if (psMetadataLookup(config->arguments, "PSF.FILENAMES")) { … … 203 204 psMetadataAddS32(config->arguments, PS_LIST_TAIL, "INPUTS.NUM", 0, "Number of input files", numFiles); 204 205 psMetadataAddBool(config->arguments, PS_LIST_TAIL, "INPUTS.MASKS", 0, "Got input masks?", haveMasks); 205 psMetadataAddBool(config->arguments, PS_LIST_TAIL, "INPUTS. WEIGHTS", 0,206 "Got input weights?", haveWeights);206 psMetadataAddBool(config->arguments, PS_LIST_TAIL, "INPUTS.VARIANCES", 0, 207 "Got input variances?", haveVariances); 207 208 208 209 -
trunk/ppMerge/src/ppMergeFiles.c
r21244 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 1 21:43:05$8 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 13 13 #include "ppMerge.h" 14 14 15 const char *allFiles[] = { "PPMERGE.INPUT", "PPMERGE.INPUT.MASK", "PPMERGE.INPUT. WEIGHT",15 const char *allFiles[] = { "PPMERGE.INPUT", "PPMERGE.INPUT.MASK", "PPMERGE.INPUT.VARIANCE", 16 16 "PPMERGE.OUTPUT", "PPMERGE.OUTPUT.COUNT", "PPMERGE.OUTPUT.SIGMA", 17 NULL }; // /<All files18 const char *inputFiles[] = { "PPMERGE.INPUT", "PPMERGE.INPUT.MASK", "PPMERGE.INPUT. WEIGHT",19 NULL }; // /<Input files17 NULL }; // All files 18 const char *inputFiles[] = { "PPMERGE.INPUT", "PPMERGE.INPUT.MASK", "PPMERGE.INPUT.VARIANCE", 19 NULL }; // Input files 20 20 const char *outputFiles[] = { "PPMERGE.OUTPUT", "PPMERGE.OUTPUT.COUNT", "PPMERGE.OUTPUT.SIGMA", 21 21 NULL }; ///< Output files … … 51 51 } 52 52 } 53 if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS. WEIGHTS")) {54 pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT. WEIGHT", num);55 if (!pmReadoutReadChunk Weight(readout, file->fits, 0, rows, 0, config)) {56 psError(PS_ERR_UNKNOWN, false, "Unable to read readout weight.");53 if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS.VARIANCES")) { 54 pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.VARIANCE", num); 55 if (!pmReadoutReadChunkVariance(readout, file->fits, 0, rows, 0, config)) { 56 psError(PS_ERR_UNKNOWN, false, "Unable to read readout variance."); 57 57 return false; 58 58 } … … 91 91 psFree(fileView); 92 92 } 93 if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS.WEIGHTS")) { 94 pmFPAfile *weight = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.WEIGHT", num); // Weight file 95 pmFPAview *fileView = pmFPAviewForLevel(weight->fileLevel, view); 96 if (!pmFPAfileOpen(weight, fileView, config)) { 97 psError(PS_ERR_UNKNOWN, false, "Unable to open weight file %d", num); 93 if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS.VARIANCES")) { 94 pmFPAfile *variance = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.VARIANCE", 95 num); // Variance file 96 pmFPAview *fileView = pmFPAviewForLevel(variance->fileLevel, view); 97 if (!pmFPAfileOpen(variance, fileView, config)) { 98 psError(PS_ERR_UNKNOWN, false, "Unable to open variance file %d", num); 98 99 psFree(fileView); 99 100 return false; … … 127 128 bool mdok; // Status of MD lookup 128 129 bool haveMasks = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS"); // Do we have masks? 129 bool have Weights = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.WEIGHTS"); // Got weights?130 bool haveVariances = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.VARIANCES"); // Got variances? 130 131 131 132 const char **fileList = selectFiles(files); // Files to activate … … 134 135 continue; 135 136 } 136 if (!have Weights && strcmp(fileList[i], "PPMERGE.INPUT.WEIGHT") == 0) {137 if (!haveVariances && strcmp(fileList[i], "PPMERGE.INPUT.VARIANCE") == 0) { 137 138 continue; 138 139 } … … 163 164 bool mdok; // Status of MD lookup 164 165 bool haveMasks = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS"); // Do we have masks? 165 bool have Weights = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.WEIGHTS"); // Got weights?166 bool haveVariances = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.VARIANCES"); // Got variances? 166 167 167 168 psList *list = psListAlloc(NULL); // List of files … … 171 172 continue; 172 173 } 173 if (!have Weights && strcmp(fileList[i], "PPMERGE.INPUT.WEIGHT") == 0) {174 if (!haveVariances && strcmp(fileList[i], "PPMERGE.INPUT.VARIANCE") == 0) { 174 175 continue; 175 176 } -
trunk/ppMerge/src/ppMergeLoop_Threaded.c
r21244 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 1 21:43:05$8 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 36 36 bool mdok; ///< Status of MD lookup 37 37 bool haveMasks = psMetadataLookupBool(&mdok, arguments, "INPUTS.MASKS"); // Do we have masks? 38 bool have Weights = psMetadataLookupBool(&mdok, arguments, "INPUTS.WEIGHTS"); ///< Do we have weights?39 40 psArray *inputs = ppMergeFileDataLevel(config, "PPMERGE.INPUT", PM_FPA_LEVEL_READOUT); // /<Input images41 psArray *masks = NULL, * weights = NULL; ///< Input masks and weights38 bool haveVariances = psMetadataLookupBool(&mdok, arguments, "INPUTS.VARIANCES"); // Do we have variances? 39 40 psArray *inputs = ppMergeFileDataLevel(config, "PPMERGE.INPUT", PM_FPA_LEVEL_READOUT); // Input images 41 psArray *masks = NULL, *variances = NULL; // Input masks and variances 42 42 if (haveMasks) { 43 43 masks = ppMergeFileDataLevel(config, "PPMERGE.INPUT.MASK", PM_FPA_LEVEL_READOUT); 44 44 } 45 if (have Weights) {46 weights = ppMergeFileDataLevel(config, "PPMERGE.INPUT.WEIGHT", PM_FPA_LEVEL_READOUT);45 if (haveVariances) { 46 variances = ppMergeFileDataLevel(config, "PPMERGE.INPUT.VARIANCE", PM_FPA_LEVEL_READOUT); 47 47 } 48 48 … … 50 50 if (!mdok) nThreads = 0; 51 51 52 / ** General combination parameters */53 int iter = psMetadataLookupS32(NULL, arguments, "ITER"); // /<Number of rejection iterations54 float rej = psMetadataLookupF32(NULL, arguments, "REJ"); // /<Rejection level55 float fraclow = psMetadataLookupF32(NULL, arguments, "FRACLOW"); // /<Reject fraction of low pixels56 float frachigh = psMetadataLookupF32(NULL, arguments, "FRACHIGH"); // /<Reject fraction of hi pixels57 int nKeep = psMetadataLookupS32(NULL, arguments, "NKEEP"); // /<Minimum number of values to keep58 psStatsOptions combineStat = psMetadataLookupS32(NULL, arguments, "COMBINE"); // /<Combination statistic59 bool use Weights = psMetadataLookupBool(NULL, arguments, "WEIGHTS"); ///< Use weights?60 61 / ** Fringe parameters */62 int fringeNum = psMetadataLookupS32(NULL, arguments, "FRINGE.NUM"); // /<Number of fringe points63 int fringeSize = psMetadataLookupS32(NULL, arguments, "FRINGE.SIZE"); // /<Size of fringe regions64 int fringeSmoothX = psMetadataLookupS32(NULL, arguments, "FRINGE.XSMOOTH"); // /<Smoothing regions in x65 int fringeSmoothY = psMetadataLookupS32(NULL, arguments, "FRINGE.YSMOOTH"); // /<Smoothing regions in y52 // General combination parameters 53 int iter = psMetadataLookupS32(NULL, arguments, "ITER"); // Number of rejection iterations 54 float rej = psMetadataLookupF32(NULL, arguments, "REJ"); // Rejection level 55 float fraclow = psMetadataLookupF32(NULL, arguments, "FRACLOW"); // Reject fraction of low pixels 56 float frachigh = psMetadataLookupF32(NULL, arguments, "FRACHIGH"); // Reject fraction of hi pixels 57 int nKeep = psMetadataLookupS32(NULL, arguments, "NKEEP"); // Minimum number of values to keep 58 psStatsOptions combineStat = psMetadataLookupS32(NULL, arguments, "COMBINE"); // Combination statistic 59 bool useVariances = psMetadataLookupBool(NULL, arguments, "VARIANCES"); // Use variances? 60 61 // Fringe parameters 62 int fringeNum = psMetadataLookupS32(NULL, arguments, "FRINGE.NUM"); // Number of fringe points 63 int fringeSize = psMetadataLookupS32(NULL, arguments, "FRINGE.SIZE"); // Size of fringe regions 64 int fringeSmoothX = psMetadataLookupS32(NULL, arguments, "FRINGE.XSMOOTH"); // Smoothing regions in x 65 int fringeSmoothY = psMetadataLookupS32(NULL, arguments, "FRINGE.YSMOOTH"); // Smoothing regions in y 66 66 67 67 // set the mask and mark bit values based on the named masks 68 psImageMaskType maskVal; 69 psImageMaskType markVal; 70 if (!pmConfigMaskSetBits (&maskVal, &markVal, config)) { 68 psImageMaskType maskVal, markVal; 69 if (!pmConfigMaskSetBits(&maskVal, &markVal, config)) { 71 70 psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values"); 72 71 return false; … … 81 80 combination->iter = iter; 82 81 combination->rej = rej; 83 combination-> weights = useWeights;82 combination->variances = useVariances; 84 83 85 84 psMetadata *stats = NULL; ///< Statistics for output … … 344 343 psFree(countsRO); 345 344 346 347 348 349 350 351 352 345 // XXX EAM 2009.01.18 : sigmaCell and countsCell need to have their concepts copied from outCell. 346 // This was causing segfaults for VYSOS5; Why did this ever work for SIMTEST? 347 if (!pmConceptsCopyCell(countsCell, outCell)) { 348 psError(PS_ERR_UNKNOWN, false, "Unable to copy cell concepts."); 349 psFree(outRO); 350 goto ERROR; 351 } 353 352 354 353 pmCell *sigmaCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.SIGMA"); … … 360 359 psFree(sigmaRO); 361 360 362 363 364 365 366 361 if (!pmConceptsCopyCell(sigmaCell, outCell)) { 362 psError(PS_ERR_UNKNOWN, false, "Unable to copy cell concepts."); 363 psFree(outRO); 364 goto ERROR; 365 } 367 366 } 368 367 … … 447 446 psFree(inputs); 448 447 psFree(masks); 449 psFree( weights);448 psFree(variances); 450 449 psFree(stats); 451 450 return true; … … 456 455 psFree(inputs); 457 456 psFree(masks); 458 psFree( weights);457 psFree(variances); 459 458 psFree(stats); 460 459 return false; -
trunk/ppMerge/src/ppMergeMask.c
r21244 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 1 21:43:05$8 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 38 38 float smoothScale = psMetadataLookupF32(&mdok, config->arguments, "MASK.SMOOTH.SCALE"); ///< Radius to grow mask 39 39 40 psImageMaskType markVal; 41 psImageMaskType maskValRaw; 42 if (!pmConfigMaskSetBits (&maskValRaw, &markVal, config)) { 43 psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values"); 44 return false; 40 psImageMaskType markVal, maskValRaw; 41 if (!pmConfigMaskSetBits(&maskValRaw, &markVal, config)) { 42 psError(PS_ERR_UNKNOWN, true, "Unable to define the mask bit values"); 43 return false; 45 44 } 46 45 … … 48 47 psImageMaskType maskValOut = pmConfigMaskGet (maskOutName, config); 49 48 if (!maskValOut) { 50 51 52 } 53 54 psStats *statistics = psStatsAlloc(meanStat | stdevStat); // /<Statistics for background49 psError (PS_ERR_UNKNOWN, true, "Undefined output mask bit value"); 50 return false; 51 } 52 53 psStats *statistics = psStatsAlloc(meanStat | stdevStat); // Statistics for background 55 54 56 55 psString outName = ppMergeOutputFile(config); ///< Name of output file 57 56 pmChip *outChip = pmFPAfileThisChip(config->files, view, outName); ///< Output chip 58 57 psFree(outName); 59 58 60 59 int numCells = 1; 61 60 if (chipStats) { 62 63 64 65 66 67 68 61 // count the number of active cells for this chip: 62 numCells = 0; 63 for (int i = 0; i < outChip->cells->n; i++) { 64 pmCell *cell = outChip->cells->data[i]; 65 if (!cell->process) continue; 66 numCells ++; 67 } 69 68 } 70 69 … … 85 84 while ((inCell = pmFPAviewNextCell(inView, inFPA, 1))) { 86 85 87 88 pmCell *outCell = pmFPAfileThisCell(config->files, inView, "PPMERGE.OUTPUT.MASK"); // /<Output cell89 86 // the output FPA structure carries the information about which cells to process 87 pmCell *outCell = pmFPAfileThisCell(config->files, inView, "PPMERGE.OUTPUT.MASK"); // Output cell 88 if (!outCell->process) continue; 90 89 91 90 pmHDU *hdu = pmHDUFromCell(inCell); ///< HDU for cell … … 150 149 int y = pixel / numCols; 151 150 if (mask && (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskValRaw)) continue; 152 153 151 if (outMask && (outMask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskValOut)) continue; 152 if (!isfinite(image->data.F32[y][x])) continue; 154 153 155 154 values->data.F32[valueIndex++] = image->data.F32[y][x]; … … 165 164 } 166 165 167 168 169 170 171 166 float mean = psStatsGetValue(statistics, meanStat); 167 float stdev = psStatsGetValue(statistics, stdevStat); 168 169 // this function increments the count for each suspect pixel in each input plane 170 // maskValRaw is used to test for valid input pixels 172 171 if (!pmMaskFlagSuspectPixels(outRO, readout, mean, stdev, maskSuspect, maskValRaw)) { 173 172 psError(PS_ERR_UNKNOWN, false, "Unable to find suspect values in file %d", i); … … 197 196 inView->cell = -1; 198 197 while ((inCell = pmFPAviewNextCell(inView, inFPA, 1))) { 199 200 // the output FPA structure carries the information about which cells to process 201 pmCell *outCell = pmFPAfileThisCell(config->files, inView, "PPMERGE.OUTPUT.MASK"); ///< Output cell 202 if (!outCell->process) continue; 198 // the output FPA structure carries the information about which cells to process 199 pmCell *outCell = pmFPAfileThisCell(config->files, inView, "PPMERGE.OUTPUT.MASK"); // Output cell 200 if (!outCell->process) continue; 203 201 204 202 pmHDU *hdu = pmHDUFromCell(inCell); ///< HDU for cell … … 210 208 pmReadout *outRO = pmFPAfileThisReadout(config->files, inView, "PPMERGE.OUTPUT.MASK"); 211 209 212 213 214 215 210 float mean = psStatsGetValue(statistics, meanStat); 211 float stdev = psStatsGetValue(statistics, stdevStat); 212 213 if (!pmMaskFlagSuspectPixels(outRO, readout, mean, stdev, maskSuspect, maskValRaw)) { 216 214 psError(PS_ERR_UNKNOWN, false, "Unable to find suspect values in file %d", i); 217 215 goto MERGE_MASK_ERROR; … … 243 241 while ((outCell = pmFPAviewNextCell(outView, outFPA, 1))) { 244 242 245 246 243 // skip inactive cells 244 if (!outCell->process) continue; 247 245 248 246 pmHDU *hdu = pmHDUFromCell(outCell); ///< HDU for cell … … 254 252 pmReadout *outRO = outCell->readouts->data[0]; ///< Output readout 255 253 256 257 258 psImage *suspects = psMetadataLookupPtr(NULL, outRO->analysis, PM_MASK_ANALYSIS_SUSPECT); ///<Suspect img259 260 psImageSmooth (suspects, smoothScale, 3); ///<extend smoothing region to 3-sigma261 262 263 254 if (smoothSuspect) { 255 // XXX test output of suspect pixel image 256 psImage *suspects = psMetadataLookupPtr(NULL, outRO->analysis, PM_MASK_ANALYSIS_SUSPECT); // Suspect img 257 assert (suspects); 258 psImageSmooth (suspects, smoothScale, 3); // extend smoothing region to 3-sigma 259 } 260 261 // set the bad pixels to the value 'maskVal' 264 262 if (!pmMaskIdentifyBadPixels(outRO, maskValOut, maskBad, maskMode)) { 265 263 psError(PS_ERR_UNKNOWN, false, "Unable to mask bad pixels"); … … 352 350 assert(config); 353 351 354 bool mdok; // /<Status of MD lookup355 int numFiles = psMetadataLookupS32(NULL, config->arguments, "INPUTS.NUM"); // /<Number of inputs356 bool haveMasks = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS"); // /<Do we have masks?357 bool have Weights = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.WEIGHTS"); ///< Do we have weights?358 int iter = psMetadataLookupS32(NULL, config->arguments, "ITER"); // /<Number of rejection iterations352 bool mdok; // Status of MD lookup 353 int numFiles = psMetadataLookupS32(NULL, config->arguments, "INPUTS.NUM"); // Number of inputs 354 bool haveMasks = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS"); // Do we have masks? 355 bool haveVariances = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.VARIANCES"); // Got variances? 356 int iter = psMetadataLookupS32(NULL, config->arguments, "ITER"); // Number of rejection iterations 359 357 360 358 PS_ASSERT_INT_POSITIVE(iter, false); … … 375 373 psFree(masks); 376 374 } 377 if (have Weights) {378 psArray * weights = ppMergeFileDataLevel(config, "PPMERGE.INPUT.WEIGHT", PM_FPA_LEVEL_READOUT);379 psFree( weights);375 if (haveVariances) { 376 psArray *variances = ppMergeFileDataLevel(config, "PPMERGE.INPUT.VARIANCE", PM_FPA_LEVEL_READOUT); 377 psFree(variances); 380 378 } 381 379 … … 417 415 } 418 416 419 420 421 422 pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", i); ///<Input file423 424 425 426 427 428 429 430 431 432 433 434 435 417 if (outChip->data_exists) { 418 psList *inChips = psListAlloc(NULL); 419 for (int i=0; i < numFiles; i++) { 420 pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", i); // Input file 421 pmChip *chip = pmFPAviewThisChip(view, file->fpa); 422 psListAdd(inChips, PS_LIST_TAIL, chip); 423 } 424 425 // XXX I need to call pmConfigMaskWriteHeader for the PHU somewhere, after it is created! 426 427 if (!pmConceptsAverageChips(outChip, inChips, true)) { 428 psError(PS_ERR_UNKNOWN, false, "Unable to average Chip concepts."); 429 psFree(inChips); 430 goto PPMERGE_MASK_ERROR; 431 } 432 psFree(inChips); 433 } 436 434 if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) { 437 435 goto PPMERGE_MASK_ERROR; -
trunk/ppMerge/src/ppMergeReadChunk.c
r21244 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 1 21:43:05$8 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 20 20 21 21 bool mdok; 22 bool haveMasks = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS"); ///< Do we have masks? 23 bool haveWeights = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.WEIGHTS");///< Do we have weights? 24 int rows = psMetadataLookupS32(NULL, config->arguments, "ROWS"); ///< Number of rows to read per chunk 22 bool haveMasks = psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS"); // Do we have masks? 23 bool haveVariances = psMetadataLookupBool(&mdok, config->arguments, 24 "INPUTS.VARIANCES");// Do we have variances? 25 int rows = psMetadataLookupS32(NULL, config->arguments, "ROWS"); // Number of rows to read per chunk 25 26 26 27 // select an available fileGroup … … 52 53 // override the recorded last scan 53 54 inRO->thisImageScan = fileGroup->firstScan; 54 inRO->this WeightScan = fileGroup->firstScan;55 inRO->thisVarianceScan = fileGroup->firstScan; 55 56 inRO->thisMaskScan = fileGroup->firstScan; 56 57 inRO->forceScan = true; … … 81 82 } 82 83 83 if (have Weights && pmReadoutMoreWeight(inRO, file->fits, 0, rows, config)) {84 if (haveVariances && pmReadoutMoreVariance(inRO, file->fits, 0, rows, config)) { 84 85 keepReading = true; 85 pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.WEIGHT", i); 86 if (!pmReadoutReadChunkWeight(inRO, file->fits, 0, rows, 0, config)) { 87 psError(PS_ERR_IO, false, "Unable to read chunk %d for file PPMERGE.INPUT.WEIGHT %d", 86 pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.VARIANCE", i); 87 if (!pmReadoutReadChunkVariance(inRO, file->fits, 0, rows, 0, config)) { 88 psError(PS_ERR_IO, false, 89 "Unable to read chunk %d for file PPMERGE.INPUT.VARIANCE %d", 88 90 numChunk, i); 89 91 *status = false; -
trunk/ppMerge/src/ppMergeScaleZero.c
r21265 r21365 6 6 * 7 7 * @author IfA 8 * @version $Revision: 1.3 0$ $Name: not supported by cvs2svn $9 * @date $Date: 2009-02-0 2 20:26:26$8 * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2009-02-06 02:44:31 $ 10 10 * Copyright 2009 Institute for Astronomy, University of Hawaii 11 11 */ … … 56 56 for (int i = 0; i < numInputs; i++) { 57 57 pmFPAfileActivate(config->files, false, NULL); 58 psArray *files = ppMergeFileActivateSingle(config, PPMERGE_FILES_INPUT, true, i); // /<Activated files59 pmFPAfile *input = files->data[0]; // /< Representative file; should be the image (not mask or weight)60 pmFPA *fpa = input->fpa; // /<FPA of interest61 view = pmFPAviewAlloc(0); // /<View to component of interest62 int cellNum = 0; // /<Index for cell58 psArray *files = ppMergeFileActivateSingle(config, PPMERGE_FILES_INPUT, true, i); // Activated files 59 pmFPAfile *input = files->data[0]; // Representative file; should be the image (not mask or variance) 60 pmFPA *fpa = input->fpa; // FPA of interest 61 view = pmFPAviewAlloc(0); // View to component of interest 62 int cellNum = 0; // Index for cell 63 63 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) { 64 64 goto ERROR;
Note:
See TracChangeset
for help on using the changeset viewer.
