Changeset 12832 for trunk/psModules/src/camera
- Timestamp:
- Apr 13, 2007, 5:22:48 PM (19 years ago)
- Location:
- trunk/psModules/src/camera
- Files:
-
- 6 edited
-
pmFPA_JPEG.c (modified) (6 diffs)
-
pmFPA_JPEG.h (modified) (2 diffs)
-
pmFPAfileFitsIO.c (modified) (3 diffs)
-
pmFPAfileFitsIO.h (modified) (5 diffs)
-
pmFPAfileIO.c (modified) (3 diffs)
-
pmFPAfileIO.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psModules/src/camera/pmFPA_JPEG.c
r12696 r12832 5 5 * @author EAM, IfA 6 6 * 7 * @version $Revision: 1. 19$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 3-30 21:12:56$7 * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-04-14 03:22:47 $ 9 9 * 10 10 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 35 35 36 36 37 bool pmFPAviewWriteJPEG(const pmFPAview *view, pmFPAfile *file, pmConfig *config)37 bool pmFPAviewWriteJPEG(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 38 38 { 39 39 PS_ASSERT_PTR_NON_NULL(view, false); … … 77 77 78 78 // read in all chip-level JPEG files for this FPA 79 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)79 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 80 80 { 81 81 PS_ASSERT_PTR_NON_NULL(fpa, false); … … 92 92 93 93 // read in all cell-level JPEG files for this chip 94 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)94 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 95 95 { 96 96 PS_ASSERT_PTR_NON_NULL(chip, false); … … 107 107 108 108 // read in all readout-level JPEG files for this cell 109 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)109 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 110 110 { 111 111 PS_ASSERT_PTR_NON_NULL(cell, false); … … 125 125 // just because the values are in a poor range. it is more convenient to know you are getting 126 126 // a jpeg which is weird than to fail to get the file at all. 127 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)127 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 128 128 { 129 129 bool status; -
trunk/psModules/src/camera/pmFPA_JPEG.h
r11253 r12832 4 4 * @author EAM, IfA 5 5 * 6 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $7 * @date $Date: 2007-0 1-24 02:54:14$6 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 7 * @date $Date: 2007-04-14 03:22:47 $ 8 8 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii 9 9 */ … … 15 15 /// @{ 16 16 17 bool pmFPAviewWriteJPEG (const pmFPAview *view, pmFPAfile *file, pmConfig *config);18 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);19 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);20 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);21 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);17 bool pmFPAviewWriteJPEG (const pmFPAview *view, pmFPAfile *file, const pmConfig *config); 18 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); 19 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); 20 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); 21 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); 22 22 23 23 /// @} -
trunk/psModules/src/camera/pmFPAfileFitsIO.c
r12696 r12832 322 322 } 323 323 324 bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, pmConfig *config)324 bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 325 325 { 326 326 PS_ASSERT_PTR_NON_NULL(view, false); … … 329 329 } 330 330 331 bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, pmConfig *config)331 bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 332 332 { 333 333 PS_ASSERT_PTR_NON_NULL(view, false); … … 336 336 } 337 337 338 bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, pmConfig *config)338 bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) 339 339 { 340 340 PS_ASSERT_PTR_NON_NULL(view, false); -
trunk/psModules/src/camera/pmFPAfileFitsIO.h
r11793 r12832 5 5 * @author PAP, IfA 6 6 * 7 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 2-15 00:34:00$7 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-04-14 03:22:47 $ 9 9 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii 10 10 */ … … 32 32 /// Read an image header into the current view 33 33 bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view, ///< View specifying level of interest 34 pmFPAfile *file ///< FPA file into which to read34 pmFPAfile *file ///< FPA file into which to read 35 35 ); 36 36 … … 38 38 bool pmFPAviewWriteFitsImage(const pmFPAview *view, ///< View specifying level of interest 39 39 pmFPAfile *file, ///< FPA file to write 40 pmConfig *config ///< Configuration40 const pmConfig *config ///< Configuration 41 41 ); 42 42 … … 44 44 bool pmFPAviewWriteFitsMask(const pmFPAview *view, ///< View specifying level of interest 45 45 pmFPAfile *file, ///< FPA file to write 46 pmConfig *config ///< Configuration46 const pmConfig *config ///< Configuration 47 47 ); 48 48 … … 50 50 bool pmFPAviewWriteFitsWeight(const pmFPAview *view, ///< View specifying level of interest 51 51 pmFPAfile *file, ///< FPA file to write 52 pmConfig *config ///< Configuration52 const pmConfig *config ///< Configuration 53 53 ); 54 54 -
trunk/psModules/src/camera/pmFPAfileIO.c
r12810 r12832 498 498 case PM_FPA_FILE_CMF: 499 499 psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name); 500 return true;500 return true; 501 501 case PM_FPA_FILE_PSF: 502 502 case PM_FPA_FILE_JPEG: 503 503 case PM_FPA_FILE_KAPA: 504 504 psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name); 505 return true;505 return true; 506 506 default: 507 507 psError(PS_ERR_IO, true, "warning: type mismatch; saw type %d", file->type); … … 719 719 psMetadata *phu = psFitsReadHeader (NULL, file->fits); 720 720 if (!file->format) { 721 // XXX do we need to read the recipe here? these files are supplemental, and probably 722 // do not need to re-load the recipes721 // XXX do we need to read the recipe here? these files are supplemental, and probably 722 // do not need to re-load the recipes 723 723 file->format = pmConfigCameraFormatFromHeader (config, phu, false); 724 724 if (!file->format) { … … 748 748 749 749 // XXX this function is only called from pmFPAfileWrite 750 bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, pmConfig *config)750 bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config) 751 751 { 752 752 PS_ASSERT_PTR_NON_NULL(file, false); -
trunk/psModules/src/camera/pmFPAfileIO.h
r12585 r12832 4 4 * @author EAM, IfA 5 5 * 6 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $7 * @date $Date: 2007-0 3-24 17:53:55$6 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 7 * @date $Date: 2007-04-14 03:22:47 $ 8 8 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii 9 9 */ … … 39 39 bool pmFPAfileIOChecks (pmConfig *config, const pmFPAview *view, pmFPAfilePlace place); 40 40 41 bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, pmConfig *config);41 bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config); 42 42 bool pmFPAfileReadPHU (pmFPAfile *file, const pmFPAview *view, pmConfig *config); 43 43
Note:
See TracChangeset
for help on using the changeset viewer.
