IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28556 for trunk


Ignore:
Timestamp:
Jun 29, 2010, 4:22:09 PM (16 years ago)
Author:
rhenders
Message:

Removed dependance on column numbers: now looks-up using column names

Location:
trunk/ippToPsps
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r28550 r28556  
    9191
    9292 <table name="Detection">
    93   <map ippColumn="2" ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
    94   <map ippColumn="3" ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
    95   <map ippColumn="4" ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
    96   <map ippColumn="5" ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
    97   <map ippColumn="22" ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
    98   <map ippColumn="23" ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
    99   <map ippColumn="24" ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
    100   <map ippColumn="25" ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
    101   <map ippColumn="17" ippName="SKY" ippType="TFLOAT" pspsName="sky" />
    102   <map ippColumn="18" ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
    103   <map ippColumn="21" ippName="EXT_NSIGMA" ippType="TFLOAT" pspsName="sgSep" />
    104   <map ippColumn="31" ippName="FLAGS" ippType="TLONG" pspsName="infoFlag" />
     93  <map ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
     94  <map ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
     95  <map ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
     96  <map ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
     97  <map ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
     98  <map ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
     99  <map ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
     100  <map ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
     101  <map ippName="SKY" ippType="TFLOAT" pspsName="sky" />
     102  <map ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
     103  <map ippName="EXT_NSIGMA" ippType="TFLOAT" pspsName="sgSep" />
    105104 </table>
    106105

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

    r27345 r28556  
    2222
    2323 <table name="StackHighSigDelta">
    24   <map ippColumn="2" ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
    25   <map ippColumn="3" ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
    26   <map ippColumn="4" ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
    27   <map ippColumn="5" ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
    28   <map ippColumn="8" ippName="PSF_INST_MAG" ippType="TFLOAT" pspsName="instMag" />
    29   <map ippColumn="9" ippName="PSF_INST_MAG_SIG" ippType="TFLOAT" pspsName="instMagErr" />
    30   <map ippColumn="12" ippName="PEAK_FLUX_AS_MAG" ippType="TFLOAT" pspsName="peakFluxMag" />
    31   <map ippColumn="22" ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
    32   <map ippColumn="23" ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
    33   <map ippColumn="24" ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
    34   <map ippColumn="25" ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
    35   <map ippColumn="15" ippName="RA_PSF" ippType="TDOUBLE" pspsName="ra" />
    36   <map ippColumn="16" ippName="DEC_PSF" ippType="TDOUBLE" pspsName="dec" />
    37   <map ippColumn="17" ippName="SKY" ippType="TFLOAT" pspsName="sky" />
    38   <map ippColumn="18" ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
    39   <map ippColumn="21" ippName="EXT_NSIGMA" ippType="TFLOAT" pspsName="sgSep" />
     24  <map ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
     25  <map ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
     26  <map ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
     27  <map ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
     28  <map ippName="PSF_INST_MAG" ippType="TFLOAT" pspsName="instMag" />
     29  <map ippName="PSF_INST_MAG_SIG" ippType="TFLOAT" pspsName="instMagErr" />
     30  <map ippName="PEAK_FLUX_AS_MAG" ippType="TFLOAT" pspsName="peakFluxMag" />
     31  <map ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
     32  <map ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
     33  <map ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
     34  <map ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
     35  <map ippName="RA_PSF" ippType="TDOUBLE" pspsName="ra" />
     36  <map ippName="DEC_PSF" ippType="TDOUBLE" pspsName="dec" />
     37  <map ippName="SKY" ippType="TFLOAT" pspsName="sky" />
     38  <map ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
     39  <map ippName="EXT_NSIGMA" ippType="TFLOAT" pspsName="sgSep" />
    4040 </table>
    4141

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

    r27882 r28556  
    8383
    8484 <table name="Detection">
    85   <map ippColumn="2" ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
    86   <map ippColumn="3" ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
    87   <map ippColumn="4" ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
    88   <map ippColumn="5" ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
    89   <map ippColumn="15" ippName="RA_PSF" ippType="TFLOAT" pspsName="ippRa" />
    90   <map ippColumn="16" ippName="DEC_PSF" ippType="TFLOAT" pspsName="ippDec" />
    91   <map ippColumn="22" ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
    92   <map ippColumn="23" ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
    93   <map ippColumn="24" ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
    94   <map ippColumn="25" ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
    95   <map ippColumn="17" ippName="SKY" ippType="TFLOAT" pspsName="sky" />
    96   <map ippColumn="18" ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
     85  <map ippName="X_PSF" ippType="TFLOAT" pspsName="xPos" />
     86  <map ippName="Y_PSF" ippType="TFLOAT" pspsName="yPos" />
     87  <map ippName="X_PSF_SIG" ippType="TFLOAT" pspsName="xPosErr" />
     88  <map ippName="Y_PSF_SIG" ippType="TFLOAT" pspsName="yPosErr" />
     89  <map ippName="RA_PSF" ippType="TFLOAT" pspsName="ippRa" />
     90  <map ippName="DEC_PSF" ippType="TFLOAT" pspsName="ippDec" />
     91  <map ippName="PSF_MAJOR" ippType="TFLOAT" pspsName="psfWidMajor" />
     92  <map ippName="PSF_MINOR" ippType="TFLOAT" pspsName="psfWidMinor" />
     93  <map ippName="PSF_THETA" ippType="TFLOAT" pspsName="psfTheta" />
     94  <map ippName="PSF_QF" ippType="TFLOAT" pspsName="psfCf" />
     95  <map ippName="SKY" ippType="TFLOAT" pspsName="sky" />
     96  <map ippName="SKY_SIGMA" ippType="TFLOAT" pspsName="skyErr" />
    9797 </table>
    9898

  • trunk/ippToPsps/src/ippToPspsConfig.c

    r28249 r28556  
    616616                column->ippType = ippToPsps_GetDataType(buffer);
    617617
    618                 // IPP column
    619                 ippToPspsConfig_getAttribute(node, "ippColumn", buffer);
    620                 column->ippColNum = atoi(buffer);
    621 
    622618                column->usingDefault = false;
    623619
    624                 //psLogMsg("ippToPsps", PS_LOG_INFO, "...mapping PSPS:'%s' to '%s'", column->pspsName, column->ippName );
     620                //psLogMsg("ippToPsps", PS_LOG_INFO, "...mapping PSPS:'%s' to '%s' '%d'", column->pspsName, column->ippName, column->ippColNum );
    625621            }
    626622        }
    … …  
    734730    int readStatus = 0;
    735731    int writeStatus = 0;
    736 
     732   
     733    // first loop round all columns and get IPP col numbers for provided column names
     734    if(!fromHeader) {
     735
     736        for (uint32_t i=0; i<table->numOfColumns; i++) {
     737
     738            if (strlen(table->columns[i].ippName) < 1) continue;
     739            readStatus = 0;
     740            fits_get_colnum(fitsIn, CASESEN, table->columns[i].ippName, &table->columns[i].ippColNum, &readStatus);
     741            if (readStatus) psError(PS_ERR_IO, false, "%d Unable to read col num for '%s' '%s' %d", i, table->columns[i].pspsName, table->columns[i].ippName, table->columns[i].ippColNum);
     742        }
     743    }
    737744
    738745    int col;
Note: See TracChangeset for help on using the changeset viewer.