Changeset 23411
- Timestamp:
- Mar 18, 2009, 4:35:35 PM (17 years ago)
- Location:
- trunk/ppImage
- Files:
-
- 6 edited
- 2 copied
-
. (modified) (1 prop)
-
src/Makefile.am (modified) (1 diff)
-
src/ppImage.h (modified) (2 diffs)
-
src/ppImageCheckCTE.c (copied) (copied from branches/eam_branches/eam_branch_20090312/ppImage/src/ppImageCheckCTE.c )
-
src/ppImageCheckCTE.v1.c (copied) (copied from branches/eam_branches/eam_branch_20090312/ppImage/src/ppImageCheckCTE.v1.c )
-
src/ppImageLoop.c (modified) (1 diff)
-
src/ppImageOptions.c (modified) (2 diffs)
-
src/ppImageParseCamera.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ppImage
- Property svn:mergeinfo changed
/branches/eam_branches/eam_branch_20090312/ppImage (added) merged: 23312,23316,23320,23406,23408
- Property svn:mergeinfo changed
-
trunk/ppImage/src/Makefile.am
r23229 r23411 38 38 ppImageDefineFile.c \ 39 39 ppImageSetMaskBits.c \ 40 ppImageCheckCTE.c \ 40 41 ppImageFileCheck.c \ 41 42 ppImageVersion.c \ -
trunk/ppImage/src/ppImage.h
r23229 r23411 40 40 bool doAstromMosaic; // full-mosaic Astrometry 41 41 bool doStats; // call ppStats on the image 42 bool checkCTE; // measure pixel-based variance 42 43 43 44 // output files requested … … 133 134 bool ppImageFringeFree(pmConfig *config, pmFPAview *view); 134 135 136 bool ppImageCheckCTE(pmConfig *config, ppImageOptions *options, pmFPAview *view); 137 135 138 // Record which detrend file was used for the detrending 136 139 bool ppImageDetrendRecord( -
trunk/ppImage/src/ppImageLoop.c
r23259 r23411 94 94 if (!ppImageDetrendFree (config, view)) { 95 95 ESCAPE("Unable to free detrend images"); 96 } 97 98 // optionally measure CTE by examining the variance in a box 99 if (!ppImageCheckCTE (config, options, view)) { 100 ESCAPE("Unable to measure CTE"); 96 101 } 97 102 } -
trunk/ppImage/src/ppImageOptions.c
r23229 r23411 33 33 options->doAstromMosaic = false; // Astrometry (full-mosaic) 34 34 options->doStats = false; // Measure and save image statistics 35 options->checkCTE = false; // Measure pixel-based variance 35 36 36 37 // output files requested … … 258 259 options->doBG = psMetadataLookupBool(NULL, recipe, "BACKGROUND"); 259 260 261 options->checkCTE = psMetadataLookupBool(NULL, recipe, "CHECK.CTE"); 262 260 263 // even if not requested explicitly, if any of these are set, build an internal mask and variance: 261 264 if (options->doBias || options->doOverscan || options->doDark || options->doShutter || options->doFlat || -
trunk/ppImage/src/ppImageParseCamera.c
r23268 r23411 154 154 } 155 155 156 if (options->checkCTE && false) { 157 int DX = psMetadataLookupS32 (&status, recipe, "CTE.XBIN"); 158 int DY = psMetadataLookupS32 (&status, recipe, "CTE.YBIN"); 159 pmFPAfile *outCTE = pmFPAfileDefineFromFile (config, input, DX, DY, "PPIMAGE.CTEMAP"); 160 if (!outCTE) { 161 psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PPIMAGE.CTEMAP"); 162 return false; 163 } 164 outCTE->save = true; 165 } 166 156 167 // the following files are output targets 157 168 pmFPAfile *outImage = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT");
Note:
See TracChangeset
for help on using the changeset viewer.
