IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31025


Ignore:
Timestamp:
Mar 23, 2011, 11:42:31 AM (15 years ago)
Author:
rhenders
Message:

Config class now renamed to FitsGenerator

Location:
trunk/ippToPsps/src
Files:
2 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/src/Batch.c

    r31015 r31025  
    8888
    8989    // destroy objects
    90     this->config->destroy(this->config);
     90    this->fitsGenerator->destroy(this->fitsGenerator);
    9191    this->initData->destroy(this->initData);
    9292
    … …  
    228228    }
    229229
    230     // create a Config object
     230    // create a FitsGenerator object
    231231    strcat(configsBaseDir, configsDir);
    232     this->config = new_Config(configsBaseDir);
    233     if (this->config == NULL) {
    234 
    235         this->exitCode = PS_EXIT_CONFIG_ERROR;
    236         return false;
    237     }
     232    this->fitsGenerator = new_FitsGenerator(configsBaseDir);
    238233
    239234    // create full FITS out path
    … …  
    318313    this->inputFiles = NULL;
    319314    this->fitsOut = NULL;
    320     this->config = NULL;
     315    this->fitsGenerator = NULL;
    321316    this->pmconfig = NULL;
    322317    this->exitCode = PS_EXIT_SUCCESS;

  • trunk/ippToPsps/src/Batch.h

    r31015 r31025  
    1818#include <dvo_util.h>
    1919
    20 #include "Config.h"
     20#include "FitsGenerator.h"
    2121#include "Fits.h"
    2222#include "InitData.h"
    … …  
    3434
    3535    // fields
    36     char surveyType[10];        // the survey type, eg 3PI, MD01, STS, SSS
    37     int8_t surveyID;            // survey ID
    38     char fitsInPath[1000];      // path to FITS input
    39     char resultsPath[1000];     // path to results file
    40     xmlDocPtr resultsXmlDoc;    // pointer to XML document for results
    41     uint16_t numOfInputFiles;   // number of input files
    42     char** inputFiles;          // array of input file names
    43     Fits *fitsOut;              // output FITS file
    44     pmConfig* pmconfig;         // pmConfig
    45     dvoConfig* dvoConfig;       // dvo database
    46     Config* config;             // Config object
    47     InitData* initData;         // InitData object
    48     char todaysDate[20];        // today's date
    49     int exitCode;               // ps exit code
    50     bool testMode;              // test mode boolean
     36    char surveyType[10];           // the survey type, eg 3PI, MD01, STS, SSS
     37    int8_t surveyID;               // survey ID
     38    char fitsInPath[1000];         // path to FITS input
     39    char resultsPath[1000];        // path to results file
     40    xmlDocPtr resultsXmlDoc;       // pointer to XML document for results
     41    uint16_t numOfInputFiles;      // number of input files
     42    char** inputFiles;             // array of input file names
     43    Fits *fitsOut;                 // output FITS file
     44    pmConfig* pmconfig;            // pmConfig
     45    dvoConfig* dvoConfig;          // dvo database
     46    FitsGenerator* fitsGenerator;  // FitsGenerator object
     47    InitData* initData;            // InitData object
     48    char todaysDate[20];           // today's date
     49    int exitCode;                  // ps exit code
     50    bool testMode;                 // test mode boolean
    5151
    5252    // methods

  • trunk/ippToPsps/src/DetectionBatch.c

    r31015 r31025  
    5959
    6060
    61     this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, 1, "FrameMeta", true);
     61    this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, 1, "FrameMeta", true);
    6262
    6363    // FrameMeta values
    … …  
    212212
    213213            // create ImageMeta
    214             this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, 1, "ImageMeta", true);
     214            this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, 1, "ImageMeta", true);
    215215            psfFwhm = (fwhmMaj+fwhmMin)/2;
    216216            momentFwhm = (momentMaj+momentMin)/2;
    … …  
    339339
    340340                // detections
    341                 this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, nChipDetectionsIn, "Detection", false);
     341                this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, nChipDetectionsIn, "Detection", false);
    342342                this->base.fitsOut->writeColumn(this->base.fitsOut, TLONGLONG, DETECTION_OBJID, 1, 1, nChipDetectionsIn, objID);
    343343                this->base.fitsOut->writeColumn(this->base.fitsOut, TLONGLONG, DETECTION_DETECTID, 1, 1, nChipDetectionsIn, detectID);
    … …  
    356356
    357357                // skinny object
    358                 this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, nChipDetectionsIn, "SkinnyObject", false);
     358                this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, nChipDetectionsIn, "SkinnyObject", false);
    359359                this->base.fitsOut->writeColumn(this->base.fitsOut, TLONGLONG, SKINNYOBJECT_OBJID, 1, 1, nChipDetectionsIn, objID);
    360360                this->base.fitsOut->writeColumn(this->base.fitsOut, TLONGLONG, SKINNYOBJECT_IPPOBJID, 1, 1, nChipDetectionsIn, ippObjID);
    … …  
    363363
    364364                // object calibration color
    365                 this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, nChipDetectionsIn, "ObjectCalColor", false);
     365                this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, nChipDetectionsIn, "ObjectCalColor", false);
    366366                this->base.fitsOut->writeColumn(this->base.fitsOut, TLONGLONG, OBJECTCALCOLOR_OBJID, 1, 1, nChipDetectionsIn, objID);
    367367                this->base.fitsOut->writeColumn(this->base.fitsOut, TLONGLONG, OBJECTCALCOLOR_IPPOBJID, 1, 1, nChipDetectionsIn, ippObjID);

  • trunk/ippToPsps/src/Fits.h

    r31016 r31025  
    66 *
    77 *  @author IfA
    8  *  Copyright 2009 Institute for Astronomy, University of Hawaii
     8 *  Copyright 2011 Institute for Astronomy, University of Hawaii
    99 */
    1010

  • trunk/ippToPsps/src/InitBatch.c

    r31011 r31025  
    1818    if (this->base.exitCode != PS_EXIT_SUCCESS) return this->base.exitCode;
    1919
    20     if (!this->base.config->populateFromFile(this->base.config, this->base.fitsOut))
     20    if (!this->base.fitsGenerator->populateFromFile(this->base.fitsGenerator, this->base.fitsOut))
    2121        this->base.exitCode = PS_EXIT_CONFIG_ERROR;
    2222    else this->base.exitCode = PS_EXIT_SUCCESS;

  • trunk/ippToPsps/src/Makefile.am

    r31015 r31025  
    3333        Fits.c \
    3434        InitData.c \
    35         Config.c
     35        FitsGenerator.c
    3636
    3737# detectionbatch
    … …  
    4444        Fits.c \
    4545        InitData.c \
    46         Config.c
     46        FitsGenerator.c
    4747
    4848# stackbatch
    … …  
    5555        Fits.c \
    5656        InitData.c \
    57         Config.c
     57        FitsGenerator.c
    5858
    5959clean-local:

  • trunk/ippToPsps/src/StackBatch.c

    r31015 r31025  
    9191    if (numDetectionsOut > 0) {
    9292
    93         this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, nDet, "StackDetection", false);
     93        this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, nDet, "StackDetection", false);
    9494        this->base.fitsOut->writeColumn(this->base.fitsOut, TLONG, STACKDETECTION_SKYCELLID, 1, 1, nDet, skycellIDs);
    9595        this->base.fitsOut->writeColumn(this->base.fitsOut, TBYTE, STACKDETECTION_FILTERID, 1, 1, nDet, filterIDs);
    … …  
    186186
    187187    //int status = 0;
    188     this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, nDet, "StackApFlx", false);
     188    this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, nDet, "StackApFlx", false);
    189189    this->base.fitsOut->writeColumn(this->base.fitsOut, TBYTE, STACKAPFLX_FILTERID, 1, 1, nDet, filterIDs);
    190190    this->base.fitsOut->writeColumn(this->base.fitsOut, TBYTE, STACKAPFLX_SURVEYID, 1, 1, nDet, surveyIDs);
    … …  
    282282    }
    283283
    284     this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, nDet, "StackModelFit", false);
     284    this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, nDet, "StackModelFit", false);
    285285    this->base.fitsOut->writeColumn(this->base.fitsOut, TBYTE, STACKMODELFIT_FILTERID, 1, 1, nDet, filterIDs);
    286286    this->base.fitsOut->writeColumn(this->base.fitsOut, TBYTE, STACKMODELFIT_SURVEYID, 1, 1, nDet, surveyIDs);
    … …  
    302302        ) {
    303303
    304     this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, 3/*TODO*/, "StackToImage", false);
     304    this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, 3/*TODO*/, "StackToImage", false);
    305305
    306306    return true;
    … …  
    333333
    334334    // write StackMeta
    335     this->base.config->createAndPopulateTable(this->base.config, fitsIn, this->base.fitsOut, 1, "StackMeta", true);
     335    this->base.fitsGenerator->createAndPopulateTable(this->base.fitsGenerator, fitsIn, this->base.fitsOut, 1, "StackMeta", true);
    336336    this->base.fitsOut->writeColumn(this->base.fitsOut, TLONG, STACKMETA_SKYCELLID, 1, 1, 1, &this->skycellId);
    337337    this->base.fitsOut->writeColumn(this->base.fitsOut, TBYTE, STACKMETA_FILTERID, 1, 1, 1, &filterID);
Note: See TracChangeset for help on using the changeset viewer.