IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 21448


Ignore:
Timestamp:
Feb 11, 2009, 6:42:37 PM (17 years ago)
Author:
eugene
Message:

adding the new PS1_V1 output format

Location:
branches/eam_branch_20090208/psModules/src/objects
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20090208/psModules/src/objects/Makefile.am

    r20946 r21448  
    3636        pmSourceIO_PS1_DEV_1.c \
    3737        pmSourceIO_PS1_CAL_0.c \
     38        pmSourceIO_CMF_PS1_V1.c \
    3839        pmSourcePlots.c \
    3940        pmSourcePlotPSFModel.c \

  • branches/eam_branch_20090208/psModules/src/objects/pmSource.h

    r21408 r21448  
    33 * @author EAM, IfA; GLG, MHPCC
    44 *
    5  * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    6  * @date $Date: 2009-02-06 02:31:25 $
     5 * @version $Revision: 1.28.2.1 $ $Name: not supported by cvs2svn $
     6 * @date $Date: 2009-02-12 04:42:37 $
    77 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    88 */
    … …  
    3535} pmSourceType;
    3636
     37// XXX extend these to 32bits or 64bits?
    3738typedef enum {
    3839    PM_SOURCE_MODE_DEFAULT    = 0x0000, ///<

  • branches/eam_branch_20090208/psModules/src/objects/pmSourceIO.c

    r20937 r21448  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2008-12-08 02:51:14 $
     5 *  @version $Revision: 1.69.12.1 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2009-02-12 04:42:05 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    488488            }
    489489            if (!strcmp (exttype, "PS1_DEV_1")) {
    490                 status = pmSourcesWrite_PS1_DEV_1 (file->fits, sources, file->header, outhead, dataname, xsrcname);
     490                status = pmSourcesWrite_PS1_DEV_1 (file->fits, sources, file->header, outhead, dataname);
    491491            }
    492492            if (!strcmp (exttype, "PS1_CAL_0")) {
    493                 status = pmSourcesWrite_PS1_CAL_0 (file->fits, readout, sources, file->header, outhead, dataname, xsrcname);
     493                status = pmSourcesWrite_PS1_CAL_0 (file->fits, readout, sources, file->header, outhead, dataname);
     494            }
     495            if (!strcmp (exttype, "CMF_PS1_V1")) {
     496                status = pmSourcesWrite_CMF_PS1_V1 (file->fits, readout, sources, file->header, outhead, dataname);
    494497            }
    495498            if (xsrcname) {
    … …  
    500503                  status = pmSourcesWrite_PS1_CAL_0_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
    501504              }
     505              if (!strcmp (exttype, "CMF_PS1_V1")) {
     506                  status = pmSourcesWrite_CMF_PS1_V1_XSRC (file->fits, sources, xsrcname, recipe);
     507              }
    502508            }
    503509            if (xfitname) {
    … …  
    507513              if (!strcmp (exttype, "PS1_CAL_0")) {
    508514                  status = pmSourcesWrite_PS1_CAL_0_XFIT (file->fits, readout, sources, file->header, xfitname);
     515              }
     516              if (!strcmp (exttype, "CMF_PS1_V1")) {
     517                  status = pmSourcesWrite_CMF_PS1_V1_XFIT (file->fits, sources, xfitname);
    509518              }
    510519            }
    … …  
    929938                sources = pmSourcesRead_PS1_DEV_1 (file->fits, hdu->header);
    930939            }
    931             if (!strcmp (exttype, "PS1_CAL_)")) {
     940            if (!strcmp (exttype, "PS1_CAL_0")) {
    932941                sources = pmSourcesRead_PS1_CAL_0 (file->fits, hdu->header);
    933942            }

  • branches/eam_branch_20090208/psModules/src/objects/pmSourceIO.h

    r21408 r21448  
    44 * @author EAM, IfA; GLG, MHPCC
    55 *
    6  * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2008-11-14 02:11:45 $
     6 * @version $Revision: 1.19.14.1 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2009-02-12 04:42:37 $
    88 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    99 *
    … …  
    2626bool pmSourcesWrite_SMPDATA (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
    2727bool pmSourcesWrite_PS1_DEV_0 (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
    28 bool pmSourcesWrite_PS1_DEV_1 (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, char *xsrcname);
     28
     29bool pmSourcesWrite_PS1_DEV_1 (psFits *fits, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
    2930bool pmSourcesWrite_PS1_DEV_1_XSRC (psFits *fits, psArray *sources, char *extname, psMetadata *recipe);
    3031bool pmSourcesWrite_PS1_DEV_1_XFIT (psFits *fits, psArray *sources, char *extname);
    3132
    32 bool pmSourcesWrite_PS1_CAL_0 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, char *xsrcname);
     33bool pmSourcesWrite_PS1_CAL_0 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
    3334bool pmSourcesWrite_PS1_CAL_0_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
    3435bool pmSourcesWrite_PS1_CAL_0_XFIT (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname);
     36
     37bool pmSourcesWrite_CMF_PS1_V1 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
     38bool pmSourcesWrite_CMF_PS1_V1_XSRC (psFits *fits, psArray *sources, char *extname, psMetadata *recipe);
     39bool pmSourcesWrite_CMF_PS1_V1_XFIT (psFits *fits, psArray *sources, char *extname);
    3540
    3641bool pmSource_CMF_WritePHU (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    … …  
    4247psArray *pmSourcesRead_PS1_DEV_1 (psFits *fits, psMetadata *header);
    4348psArray *pmSourcesRead_PS1_CAL_0 (psFits *fits, psMetadata *header);
     49psArray *pmSourcesRead_CMF_PS1_V1 (psFits *fits, psMetadata *header);
    4450
    4551bool pmSourcesWritePSFs (psArray *sources, char *filename);
    … …  
    6773bool pmReadoutCheckDataStatusForSources (const pmReadout *readout);
    6874
     75bool pmSourceLocalAstrometry (psSphere *ptSky, float *posAngle, float *pltScale, pmChip *chip, float xPos, float yPos);
     76
    6977/// @}
    7078# endif /* PM_SOURCE_IO_H */

  • branches/eam_branch_20090208/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

    r20937 r21448  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2008-12-08 02:51:14 $
     5 *  @version $Revision: 1.2.12.1 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2009-02-12 04:42:37 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4949// XXX how do I generate the source tables which I need to send to PSPS?
    5050
    51 bool pmSourcesWrite_PS1_CAL_0 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader,
    52                                psMetadata *tableHeader, char *extname, char *xsrcname)
     51bool pmSourcesWrite_PS1_CAL_0 (psFits *fits, pmReadout *readout, psArray *sources,
     52                               psMetadata *imageHeader, psMetadata *tableHeader, char *extname)
    5353{
    5454    PS_ASSERT_PTR_NON_NULL(fits, false);

  • branches/eam_branch_20090208/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

    r20937 r21448  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2008-12-08 02:51:14 $
     5 *  @version $Revision: 1.14.12.1 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2009-02-12 04:42:05 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4949// XXX how do I generate the source tables which I need to send to PSPS?
    5050
    51 bool pmSourcesWrite_PS1_DEV_1 (psFits *fits, psArray *sources, psMetadata *imageHeader,
    52                                psMetadata *tableHeader, char *extname, char *xsrcname)
     51bool pmSourcesWrite_PS1_DEV_1 (psFits *fits, psArray *sources,
     52                               psMetadata *imageHeader, psMetadata *tableHeader, char *extname)
    5353{
    5454    PS_ASSERT_PTR_NON_NULL(fits, false);
Note: See TracChangeset for help on using the changeset viewer.