IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 20, 2005, 1:06:24 PM (21 years ago)
Author:
gusciora
Message:

....

Location:
trunk/psModules/src/astrom
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/pmAstrometry.c

    r5170 r5435  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-09-28 20:43:52 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-10-20 23:06:24 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7171        }
    7272        psFree(fpa->chips);
    73         psFree(fpa->header);
    74         psFree(fpa->db);
     73        psFree(fpa->private);
     74        psFree(fpa->phu);
    7575    }
    7676}
    … …  
    9393        psFree(chip->cells);
    9494        psFree(chip->parent);
    95         psFree(chip->extname);
    96         psFree(chip->pixels);
    97         psFree(chip->header);
     95        psFree(chip->private);
    9896    }
    9997}
    … …  
    106104        psFree(cell->toSky);
    107105        psFree(cell->concepts);
     106        psFree(cell->camera);
    108107        psFree(cell->analysis);
    109108        //
    … …  
    117116        psFree(cell->readouts);
    118117        psFree(cell->parent);
    119         psFree(cell->extname);
    120         psFree(cell->pixels);
    121         psFree(cell->header);
     118        psFree(cell->private);
    122119    }
    123120}
    … …  
    128125        psFree(readout->image);
    129126        psFree(readout->mask);
     127        psFree(readout->weight);
     128        psFree(readout->bias);
    130129        psFree(readout->analysis);
    131         psFree(readout->concepts);
    132130        psFree(readout->parent);
    133131    }
    … …  
    145143    tmpReadout->image = NULL;
    146144    tmpReadout->mask = NULL;
     145    tmpReadout->weight = NULL;
     146    tmpReadout->bias = NULL;
    147147    tmpReadout->analysis = psMetadataAlloc();
    148     tmpReadout->concepts = psMetadataAlloc();
    149148    tmpReadout->parent = cell;
    150149    if (cell != NULL) {
    … …  
    155154}
    156155
    157 pmCell *pmCellAlloc(pmChip *chip)
     156pmCell *pmCellAlloc(
     157    pmChip *chip,
     158    psMetadata *cameradata,
     159    psString name
     160)
    158161{
    159162    pmCell *tmpCell = (pmCell *) psAlloc(sizeof(pmCell));
    … …  
    164167    tmpCell->toFPA = NULL;
    165168    tmpCell->toSky = NULL;
    166     tmpCell->analysis = psMetadataAlloc();
    167169    tmpCell->concepts = psMetadataAlloc();
     170    psBool rc = psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name);
     171    if (rc == false) {
     172        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CELL.NAME to metadata.\n");
     173    }
     174    tmpCell->camera = cameradata;
     175    psMemIncrRefCounter((psMetadata *) cameradata);
     176    tmpCell->analysis = NULL;
    168177    tmpCell->readouts = psArrayAlloc(0);
    169178    tmpCell->parent = chip;
    … …  
    172181    }
    173182    tmpCell->valid = false;
    174     tmpCell->extname = NULL;
    175     tmpCell->pixels = NULL;
    176     tmpCell->header = NULL;
     183    tmpCell->private = NULL;
    177184
    178185    psMemSetDeallocator(tmpCell, (psFreeFunc) cellFree);
    … …  
    180187}
    181188
    182 pmChip *pmChipAlloc(pmFPA *fpa)
     189pmChip *pmChipAlloc(
     190    pmFPA *fpa,
     191    psString name
     192)
    183193{
    184194    pmChip *tmpChip = (pmChip *) psAlloc(sizeof(pmChip));
    … …  
    189199    tmpChip->fromFPA = NULL;
    190200    tmpChip->concepts = psMetadataAlloc();
    191     tmpChip->analysis = psMetadataAlloc();
     201    psBool rc = psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name);
     202    if (rc == false) {
     203        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CHIP.NAME to metadata.\n");
     204    }
     205    tmpChip->analysis = NULL;
    192206    tmpChip->cells = psArrayAlloc(0);
    193207    tmpChip->parent = fpa;
    … …  
    196210    }
    197211    tmpChip->valid = false;
    198     tmpChip->extname = NULL;
    199     tmpChip->pixels = NULL;
    200     tmpChip->header = NULL;
     212    tmpChip->private = NULL;
    201213
    202214    psMemSetDeallocator(tmpChip, (psFreeFunc) chipFree);
    … …  
    204216}
    205217
    206 pmFPA *pmFPAAlloc(
    207     const psMetadata *camera,
    208     psDB *db)
     218pmFPA *pmFPAAlloc(const psMetadata *camera)
    209219{
    210220    pmFPA *tmpFPA = (pmFPA *) psAlloc(sizeof(pmFPA));
    … …  
    214224    tmpFPA->projection = NULL;
    215225    tmpFPA->concepts = psMetadataAlloc();
    216     tmpFPA->analysis = psMetadataAlloc();
     226    tmpFPA->analysis = NULL;
    217227    tmpFPA->camera = camera;
    218228    psMemIncrRefCounter((psPtr) camera);
    219229    tmpFPA->chips = psArrayAlloc(0);
    220     tmpFPA->header = NULL;
    221     tmpFPA->db = db;
    222     psMemIncrRefCounter((psPtr) db);
     230    tmpFPA->private = NULL;
     231    tmpFPA->phu = NULL;
    223232
    224233    psMemSetDeallocator(tmpFPA, (psFreeFunc) FPAFree);
    … …  
    739748psMetadataItem *pmReadoutGetConcept(pmReadout *readout, const char *concept)
    740749{
    741     return(psMetadataLookup(readout->concepts, concept));
     750    //    return(psMetadataLookup(readout->concepts, concept));
     751    return(NULL);
    742752}
    743753

  • trunk/psModules/src/astrom/pmAstrometry.h

    r5170 r5435  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-09-28 20:43:52 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-10-20 23:06:24 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424/// @addtogroup AstroImage
    2525/// @{
     26
     27// XXXX: This is incorrect.  Must determine what p_pmHDU is.
     28typedef struct
     29{
     30    int what;
     31}
     32p_pmHDU;
    2633
    2734/** Focal plane data structure
    … …  
    5259    const psMetadata *camera;           ///< Camera configuration
    5360    psArray *chips;                     ///< The chips
    54     // FITS data
    55     psMetadata *header;                 ///< The FITS header, if it corresponds to this level
    56     psDB *db;                           ///< Database handle
     61    p_pmHDU *private;                   ///< FITS data
     62    psMetadata *phu;                    ///< Primary Header
    5763}
    5864pmFPA;
    … …  
    8692    pmFPA *parent;                      ///< Parent FPA
    8793    bool valid;                         ///< Do we bother about reading and working with this chip?
    88     // FITS data
    89     const char *extname;                ///< Extension name, if it corresponds to this level
    90     psArray *pixels;                    ///< The pixel data, if it corresponds to this level
    91     psMetadata *header;                 ///< The FITS header, if it corresponds to this level
     94    p_pmHDU *private;                   ///< FITS data
    9295}
    9396pmChip;
    … …  
    113116    // Information
    114117    psMetadata *concepts;               ///< Cache for PS concepts
     118    psMetadata *camera;                 ///< Camera Info
    115119    psMetadata *analysis;               ///< Cell-level analysis metadata
    116120    psArray *readouts;                  ///< The readouts (referred to by number)
    117121    pmChip *parent;                     ///< Parent chip
    118122    bool valid;                         ///< Do we bother about reading and working with this cell?
    119     // FITS data
    120     const char *extname;                ///< Extension name, if it corresponds to this level
    121     psArray *pixels;                    ///< The pixel data, if it corresponds to this level
    122     psMetadata *header;                 ///< The FITS header, if it corresponds to this level
     123    p_pmHDU *private;                   ///< FITS data
    123124}
    124125pmCell;
    … …  
    143144    // Information
    144145    psImage *image;                     ///< Imaging area of readout
    145     // XXX: The following mask was removed from the pmReadout struct in recent SDRS
    146     // versions.  However, I'm keeping it here since al ot of modules still require
    147     // it.
    148146    psImage *mask;                      ///< Mask of input image
     147    psImage *weight;                    ///< Weight of input image
     148    psList *bias;                       ///< List of bias section (sub-)images
    149149    psMetadata *analysis;               ///< Readout-level analysis metadata
    150     psMetadata *concepts;               ///< Cache for PS Concepts
    151150    pmCell *parent;                     ///< Parent cell
    152151}
    … …  
    178177 */
    179178pmCell *pmCellAlloc(
    180     pmChip *chip                        ///< Parent chip
     179    pmChip *chip,                        ///< Parent chip
     180    psMetadata *cameradata,
     181    psString name
    181182);
    182183
    … …  
    191192 *  @return pmChip*    newly allocated pmChip
    192193 */
    193 pmChip *pmChipAlloc(pmFPA *fpa);
     194pmChip *pmChipAlloc(
     195    pmFPA *fpa,
     196    psString name
     197
     198);
    194199
    195200/** Allocates a pmFPA
    … …  
    202207 */
    203208pmFPA *pmFPAAlloc(
    204     const psMetadata *camera,           ///< Camera configuration
    205     psDB *db                            ///< Database handle
     209    const psMetadata *camera            ///< Camera configuration
    206210);
    207211
Note: See TracChangeset for help on using the changeset viewer.