IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 12, 2007, 12:22:15 PM (19 years ago)
Author:
Paul Price
Message:

Adding fix to bug 853: when CELL.BIASSEC or CELL.TRIMSEC are specified by value in the CELLS part of the camera format, then they need to be updated by the binning. Added pmConceptsUpdate, which is run after concepts are read, and seaches for concepts to update (e.g., dependent on other concepts, which may not be available at read time --- just like CELL.TRIMSEC and CELL.XBIN/CELL.YBIN). To use this, changed the functions that parse/format standard concepts to receive the source of the concept. CELL.TRIMSEC and CELL.BIASSEC are updated for the binning if CELL.TRIMSEC.UPDATE or CELL.BIASSEC.UPDATE are set. Tested this quickly, and it seems to work.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/concepts/pmConceptsStandard.h

    r11253 r11749  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:15 $
     6 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-02-12 22:22:15 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1717#include <pslib.h>
    1818#include "pmFPA.h"
     19#include "pmConcepts.h"
    1920
    2021/// Parse the FPA.FILTER concept to apply a lookup table
    2122psMetadataItem *p_pmConceptParse_FPA_FILTER(const psMetadataItem *concept, ///< Concept to parse
    2223        const psMetadataItem *pattern, ///< Pattern to use in parsing
     24                                            pmConceptSource source, ///< Source for concept
    2325        const psMetadata *cameraFormat, ///< Camera format definition
    2426        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    2931/// Format the FPA.FILTER concept to (reverse-)apply a lookup table
    3032psMetadataItem *p_pmConceptFormat_FPA_FILTER(const psMetadataItem *concept, ///< Concept to format
     33                                            pmConceptSource source, ///< Source for concept
    3134        const psMetadata *cameraFormat, ///< Camera format definition
    3235        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    3841psMetadataItem *p_pmConceptParse_FPA_Coords(const psMetadataItem *concept, ///< Concept to parse
    3942        const psMetadataItem *pattern, ///< Pattern to use in parsing
     43                                            pmConceptSource source, ///< Source for concept
    4044        const psMetadata *cameraFormat, ///< Camera format definition
    4145        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    4650/// Format the coordinates concepts: FPA.RA and FPA.DEC
    4751psMetadataItem *p_pmConceptFormat_FPA_Coords(const psMetadataItem *concept, ///< Concept to format
     52                                            pmConceptSource source, ///< Source for concept
    4853        const psMetadata *cameraFormat, ///< Camera format definition
    4954        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    5560psMetadataItem *p_pmConceptParse_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to parse
    5661        const psMetadataItem *pattern, ///< Pattern to use in parsing
     62                                            pmConceptSource source, ///< Source for concept
    5763        const psMetadata *cameraFormat, ///< Camera format definition
    5864        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    6470psMetadataItem *p_pmConceptParse_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to parse
    6571        const psMetadataItem *pattern, ///< Pattern to use in parsing
     72                                            pmConceptSource source, ///< Source for concept
    6673        const psMetadata *cameraFormat, ///< Camera format definition
    6774        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    7380psMetadataItem *p_pmConceptParse_CELL_Binning(const psMetadataItem *concept, ///< Concept to parse
    7481        const psMetadataItem *pattern, ///< Pattern to use in parsing
     82                                            pmConceptSource source, ///< Source for concept
    7583        const psMetadata *cameraFormat, ///< Camera format definition
    7684        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    8290psMetadataItem *p_pmConceptParse_TIMESYS(const psMetadataItem *concept, ///< Concept to parse
    8391        const psMetadataItem *pattern, ///< Pattern to use in parsing
     92                                            pmConceptSource source, ///< Source for concept
    8493        const psMetadata *cameraFormat, ///< Camera format definition
    8594        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    91100psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept, ///< Concept to parse
    92101                                      const psMetadataItem *pattern, ///< Pattern to use in parsing
     102                                            pmConceptSource source, ///< Source for concept
    93103                                      const psMetadata *cameraFormat, ///< Camera format definition
    94104                                      const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    100110psMetadataItem *p_pmConceptParse_Positions(const psMetadataItem *concept, ///< Concept to parse
    101111        const psMetadataItem *pattern, ///< Pattern to use in parsing
    102         const psMetadata *cameraFormat, ///< Camera format definition
     112                                            pmConceptSource source, ///< Source for concept
     113       const psMetadata *cameraFormat, ///< Camera format definition
    103114        const pmFPA *fpa, ///< FPA for concept, or NULL
    104115        const pmChip *chip, ///< Chip for concept, or NULL
    … …  
    108119/// Format the CELL.TRIMSEC concept
    109120psMetadataItem *p_pmConceptFormat_CELL_TRIMSEC(const psMetadataItem *concept, ///< Concept to format
     121                                            pmConceptSource source, ///< Source for concept
    110122        const psMetadata *cameraFormat, ///< Camera format definition
    111123        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    116128/// Format the CELL.BIASSEC concept
    117129psMetadataItem *p_pmConceptFormat_CELL_BIASSEC(const psMetadataItem *concept, ///< Concept to format
     130                                            pmConceptSource source, ///< Source for concept
    118131        const psMetadata *cameraFormat, ///< Camera format definition
    119132        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    124137/// Format the CELL.XBIN concept
    125138psMetadataItem *p_pmConceptFormat_CELL_XBIN(const psMetadataItem *concept, ///< Concept to format
     139                                            pmConceptSource source, ///< Source for concept
    126140        const psMetadata *cameraFormat, ///< Camera format definition
    127141        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    132146/// Format the CELL.YBIN concept
    133147psMetadataItem *p_pmConceptFormat_CELL_YBIN(const psMetadataItem *concept, ///< Concept to format
     148                                            pmConceptSource source, ///< Source for concept
    134149        const psMetadata *cameraFormat, ///< Camera format definition
    135150        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    140155/// Format the time system concepts: FPA.TIMESYS and CELL.TIMESYS
    141156psMetadataItem *p_pmConceptFormat_TIMESYS(const psMetadataItem *concept, ///< Concept to format
     157                                            pmConceptSource source, ///< Source for concept
    142158        const psMetadata *cameraFormat, ///< Camera format definition
    143159        const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    148164/// Format the time concepts: FPA.TIME and CELL.TIME
    149165psMetadataItem *p_pmConceptFormat_TIME(const psMetadataItem *concept, ///< Concept to format
     166                                            pmConceptSource source, ///< Source for concept
    150167                                       const psMetadata *cameraFormat, ///< Camera format definition
    151168                                       const pmFPA *fpa, ///< FPA for concept, or NULL
    … …  
    156173/// Format a cell position concept, e.g., CELL.X0
    157174psMetadataItem *p_pmConceptFormat_Positions(const psMetadataItem *concept, ///< Concept to format
     175                                            pmConceptSource source, ///< Source for concept
    158176        const psMetadata *cameraFormat, ///< Camera format definition
    159177        const pmFPA *fpa, ///< FPA for concept, or NULL
Note: See TracChangeset for help on using the changeset viewer.