IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 29319


Ignore:
Timestamp:
Oct 4, 2010, 4:30:04 PM (16 years ago)
Author:
rhenders
Message:

more fields populated

Location:
trunk/ippToPsps
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r29303 r29319  
    44  <table name="StackMeta" ippfitsextension="Primary">
    55    <!--  <map pspsName="stackMetaID" ippType="TLONGLONG" ippName="" comment="stack identifier"/> -->
    6     <!--  <map pspsName="skycellID" ippType="TLONG" ippName="" comment="skycell region identifier"/> -->
    7     <!--  <map pspsName="surveyID" ippType="TBYTE" ippName="" comment="survey flag identifier"/> -->
     6    <!--  *** DONE IN CODE <map pspsName="skycellID" ippType="TLONG" ippName="" comment="skycell region identifier"/> -->
     7    <!--  *** DONE IN CODE <map pspsName="surveyID" ippType="TBYTE" ippName="" comment="survey flag identifier"/> -->
    88    <!--  <map pspsName="photoCalID" ippType="TLONG" ippName="" comment="photometry code numerical id"/> -->
    9     <!--  DONE IN CODE<map pspsName="filterID" ippType="TBYTE" ippName="" comment="filter identifier"/> -->
     9    <!--  *** DONE IN CODE <map pspsName="filterID" ippType="TBYTE" ippName="" comment="filter identifier"/> -->
    1010    <!--  <map pspsName="stackTypeID" ippType="TBYTE" ippName="" comment="stack type identifier"/> -->
    1111    <!--  <map pspsName="refImageID" ippType="TLONGLONG" ippName="" comment="identifier of image used as reference for analysis"/> -->
    … …  
    6262    <!--  <map pspsName="stackDetectID" ippType="TLONGLONG" ippName="" comment="ODM detection identifier"/> -->
    6363    <!--  <map pspsName="ippObjID" ippType="TLONGLONG" ippName="" comment="IPP object identifier"/> -->
    64     <!--  <map pspsName="ippDetectID" ippType="TLONGLONG" ippName="" comment="detection ID generated by IPP"/> -->
     64          <map pspsName="ippDetectID" ippType="TLONGLONG" ippName="IPP_IDET" comment="detection ID generated by IPP"/>
    6565    <!--  <map pspsName="filterID" ippType="TBYTE" ippName="" comment="filter identifier"/> -->
    6666    <!--  <map pspsName="stackTypeID" ippType="TBYTE" ippName="" comment="stack type identifier"/> -->
    67     <!--  <map pspsName="surveyID" ippType="TBYTE" ippName="" comment="survey flag identifier"/> -->
     67    <!--   *** DONE IN CODE <map pspsName="surveyID" ippType="TBYTE" ippName="" comment="survey flag identifier"/> -->
    6868    <!--  <map pspsName="primaryF" ippType="TBYTE" ippName="" comment="identifies best stack detection for Stacks overlapping the same region of the sky."/> -->
    6969    <!--  <map pspsName="stackMetaID" ippType="TLONGLONG" ippName="" comment="stack identifier"/> -->
    70     <!--  <map pspsName="skyCellID" ippType="TLONG" ippName="" comment="skycell identifier"/> -->
     70    <!--  *** DONE IN CODE <map pspsName="skyCellID" ippType="TLONG" ippName="" comment="skycell identifier"/> -->
    7171    <!--  <map pspsName="projectionCellID" ippType="TLONG" ippName="" comment="projection cell identifier"/> -->
    7272    <!--  <map pspsName="stackVer" ippType="TSHORT" ippName="" comment="version number of this stack"/> -->
    … …  
    109109    <!--  <map pspsName="stackDetectID" ippType="TLONGLONG" ippName="" comment="ODM detection identifier"/> -->
    110110    <!--  <map pspsName="ippObjID" ippType="TLONGLONG" ippName="" comment="IPP object identifier"/> -->
    111     <!--  <map pspsName="ippDetectID" ippType="TLONGLONG" ippName="" comment="detection ID generated by IPP"/> -->
     111          <map pspsName="ippDetectID" ippType="TLONGLONG" ippName="IPP_IDET" comment="detection ID generated by IPP"/>
    112112    <!--  <map pspsName="filterID" ippType="TBYTE" ippName="" comment="filter identifier"/> -->
    113113    <!--  <map pspsName="stackTypeID" ippType="TBYTE" ippName="" comment="stack type identifier"/> -->
    114     <!--  <map pspsName="surveyID" ippType="TBYTE" ippName="" comment="survey flag identifier"/> -->
     114    <!--   *** DONE IN CODE <map pspsName="surveyID" ippType="TBYTE" ippName="" comment="survey flag identifier"/> -->
    115115    <!--  <map pspsName="primaryF" ippType="TBYTE" ippName="" comment="identifies best stack detection for Stacks overlapping the same region of the sky."/> -->
    116116    <!--  <map pspsName="stackMetaID" ippType="TLONGLONG" ippName="" comment="stack identifier"/> -->
    … …  
    126126    <!--  <map pspsName="isophotPAErr" ippType="TFLOAT" ippName="" comment="estimated error in isophotal position angle"/> -->
    127127    <!--  <map pspsName="isophotPAGrad" ippType="TFLOAT" ippName="" comment="isophotal position angle gradient"/> -->
    128     <!--  <map pspsName="petRadius" ippType="TFLOAT" ippName="" comment="Petrosian radius"/> -->
    129     <!--  <map pspsName="petRadiusErr" ippType="TFLOAT" ippName="" comment="estimated error inPetrosian radius"/> -->
    130     <!--  <map pspsName="petMag" ippType="TFLOAT" ippName="" comment="Petrosian magntiude"/> -->
    131     <!--  <map pspsName="petMagErr" ippType="TFLOAT" ippName="" comment="estimated error in petMag"/> -->
    132     <!--  <map pspsName="petR50" ippType="TFLOAT" ippName="" comment="Petrosian radius at 50% light"/> -->
    133     <!--  <map pspsName="petR50Err" ippType="TFLOAT" ippName="" comment="estimated error inPetrosian radius at 50% light"/> -->
    134     <!--  <map pspsName="petR90" ippType="TFLOAT" ippName="" comment="Petrosian radius at 90% light"/> -->
    135     <!--  <map pspsName="petR90Err" ippType="TFLOAT" ippName="" comment="estimated error in Petrosian radius at 90% light"/> -->
     128          <map pspsName="petRadius" ippType="TFLOAT" ippName="PETRO_RADIUS" comment="Petrosian radius"/>
     129          <map pspsName="petRadiusErr" ippType="TFLOAT" ippName="PETRO_RADIUS_ERR" comment="estimated error inPetrosian radius"/>
     130          <map pspsName="petMag" ippType="TFLOAT" ippName="PETRO_MAG" comment="Petrosian magntiude"/>
     131          <map pspsName="petMagErr" ippType="TFLOAT" ippName="PETRO_MAG_ERR" comment="estimated error in petMag"/>
     132          <map pspsName="petR50" ippType="TFLOAT" ippName="PETRO_RADIUS_50" comment="Petrosian radius at 50% light"/>
     133          <map pspsName="petR50Err" ippType="TFLOAT" ippName="PETRO_RADIUS_50" comment="estimated error inPetrosian radius at 50% light"/>
     134          <map pspsName="petR90" ippType="TFLOAT" ippName="PETRO_RADIUS_90" comment="Petrosian radius at 90% light"/>
     135          <map pspsName="petR90Err" ippType="TFLOAT" ippName="PETRO_RADIUS_90_ERR" comment="estimated error in Petrosian radius at 90% light"/>
    136136    <!--  <map pspsName="petCf" ippType="TFLOAT" ippName="" comment="Petrosian fit coverage factor"/> -->
    137137    <!--  <map pspsName="flxR1" ippType="TFLOAT" ippName="" comment="Flux inside r = 1"/> -->

  • trunk/ippToPsps/src/ippToPspsBatchStack.c

    r29298 r29319  
    1616 */
    1717int ippToPsps_batchStack(IppToPsps *this) {
    18 
    1918
    2019    int status = 0;
    … …  
    3938
    4039
     40    char** assocDate = (char**)calloc(MAXDETECT, sizeof(char**));
     41    for (uint32_t i=0; i<MAXDETECT;i++) assocDate[i] = (char*)calloc(20,sizeof(char));
     42    int8_t filterIDs[MAXDETECT], surveyIDs[MAXDETECT];
     43
     44
    4145    // write StackMeta
    4246    ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "StackMeta", true);
     47    fits_write_col(this->fitsOut, TLONG, STACKMETA_SKYCELLID, 1, 1, 1, &this->id, &status);
    4348
    4449    int8_t filterID = -1;
    4550    if (!ippToPspsConfig_getFilterId(this->config, filterType, &filterID)) {return PS_EXIT_DATA_ERROR;}
    4651    fits_write_col(this->fitsOut, TBYTE, STACKMETA_FILTERID, 1, 1, 1, &filterID, &status);
     52
     53    fits_write_col(this->fitsOut, TBYTE, STACKMETA_SURVEYID, 1, 1, 1, &this->surveyID, &status);
     54
    4755
    4856    // psf detections
    … …  
    5462    }
    5563    else {
    56    
     64   
     65        // some stuff is the same for all detections so we can populate here
     66        for (long s = 0; s<MAXDETECT; s++) {
     67
     68            filterIDs[s] = filterID;
     69            surveyIDs[s] = this->surveyID;
     70            strcpy(assocDate[s], this->todaysDate);
     71        }
     72
     73
    5774        long nDet = 0;
    5875        if (fits_get_num_rows(fitsIn, &nDet, &status)) {
    … …  
    96113
    97114            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, nDet, "StackDetection", false);
     115            fits_write_col(this->fitsOut, TLONG, STACKDETECTION_SKYCELLID, 1, 1, 1, &this->id, &status);
     116            fits_write_col(this->fitsOut, TBYTE, STACKDETECTION_FILTERID, 1, 1, nDet, filterIDs, &status);
     117            fits_write_col(this->fitsOut, TBYTE, STACKDETECTION_SURVEYID, 1, 1, nDet, surveyIDs, &status);
     118            fits_write_col(this->fitsOut, TSTRING, STACKDETECTION_ASSOCDATE, 1, 1, nDet, assocDate, &status);
     119
    98120            if (numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numInvalidFlux, &status);
    99121
    … …  
    129151        }
    130152
    131 
    132 
    133153        ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, nDet, "StackApFlx", false);
     154        fits_write_col(this->fitsOut, TBYTE, STACKAPFLX_FILTERID, 1, 1, nDet, filterIDs, &status);
     155        fits_write_col(this->fitsOut, TBYTE, STACKAPFLX_SURVEYID, 1, 1, nDet, surveyIDs, &status);
    134156    }
    135157
Note: See TracChangeset for help on using the changeset viewer.