Changeset 35861 for branches/eam_branches/ps2-tc3-20130727/ppImage/src
- Timestamp:
- Jul 27, 2013, 1:56:38 PM (13 years ago)
- Location:
- branches/eam_branches/ps2-tc3-20130727/ppImage/src
- Files:
-
- 12 edited
-
ppImageAddNoise.c (modified) (2 diffs)
-
ppImageAuxiliaryMask.c (modified) (2 diffs)
-
ppImageCheckCTE.c (modified) (2 diffs)
-
ppImageCheckNoise.c (modified) (2 diffs)
-
ppImageDetrendFringe.c (modified) (2 diffs)
-
ppImageDetrendPattern.c (modified) (2 diffs)
-
ppImageDetrendReadout.c (modified) (18 diffs)
-
ppImageMosaic.c (modified) (2 diffs)
-
ppImageParityFlip.c (modified) (2 diffs)
-
ppImagePixelStats.c (modified) (2 diffs)
-
ppImageRebinReadout.c (modified) (2 diffs)
-
ppImageSetMaskBits.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageAddNoise.c
r31155 r35861 18 18 return true; 19 19 } 20 21 // psTimerStart("add.noise"); 20 22 21 23 // grizy variances to add to turn MD exposure -> 3pi, calculated from the DRM … … 96 98 psFree(stats); 97 99 100 // psLogMsg ("ppImage", 5, "add noise: %f sec\n", psTimerMark ("add.noise")); 101 98 102 return true; 99 103 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageAuxiliaryMask.c
r35722 r35861 63 63 return true; 64 64 } 65 66 // psTimerStart("aux.mask"); 65 67 66 68 bool status; … … 215 217 psFree(auxMask); 216 218 219 // psLogMsg ("ppImage", 5, "auxiliary mask: %f sec\n", psTimerMark ("aux.mask")); 220 217 221 return true; 218 222 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageCheckCTE.c
r24117 r35861 17 17 return true; 18 18 } 19 20 // psTimerStart("check.cte"); 19 21 20 22 // add recipe options supplied on command line … … 106 108 psFree (statsDefaults); 107 109 110 // psLogMsg ("ppImage", 5, "check CTE: %f sec\n", psTimerMark ("check.cte")); 111 108 112 return true; 109 113 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageCheckNoise.c
r33667 r35861 17 17 return true; 18 18 } 19 20 // psTimerStart("check.noise"); 19 21 20 22 // add recipe options supplied on command line … … 124 126 psFree (statsDefaults); 125 127 128 // psLogMsg ("ppImage", 5, "check noise: %f sec\n", psTimerMark ("check.noise")); 129 126 130 return true; 127 131 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageDetrendFringe.c
r26895 r35861 327 327 pmCell *cell = NULL; 328 328 329 // psTimerStart("apply.fringe"); 330 329 331 assert (options->doFringe); // do not call if not needed 330 332 assert (inputView->chip != -1); … … 386 388 } 387 389 390 // psLogMsg ("ppImage", 5, "apply fringe: %f sec\n", psTimerMark ("apply.fringe")); 391 388 392 psFree (view); 389 393 return true; -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageDetrendPattern.c
r33243 r35861 35 35 // chip. 36 36 37 // psTimerStart("apply.pattern"); 37 38 if (options->doPatternRow) { 39 38 40 bool status; 39 41 pmHDU *hdu = pmHDUFromChip(chip); … … 193 195 194 196 pattern_done: 197 198 // psLogMsg ("ppImage", 5, "apply pattern: %f sec\n", psTimerMark ("apply.pattern")); 199 195 200 return(true); 196 201 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageDetrendReadout.c
r35685 r35861 7 7 bool ppImageDetrendReadout(pmConfig *config, ppImageOptions *options, pmFPAview *view) 8 8 { 9 // psTimerStart("detrend.readout"); 10 9 11 // construct a view for the detrend images (which have only one readout) 10 12 pmFPAview *detview = pmFPAviewAlloc(0); … … 35 37 } 36 38 } 39 // psLogMsg ("ppImage", 6, "check gain: %f sec\n", psTimerMark ("detrend.readout")); 37 40 38 41 // Check to see if we're in a chip that contains video … … 56 59 } 57 60 done_video_check: 61 // psLogMsg ("ppImage", 6, "check video: %f sec\n", psTimerMark ("detrend.readout")); 58 62 59 63 // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine. … … 62 66 psImageMaskType lowMask = options->doMaskLow ? options->lowMask : 0; 63 67 pmReadoutGenerateMask(input, satMask, lowMask); 68 // psLogMsg ("ppImage", 6, "generate mask: %f sec\n", psTimerMark ("detrend.readout")); 64 69 } 65 70 // apply the externally supplied mask to the input->mask pixels … … 73 78 } 74 79 pmMaskBadPixels(input, mask, options->maskValue); 80 // psLogMsg ("ppImage", 6, "apply mask: %f sec\n", psTimerMark ("detrend.readout")); 75 81 } 76 82 … … 79 85 // extern bool ppImageBurntoolApply(pmConfig *, ppImageOptions *, pmFPAview *, pmReadout *); 80 86 ppImageBurntoolApply(config, options, view, input); 87 // psLogMsg ("ppImage", 6, "apply burntool: %f sec\n", psTimerMark ("detrend.readout")); 81 88 } 82 89 … … 89 96 ppImageBurntoolMask(config,options,view,input); 90 97 } 98 // psLogMsg ("ppImage", 6, "apply burntool mask: %f sec\n", psTimerMark ("detrend.readout")); 91 99 } 92 100 … … 98 106 return false; 99 107 } 108 // psLogMsg ("ppImage", 6, "subtract overscan: %f sec\n", psTimerMark ("detrend.readout")); 100 109 } 101 110 … … 107 116 return(false); 108 117 } 118 // psLogMsg ("ppImage", 6, "nonlinear correction: %f sec\n", psTimerMark ("detrend.readout")); 109 119 } 110 120 … … 144 154 return false; 145 155 } 156 // psLogMsg ("ppImage", 6, "apply bias: %f sec\n", psTimerMark ("detrend.readout")); 146 157 } 147 158 … … 210 221 pmReadoutGenerateVariance(input, noiseImage, true); 211 222 psFree (noiseImage); 223 // psLogMsg ("ppImage", 6, "generate variance: %f sec\n", psTimerMark ("detrend.readout")); 212 224 } 213 225 … … 218 230 return false; 219 231 } 232 // psLogMsg ("ppImage", 6, "apply dark: %f sec\n", psTimerMark ("detrend.readout")); 220 233 } 221 234 … … 227 240 return false; 228 241 } 242 // psLogMsg ("ppImage", 6, "mask remnance: %f sec\n", psTimerMark ("detrend.readout")); 229 243 } 230 244 … … 236 250 return false; 237 251 } 252 // psLogMsg ("ppImage", 6, "shutter correction: %f sec\n", psTimerMark ("detrend.readout")); 238 253 } 239 254 … … 245 260 return false; 246 261 } 262 // psLogMsg ("ppImage", 6, "apply flat: %f sec\n", psTimerMark ("detrend.readout")); 247 263 } 248 264 … … 268 284 269 285 psBinaryOp(input->image, input->image, "*", psScalarAlloc(norm, PS_TYPE_F32)); 286 // psLogMsg ("ppImage", 6, "renormalize: %f sec\n", psTimerMark ("detrend.readout")); 270 287 } 271 288 … … 316 333 317 334 psFree (classID); 335 336 // psLogMsg ("ppImage", 6, "renormalize by class: %f sec\n", psTimerMark ("detrend.readout")); 318 337 } 319 338 # endif … … 325 344 return false; 326 345 } 346 // psLogMsg ("ppImage", 6, "measure fringe: %f sec\n", psTimerMark ("detrend.readout")); 327 347 } 328 348 329 349 ppImageMemoryDump("detrend"); 330 350 351 // psLogMsg ("ppImage", 5, "detrend readout: %f sec\n", psTimerMark ("detrend.readout")); 331 352 psFree(detview); 332 353 return true; -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageMosaic.c
r28292 r35861 9 9 { 10 10 bool status; // Status of MD lookup 11 12 // psTimerStart("mosaic.chip"); 11 13 12 14 pmFPAfile *in = psMetadataLookupPtr(&status, config->files, inFile); // Input file … … 63 65 } 64 66 67 // psLogMsg ("ppImage", 5, "mosaic chip: %f sec\n", psTimerMark ("mosaic.chip")); 68 65 69 return status; 66 70 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageParityFlip.c
r25875 r35861 19 19 20 20 if (!options->applyParity) return true; 21 22 // psTimerStart("parity.flip"); 21 23 22 24 // find the currently selected readout … … 152 154 } 153 155 } 156 // psLogMsg ("ppImage", 5, "parity flip: %f sec\n", psTimerMark ("parity.flip")); 154 157 155 158 FIX_CONCEPT(cell->concepts, "CELL.XPARITY", S32, xParityTarget); -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImagePixelStats.c
r19928 r35861 10 10 { 11 11 bool mdok; // Status of MD lookup 12 13 // psTimerStart("pixel.stats"); 12 14 13 15 // loop over the cells/readouts for this chip … … 81 83 } 82 84 85 // psLogMsg ("ppImage", 5, "measure pixel stats: %f sec\n", psTimerMark ("pixel.stats")); 86 83 87 psFree (view); 84 88 return true; -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageRebinReadout.c
r20439 r35861 12 12 pmFPAfile *outFile = psMetadataLookupPtr(NULL, config->files, outName); 13 13 if (outFile == NULL) return false; 14 15 // psTimerStart("rebin.chip"); 14 16 15 17 // XXX double check that chip != -1? … … 40 42 } 41 43 44 // psLogMsg ("ppImage", 5, "rebin chip for %s: %f sec\n", outName, psTimerMark ("rebin.chip")); 45 42 46 return true; 43 47 } -
branches/eam_branches/ps2-tc3-20130727/ppImage/src/ppImageSetMaskBits.c
r25829 r35861 11 11 return false; 12 12 } 13 14 // psTimerStart("set.mask.bits"); 13 15 14 16 // at this point we know we have valid values for required entries SAT, BAD, FLAT, BLANK: … … 57 59 options->markValue); 58 60 61 // psLogMsg ("ppImage", 5, "set mask bits: %f sec\n", psTimerMark ("set.mask.bits")); 62 59 63 return true; 60 64 }
Note:
See TracChangeset
for help on using the changeset viewer.
