IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27607


Ignore:
Timestamp:
Apr 5, 2010, 2:36:09 PM (16 years ago)
Author:
rhenders
Message:

Changes to accommodate new PSPS schema.

Location:
trunk/ippToPsps
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/config/currentJobId.txt

    r27345 r27607  
    1 608
     1623

  • trunk/ippToPsps/config/detection/map.xml

    r27345 r27607  
    4343  <map ippName="FLIMIT" ippType="TFLOAT" pspsName="completMag" />
    4444  <map ippName="CERROR" ippType="TFLOAT" pspsName="astroScat" />
    45   <map ippName="NASTRO" ippType="TLONG" pspsName="nAstRef" />
     45  <map ippName="NASTRO" ippType="TLONG" pspsName="numAstroRef" />
    4646  <map ippName="CNAXIS1" ippType="TSHORT" pspsName="nx" />
    4747  <map ippName="CNAXIS2" ippType="TSHORT" pspsName="ny" />
    4848  <map ippName="FWHM_MAJ" ippType="TFLOAT" pspsName="psfWidMajor" />
    4949  <map ippName="FWHM_MIN" ippType="TFLOAT" pspsName="psfWidMinor" />
     50  <map ippName="IQ_FW1" ippType="TFLOAT" pspsName="momentWidMajor" />
     51  <map ippName="IQ_FW2" ippType="TFLOAT" pspsName="momentWidMinor" />
    5052  <map ippName="ANGLE" ippType="TFLOAT" pspsName="psfTheta" />
    5153  <map ippName="APMIFIT" ippType="TFLOAT" pspsName="apResid" />
    5254  <map ippName="DAPMIFIT" ippType="TFLOAT" pspsName="dapResid" />
     55  <map ippName="DETREND.MASK" ippType="TSTRING" pspsName="detrend1" />
     56  <map ippName="DETREND.DARK" ippType="TSTRING" pspsName="detrend2" />
     57  <map ippName="DETREND.FLAT" ippType="TSTRING" pspsName="detrend3" />
     58  <map ippName="DETREND.FRINGE" ippType="TSTRING" pspsName="detrend4" />
    5359  <map ippName="CTYPE1" ippType="TSTRING" pspsName="ctype1" />
    5460  <map ippName="CTYPE2" ippType="TSTRING" pspsName="ctype2" />

  • trunk/ippToPsps/config/detection/tables.xml

    r27345 r27607  
    11<?xml version="1.0" encoding="UTF-8"?>
    22
    3 <tableDescriptions type="DT">
     3<tableDescriptions type="det">
    44  <table name="FrameMeta">
    55    <column name="frameID" type="TLONG" default="0" comment="unique exposure/frame identifier."></column>
     6    <column name="frameName" type="TSTRING" default=" " comment="frame name provided by camera software"></column>
    67    <column name="surveyID" type="TBYTE" default="0" comment="survey flag identifier"></column>
    78    <column name="filterID" type="TBYTE" default="0" comment="filter identifier"></column>
    … …  
    910    <column name="cameraConfigID" type="TSHORT" default="0" comment="camera configuration identifier"></column>
    1011    <column name="telescopeID" type="TSHORT" default="0" comment="telescope identifier"></column>
    11     <column name="analysisVer" type="TSHORT" default="-999" comment="version number of analysis"></column>
    12     <column name="p1Recip" type="TSHORT" default="-999" comment="IPP phase 1 recipe ID"></column>
    13     <column name="p2Recip" type="TSHORT" default="-999" comment="IPP phase 2 recipe ID"></column>
    14     <column name="p3Recip" type="TSHORT" default="-999" comment="IPP phase 3 recipe ID"></column>
    15     <column name="nP2Images" type="TSHORT" default="-999" comment="number of OTA/CCD images in this P2 exposure"></column>
    16     <column name="astroScat" type="TFLOAT" default="-999" comment=" global astrometric scatter (unit = mas)"></column>
     12    <column name="analysisVer" type="TSTRING" default=" " comment="IPP software analysis release"></column>
     13    <column name="p1Recip" type="TSTRING" default=" " comment="IPP phase 1 MD5 Checksum"></column>
     14    <column name="p2Recip" type="TSTRING" default=" " comment="IPP phase 2 MD5 Checksum"></column>
     15    <column name="p3Recip" type="TSTRING" default=" " comment="IPP phase 3 MD5 Checksum"></column>
     16    <column name="nOTA" type="TSHORT" default="-999" comment="number of valid OTA/CCD images in this exposure"></column>
    1717    <column name="photoScat" type="TFLOAT" default="-999" comment=" global photometric scatter (unit = mag)"></column>
    18     <column name="nAstRef" type="TLONG" default="-999" comment="number of astrometric reference sources"></column>
    19     <column name="nPhoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
     18    <column name="numPhotoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
    2019    <column name="expStart" type="TFLOAT" default="-999" comment=" exposure start time in MJD (unit = day)"></column>
    2120    <column name="expTime" type="TFLOAT" default="-999" comment=" exposure time (unit = s)"></column>
    … …  
    6261    <column name="skyScat" type="TFLOAT" default="-999" comment=" scatter in mean sky level (unit = ADU)"></column>
    6362    <column name="nDetect" type="TLONG" default="-999" comment="number of detections on CCD"></column>
    64     <column name="magSat" type="TFLOAT" default="-999" comment="saturation magnitude level"></column>
    65     <column name="completMag" type="TFLOAT" default="-999" comment="95% completion level in mag"></column>
    66     <column name="astroScat" type="TFLOAT" default="-999" comment="astrometric scatter for chip"></column>
     63    <column name="magSat" type="TFLOAT" default="-999" comment=" saturation magnitude level (unit = mag)"></column>
     64    <column name="completMag" type="TFLOAT" default="-999" comment=" 95% completion level in mag (unit = mag)"></column>
     65    <column name="astroScat" type="TFLOAT" default="-999" comment=" astrometric scatter for chip (unit = mag)"></column>
    6766    <column name="photoScat" type="TFLOAT" default="-999" comment="photometric scatter for chip"></column>
    68     <column name="nAstRef" type="TLONG" default="-999" comment="number of astrometric reference sources"></column>
    69     <column name="nPhoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
     67    <column name="numAstroRef" type="TLONG" default="-999" comment="number of astrometric reference sources"></column>
     68    <column name="numPhotoRef" type="TLONG" default="-999" comment="number of photometric reference sources"></column>
    7069    <column name="nx" type="TSHORT" default="-999" comment="chip dimension in x"></column>
    7170    <column name="ny" type="TSHORT" default="-999" comment="chip dimension in y"></column>
    72     <column name="psfFwhm" type="TFLOAT" default="-999" comment="PSF full width at half maximum"></column>
    7371    <column name="psfModelID" type="TLONG" default="-999" comment="PSF model identifier"></column>
    74     <column name="psfWidMajor" type="TFLOAT" default="-999" comment="PSF parameters"></column>
    75     <column name="psfWidMinor" type="TFLOAT" default="-999" comment="PSF parameters"></column>
    76     <column name="psfTheta" type="TFLOAT" default="-999" comment="PSF parameters"></column>
    77     <column name="psfExtra1" type="TFLOAT" default="-999" comment="PSF parameters"></column>
    78     <column name="psfExtra2" type="TFLOAT" default="-999" comment="PSF parameters"></column>
     72    <column name="psfFwhm" type="TFLOAT" default="-999" comment=" model psf full width at half maximum at chip center (unit = arcsec)"></column>
     73    <column name="psfWidMajor" type="TFLOAT" default="-999" comment=" model PSF parameters at chip center (unit = arcsec)"></column>
     74    <column name="psfWidMinor" type="TFLOAT" default="-999" comment=" model PSF parameters at chip center (unit = arcsec)"></column>
     75    <column name="psfTheta" type="TFLOAT" default="-999" comment=" model PSF parameters at chip center (unit = deg)"></column>
     76    <column name="momentFwhm" type="TFLOAT" default="-999" comment=" average PSF full width at half maximum from moments (unit = arcsec)"></column>
     77    <column name="momentWidMajor" type="TFLOAT" default="-999" comment=" average PSF parameters from moments (unit = arcsec)"></column>
     78    <column name="momentWidMinor" type="TFLOAT" default="-999" comment=" average PSF parameters from moments (unit = arcsec)"></column>
     79    <column name="momentTheta" type="TFLOAT" default="-999" comment=" average PSF parametets from moments (unit = deg)"></column>
    7980    <column name="apResid" type="TFLOAT" default="-999" comment="corrected aperture residual"></column>
    8081    <column name="dapResid" type="TFLOAT" default="-999" comment="scatter of aperture corrections"></column>
    8182    <column name="detectorID" type="TSHORT" default="-999" comment="identifier for actual CCD chip"></column>
    82     <column name="qaFlags" type="TLONG" default="-999" comment="Q/A flags"></column>
    83     <column name="detrend1" type="TLONGLONG" default="-999" comment="identifier of detrend image 1"></column>
    84     <column name="detrend2" type="TLONGLONG" default="-999" comment="identifier of detrend image 2"></column>
    85     <column name="detrend3" type="TLONGLONG" default="-999" comment="identifier of detrend image 3"></column>
    86     <column name="detrend4" type="TLONGLONG" default="-999" comment="identifier of detrend image 4"></column>
    87     <column name="detrend5" type="TLONGLONG" default="-999" comment="identifier of detrend image 5"></column>
    88     <column name="detrend6" type="TLONGLONG" default="-999" comment="identifier of detrend image 6"></column>
    89     <column name="detrend7" type="TLONGLONG" default="-999" comment="identifier of detrend image 7"></column>
    90     <column name="detrend8" type="TLONGLONG" default="-999" comment="identifier of detrend image 8"></column>
    91     <column name="photoZero" type="TFLOAT" default="-999" comment="local derived photometric zero point"></column>
     83    <column name="qaFlags" type="TLONG" default="-999" comment="Q/A flags for this OTA"></column>
     84    <column name="detrend1" type="TSTRING" default=" " comment="identifier of detrend image 1"></column>
     85    <column name="detrend2" type="TSTRING" default=" " comment="identifier of detrend image 2"></column>
     86    <column name="detrend3" type="TSTRING" default=" " comment="identifier of detrend image 3"></column>
     87    <column name="detrend4" type="TSTRING" default=" " comment="identifier of detrend image 4"></column>
     88    <column name="detrend5" type="TSTRING" default=" " comment="identifier of detrend image 5"></column>
     89    <column name="detrend6" type="TSTRING" default=" " comment="identifier of detrend image 6"></column>
     90    <column name="detrend7" type="TSTRING" default=" " comment="identifier of detrend image 7"></column>
     91    <column name="detrend8" type="TSTRING" default=" " comment="identifier of detrend image 8"></column>
     92    <column name="photoZero" type="TFLOAT" default="-999" comment=" local derived photometric zero point (unit = mag)"></column>
    9293    <column name="ctype1" type="TSTRING" default=" " comment="name of astrometric projection in RA"></column>
    9394    <column name="ctype2" type="TSTRING" default=" " comment="name of astrometric projection in DEC"></column>
    9495    <column name="crval1" type="TFLOAT" default="-999" comment=" RA corresponding to reference pixel (unit = deg)"></column>
    9596    <column name="crval2" type="TFLOAT" default="-999" comment=" DEC corresponding to reference pixel (unit = deg)"></column>
    96     <column name="crpix1" type="TFLOAT" default="-999" comment="reference pixel value for RA"></column>
    97     <column name="crpix2" type="TFLOAT" default="-999" comment="reference pixel value for DEC"></column>
     97    <column name="crpix1" type="TFLOAT" default="-999" comment=" reference pixel value for RA (unit = pix)"></column>
     98    <column name="crpix2" type="TFLOAT" default="-999" comment=" reference pixel value for DEC (unit = pix)"></column>
    9899    <column name="pc001001" type="TFLOAT" default="-999" comment="elements of rotation/Dcale matrix"></column>
    99100    <column name="pc001002" type="TFLOAT" default="-999" comment="elements of rotation/Dcale matrix"></column>
    … …  
    131132    <column name="xPosErr" type="TFLOAT" default="-999" comment=" estimated error in x (unit = pix)"></column>
    132133    <column name="yPosErr" type="TFLOAT" default="-999" comment=" estimated error in y (unit = pix)"></column>
    133     <column name="instFlux" type="TFLOAT" default="-999" comment="PSF instrumental flux"></column>
    134     <column name="instFluxErr" type="TFLOAT" default="-999" comment="estimated error in flux"></column>
    135     <column name="peakFlux" type="TFLOAT" default="-999" comment="ratio of peak flux to total flux"></column>
    136     <column name="psfWidMajor" type="TFLOAT" default="-999" comment="PSF width in major axis"></column>
    137     <column name="psfWidMinor" type="TFLOAT" default="-999" comment="PSF width in minor axis"></column>
    138     <column name="psfTheta" type="TFLOAT" default="-999" comment="PSF orientation angle"></column>
     134    <column name="instFlux" type="TFLOAT" default="-999" comment=" PSF instrumental flux (unit = adu/s)"></column>
     135    <column name="instFluxErr" type="TFLOAT" default="-999" comment=" estimated error in flux (unit = adu/s)"></column>
     136    <column name="peakADU" type="TFLOAT" default="-999" comment=" peak count in source pixel (unit = adu)"></column>
     137    <column name="psfWidMajor" type="TFLOAT" default="-999" comment=" model PSF width in major axis (unit = arcsec)"></column>
     138    <column name="psfWidMinor" type="TFLOAT" default="-999" comment=" model PSF width in minor axis (unit = arcsec)"></column>
     139    <column name="psfTheta" type="TFLOAT" default="-999" comment=" model PSF orientation angle (unit = deg)"></column>
    139140    <column name="psfLikelihood" type="TFLOAT" default="-999" comment="PSF likelihood"></column>
    140141    <column name="psfCf" type="TFLOAT" default="-999" comment="PSF coverage factor"></column>
    141     <column name="infoFlag" type="TLONG" default="-999" comment="bitmask indicating provenance information"></column>
     142    <column name="momentWidMajor" type="TFLOAT" default="-999" comment=" PSF width in major axis from moments (unit = arcsec)"></column>
     143    <column name="momentWidMinor" type="TFLOAT" default="-999" comment=" PSF width in minot axis from moments (unit = arcsec)"></column>
     144    <column name="momentTheta" type="TFLOAT" default="-999" comment=" PSF orientation angle from moments (unit = deg)"></column>
     145    <column name="crLikelihood" type="TFLOAT" default="-999" comment="Likelihood the source is a cosmic ray"></column>
     146    <column name="extendedLikelihood" type="TFLOAT" default="-999" comment="Likelihood the source is extended"></column>
     147    <column name="infoFlag" type="TLONG" default="-999" comment="flag indicating provenance information"></column>
    142148    <column name="sky" type="TFLOAT" default="-999" comment=" PSF sky level at source (unit = adu)"></column>
    143149    <column name="skyErr" type="TFLOAT" default="-999" comment=" estimated error in sky (unit = adu)"></column>

  • trunk/ippToPsps/config/diff/tables.xml

    r27434 r27607  
    11<?xml version="1.0" encoding="UTF-8"?>
    22
    3 <tableDescriptions type="OB">
     3<tableDescriptions type="diff">
    44  <table name="StackMeta">
    55    <column name="stackMetaID" type="TLONGLONG" default="0" comment="stack identifier"></column>

  • trunk/ippToPsps/src/ippToPspsBatchDetection.c

    r27431 r27607  
    8686    float fwhmMaj;
    8787    float fwhmMin;
     88    float momentMaj;
     89    float momentMin;
    8890    float psfFwhm;
     91    float momentFwhm;
    8992    long pspsImageId = -1;
    9093
    … …  
    148151    long maxObjID = LONG_MIN;
    149152    long minObjID = LONG_MAX;
    150     short nP2Images = 0;
     153    short nOta = 0;
    151154    long i;
    152155    bool duplicate;
    … …  
    178181            status=0; fits_read_key(fitsIn, TFLOAT, "FWHM_MAJ", &fwhmMaj, NULL, &status);
    179182            status=0; fits_read_key(fitsIn, TFLOAT, "FWHM_MIN", &fwhmMin, NULL, &status);
     183            status=0; fits_read_key(fitsIn, TFLOAT, "IQ_FW1", &momentMaj, NULL, &status);
     184            status=0; fits_read_key(fitsIn, TFLOAT, "IQ_FW2", &momentMin, NULL, &status);
    180185            status=0; fits_read_key(fitsIn, TLONG, "IMAGEID", &imageId, NULL, &status);
    181186            status=0; fits_read_key(fitsIn, TDOUBLE, "MJD-OBS", &obsTime, NULL, &status);
    … …  
    198203
    199204            // keep a running count of 'images' we find in order to write total to FrameMeta at the end
    200             nP2Images++;
     205            nOta++;
    201206
    202207
    … …  
    206211            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "ImageMeta", true);
    207212            psfFwhm = (fwhmMaj+fwhmMin)/2;
     213            momentFwhm = (momentMaj+momentMin)/2;
    208214            fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_IMAGEID, 1, 1, 1, &pspsImageId, &status); // TODO enums for thse col numbers
    209215            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
    … …  
    214220            fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOSCAT, 1, 1, 1, &zptObs, &status);
    215221            fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PSFFWHM, 1, 1, 1, &psfFwhm, &status);
     222            fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_MOMENTFWHM, 1, 1, 1, &momentFwhm, &status);
    216223            fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOZERO, 1, 1, 1, &zptObs, &status);
    217224
    … …  
    308315            fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUX, 1, 1, nDet, instFlux, &status);
    309316            fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUXERR, 1, 1, nDet, instFluxErr, &status);
    310             fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKFLUX, 1, 1, nDet, peakFlux, &status);
     317            fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKADU, 1, 1, nDet, peakFlux, &status);
    311318            fits_write_col(this->fitsOut, TSTRING, DETECTION_ASSOCDATE, 1, 1, nDet, assocDate, &status);
    312319            if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
    … …  
    344351        fits_report_error(stderr, status);
    345352    else
    346         fits_write_col(this->fitsOut, TSHORT, 11, 1, 1, 1, &nP2Images, &status);
     353        fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_NOTA, 1, 1, 1, &nOta, &status);
    347354
    348355    if (fits_close_file(fitsIn, &status)) fits_report_error(stderr, status);

  • trunk/ippToPsps/src/ippToPspsConfig.c

    r27433 r27607  
    4141    }
    4242
    43     if (!column) psError(PS_ERR_IO, false, "Could not find column '%s'", name);
     43    if (!column) psError(PS_ERR_IO, false, "Could not find column '%s' in table '%s'", name, table->name);
    4444
    4545    return column;
    … …  
    709709    char** strcol = (char**)calloc(nRows, sizeof(char**));
    710710    for (uint32_t i=0; i<nRows;i++)
    711         strcol[i] = (char*)calloc(20,sizeof(char)); // TODO 20? size issue
     711        strcol[i] = (char*)calloc(50,sizeof(char)); // TODO 20? size issue
    712712
    713713    int8_t int8null = -99;
    … …  
    776776            }
    777777
    778             if (readStatus) psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s'", table->columns[i].ippColNum, table->columns[i].ippName );
    779             if (writeStatus) psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
     778            // TODO need these errors, but strange error handling runs out of memory
     779            //if (readStatus) psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s'", table->columns[i].ippColNum, table->columns[i].ippName );
     780            //if (writeStatus) psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
    780781        }
    781782    }

  • trunk/ippToPsps/src/ippToPspsDetEnums.h

    r27431 r27607  
    55typedef enum {
    66  FRAMEMETA_FRAMEID = 1,
    7   FRAMEMETA_SURVEYID = 2,
    8   FRAMEMETA_FILTERID = 3,
    9   FRAMEMETA_CAMERAID = 4,
    10   FRAMEMETA_CAMERACONFIGID = 5,
    11   FRAMEMETA_TELESCOPEID = 6,
    12   FRAMEMETA_ANALYSISVER = 7,
    13   FRAMEMETA_P1RECIP = 8,
    14   FRAMEMETA_P2RECIP = 9,
    15   FRAMEMETA_P3RECIP = 10,
    16   FRAMEMETA_NP2IMAGES = 11,
    17   FRAMEMETA_ASTROSCAT = 12,
     7  FRAMEMETA_FRAMENAME = 2,
     8  FRAMEMETA_SURVEYID = 3,
     9  FRAMEMETA_FILTERID = 4,
     10  FRAMEMETA_CAMERAID = 5,
     11  FRAMEMETA_CAMERACONFIGID = 6,
     12  FRAMEMETA_TELESCOPEID = 7,
     13  FRAMEMETA_ANALYSISVER = 8,
     14  FRAMEMETA_P1RECIP = 9,
     15  FRAMEMETA_P2RECIP = 10,
     16  FRAMEMETA_P3RECIP = 11,
     17  FRAMEMETA_NOTA = 12,
    1818  FRAMEMETA_PHOTOSCAT = 13,
    19   FRAMEMETA_NASTREF = 14,
    20   FRAMEMETA_NPHOREF = 15,
    21   FRAMEMETA_EXPSTART = 16,
    22   FRAMEMETA_EXPTIME = 17,
    23   FRAMEMETA_AIRMASS = 18,
    24   FRAMEMETA_RABORE = 19,
    25   FRAMEMETA_DECBORE = 20,
    26   FRAMEMETA_CTYPE1 = 21,
    27   FRAMEMETA_CTYPE2 = 22,
    28   FRAMEMETA_CRVAL1 = 23,
    29   FRAMEMETA_CRVAL2 = 24,
    30   FRAMEMETA_CRPIX1 = 25,
    31   FRAMEMETA_CRPIX2 = 26,
    32   FRAMEMETA_PC001001 = 27,
    33   FRAMEMETA_PC001002 = 28,
    34   FRAMEMETA_PC002001 = 29,
    35   FRAMEMETA_PC002002 = 30,
    36   FRAMEMETA_POLYORDER = 31,
    37   FRAMEMETA_PCA1X3Y0 = 32,
    38   FRAMEMETA_PCA1X2Y1 = 33,
    39   FRAMEMETA_PCA1X1Y2 = 34,
    40   FRAMEMETA_PCA1X0Y3 = 35,
    41   FRAMEMETA_PCA1X2Y0 = 36,
    42   FRAMEMETA_PCA1X1Y1 = 37,
    43   FRAMEMETA_PCA1X0Y2 = 38,
    44   FRAMEMETA_PCA2X3Y0 = 39,
    45   FRAMEMETA_PCA2X2Y1 = 40,
    46   FRAMEMETA_PCA2X1Y2 = 41,
    47   FRAMEMETA_PCA2X0Y3 = 42,
    48   FRAMEMETA_PCA2X2Y0 = 43,
    49   FRAMEMETA_PCA2X1Y1 = 44,
    50   FRAMEMETA_PCA2X0Y2 = 45,
    51   FRAMEMETA_CALIBMODNUM = 46,
    52   FRAMEMETA_DATARELEASE = 47,
     19  FRAMEMETA_NUMPHOTOREF = 14,
     20  FRAMEMETA_EXPSTART = 15,
     21  FRAMEMETA_EXPTIME = 16,
     22  FRAMEMETA_AIRMASS = 17,
     23  FRAMEMETA_RABORE = 18,
     24  FRAMEMETA_DECBORE = 19,
     25  FRAMEMETA_CTYPE1 = 20,
     26  FRAMEMETA_CTYPE2 = 21,
     27  FRAMEMETA_CRVAL1 = 22,
     28  FRAMEMETA_CRVAL2 = 23,
     29  FRAMEMETA_CRPIX1 = 24,
     30  FRAMEMETA_CRPIX2 = 25,
     31  FRAMEMETA_PC001001 = 26,
     32  FRAMEMETA_PC001002 = 27,
     33  FRAMEMETA_PC002001 = 28,
     34  FRAMEMETA_PC002002 = 29,
     35  FRAMEMETA_POLYORDER = 30,
     36  FRAMEMETA_PCA1X3Y0 = 31,
     37  FRAMEMETA_PCA1X2Y1 = 32,
     38  FRAMEMETA_PCA1X1Y2 = 33,
     39  FRAMEMETA_PCA1X0Y3 = 34,
     40  FRAMEMETA_PCA1X2Y0 = 35,
     41  FRAMEMETA_PCA1X1Y1 = 36,
     42  FRAMEMETA_PCA1X0Y2 = 37,
     43  FRAMEMETA_PCA2X3Y0 = 38,
     44  FRAMEMETA_PCA2X2Y1 = 39,
     45  FRAMEMETA_PCA2X1Y2 = 40,
     46  FRAMEMETA_PCA2X0Y3 = 41,
     47  FRAMEMETA_PCA2X2Y0 = 42,
     48  FRAMEMETA_PCA2X1Y1 = 43,
     49  FRAMEMETA_PCA2X0Y2 = 44,
     50  FRAMEMETA_CALIBMODNUM = 45,
     51  FRAMEMETA_DATARELEASE = 46,
    5352} FrameMeta;
    5453
    … …  
    6867  IMAGEMETA_ASTROSCAT = 13,
    6968  IMAGEMETA_PHOTOSCAT = 14,
    70   IMAGEMETA_NASTREF = 15,
    71   IMAGEMETA_NPHOREF = 16,
     69  IMAGEMETA_NUMASTROREF = 15,
     70  IMAGEMETA_NUMPHOTOREF = 16,
    7271  IMAGEMETA_NX = 17,
    7372  IMAGEMETA_NY = 18,
    74   IMAGEMETA_PSFFWHM = 19,
    75   IMAGEMETA_PSFMODELID = 20,
     73  IMAGEMETA_PSFMODELID = 19,
     74  IMAGEMETA_PSFFWHM = 20,
    7675  IMAGEMETA_PSFWIDMAJOR = 21,
    7776  IMAGEMETA_PSFWIDMINOR = 22,
    7877  IMAGEMETA_PSFTHETA = 23,
    79   IMAGEMETA_PSFEXTRA1 = 24,
    80   IMAGEMETA_PSFEXTRA2 = 25,
    81   IMAGEMETA_APRESID = 26,
    82   IMAGEMETA_DAPRESID = 27,
    83   IMAGEMETA_DETECTORID = 28,
    84   IMAGEMETA_QAFLAGS = 29,
    85   IMAGEMETA_DETREND1 = 30,
    86   IMAGEMETA_DETREND2 = 31,
    87   IMAGEMETA_DETREND3 = 32,
    88   IMAGEMETA_DETREND4 = 33,
    89   IMAGEMETA_DETREND5 = 34,
    90   IMAGEMETA_DETREND6 = 35,
    91   IMAGEMETA_DETREND7 = 36,
    92   IMAGEMETA_DETREND8 = 37,
    93   IMAGEMETA_PHOTOZERO = 38,
    94   IMAGEMETA_CTYPE1 = 39,
    95   IMAGEMETA_CTYPE2 = 40,
    96   IMAGEMETA_CRVAL1 = 41,
    97   IMAGEMETA_CRVAL2 = 42,
    98   IMAGEMETA_CRPIX1 = 43,
    99   IMAGEMETA_CRPIX2 = 44,
    100   IMAGEMETA_PC001001 = 45,
    101   IMAGEMETA_PC001002 = 46,
    102   IMAGEMETA_PC002001 = 47,
    103   IMAGEMETA_PC002002 = 48,
    104   IMAGEMETA_POLYORDER = 49,
    105   IMAGEMETA_PCA1X3Y0 = 50,
    106   IMAGEMETA_PCA1X2Y1 = 51,
    107   IMAGEMETA_PCA1X1Y2 = 52,
    108   IMAGEMETA_PCA1X0Y3 = 53,
    109   IMAGEMETA_PCA1X2Y0 = 54,
    110   IMAGEMETA_PCA1X1Y1 = 55,
    111   IMAGEMETA_PCA1X0Y2 = 56,
    112   IMAGEMETA_PCA2X3Y0 = 57,
    113   IMAGEMETA_PCA2X2Y1 = 58,
    114   IMAGEMETA_PCA2X1Y2 = 59,
    115   IMAGEMETA_PCA2X0Y3 = 60,
    116   IMAGEMETA_PCA2X2Y0 = 61,
    117   IMAGEMETA_PCA2X1Y1 = 62,
    118   IMAGEMETA_PCA2X0Y2 = 63,
    119   IMAGEMETA_CALIBMODNUM = 64,
    120   IMAGEMETA_DATARELEASE = 65,
     78  IMAGEMETA_MOMENTFWHM = 24,
     79  IMAGEMETA_MOMENTWIDMAJOR = 25,
     80  IMAGEMETA_MOMENTWIDMINOR = 26,
     81  IMAGEMETA_MOMENTTHETA = 27,
     82  IMAGEMETA_APRESID = 28,
     83  IMAGEMETA_DAPRESID = 29,
     84  IMAGEMETA_DETECTORID = 30,
     85  IMAGEMETA_QAFLAGS = 31,
     86  IMAGEMETA_DETREND1 = 32,
     87  IMAGEMETA_DETREND2 = 33,
     88  IMAGEMETA_DETREND3 = 34,
     89  IMAGEMETA_DETREND4 = 35,
     90  IMAGEMETA_DETREND5 = 36,
     91  IMAGEMETA_DETREND6 = 37,
     92  IMAGEMETA_DETREND7 = 38,
     93  IMAGEMETA_DETREND8 = 39,
     94  IMAGEMETA_PHOTOZERO = 40,
     95  IMAGEMETA_CTYPE1 = 41,
     96  IMAGEMETA_CTYPE2 = 42,
     97  IMAGEMETA_CRVAL1 = 43,
     98  IMAGEMETA_CRVAL2 = 44,
     99  IMAGEMETA_CRPIX1 = 45,
     100  IMAGEMETA_CRPIX2 = 46,
     101  IMAGEMETA_PC001001 = 47,
     102  IMAGEMETA_PC001002 = 48,
     103  IMAGEMETA_PC002001 = 49,
     104  IMAGEMETA_PC002002 = 50,
     105  IMAGEMETA_POLYORDER = 51,
     106  IMAGEMETA_PCA1X3Y0 = 52,
     107  IMAGEMETA_PCA1X2Y1 = 53,
     108  IMAGEMETA_PCA1X1Y2 = 54,
     109  IMAGEMETA_PCA1X0Y3 = 55,
     110  IMAGEMETA_PCA1X2Y0 = 56,
     111  IMAGEMETA_PCA1X1Y1 = 57,
     112  IMAGEMETA_PCA1X0Y2 = 58,
     113  IMAGEMETA_PCA2X3Y0 = 59,
     114  IMAGEMETA_PCA2X2Y1 = 60,
     115  IMAGEMETA_PCA2X1Y2 = 61,
     116  IMAGEMETA_PCA2X0Y3 = 62,
     117  IMAGEMETA_PCA2X2Y0 = 63,
     118  IMAGEMETA_PCA2X1Y1 = 64,
     119  IMAGEMETA_PCA2X0Y2 = 65,
     120  IMAGEMETA_CALIBMODNUM = 66,
     121  IMAGEMETA_DATARELEASE = 67,
    121122} ImageMeta;
    122123
    … …  
    136137  DETECTION_INSTFLUX = 13,
    137138  DETECTION_INSTFLUXERR = 14,
    138   DETECTION_PEAKFLUX = 15,
     139  DETECTION_PEAKADU = 15,
    139140  DETECTION_PSFWIDMAJOR = 16,
    140141  DETECTION_PSFWIDMINOR = 17,
    … …  
    142143  DETECTION_PSFLIKELIHOOD = 19,
    143144  DETECTION_PSFCF = 20,
    144   DETECTION_INFOFLAG = 21,
    145   DETECTION_SKY = 22,
    146   DETECTION_SKYERR = 23,
    147   DETECTION_SGSEP = 24,
    148   DETECTION_ACTIVEFLAG = 25,
    149   DETECTION_ASSOCDATE = 26,
    150   DETECTION_HISTORYMODNUM = 27,
    151   DETECTION_DATARELEASE = 28,
     145  DETECTION_MOMENTWIDMAJOR = 21,
     146  DETECTION_MOMENTWIDMINOR = 22,
     147  DETECTION_MOMENTTHETA = 23,
     148  DETECTION_CRLIKELIHOOD = 24,
     149  DETECTION_EXTENDEDLIKELIHOOD = 25,
     150  DETECTION_INFOFLAG = 26,
     151  DETECTION_SKY = 27,
     152  DETECTION_SKYERR = 28,
     153  DETECTION_SGSEP = 29,
     154  DETECTION_ACTIVEFLAG = 30,
     155  DETECTION_ASSOCDATE = 31,
     156  DETECTION_HISTORYMODNUM = 32,
     157  DETECTION_DATARELEASE = 33,
    152158} Detection;
    153159

  • trunk/ippToPsps/src/ippToPspsVersionDefinitions.h

    r27345 r27607  
    22#define IPPTOPSPS_VERSION_DEFINITIONS_H
    33
    4 #define IPPTOPSPS_VERSION "exported" // SVN version
    5 #define IPPTOPSPS_BRANCH  ""  // SVN branch
    6 #define IPPTOPSPS_SOURCE  ""  // SVN source
     4#define IPPTOPSPS_VERSION "27549M" // SVN version
     5#define IPPTOPSPS_BRANCH  "trunk/ippToPsps"  // SVN branch
     6#define IPPTOPSPS_SOURCE  "60eb6cdc-a59c-4636-a4e0-dba66a9721fd"  // SVN source
    77
    88#endif
Note: See TracChangeset for help on using the changeset viewer.