IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 30, 2011, 9:36:02 AM (15 years ago)
Author:
eugene
Message:

merging changes from trunk

Location:
branches/eam_branches/ipp-20110213/ippToPsps/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110213/ippToPsps/src

    • Property svn:ignore

      •  

        old new  
        99config.h.in
        1010stamp-h1
        11 ippToPspsVersionDefinitions.h
         11VersionDefinitions.h
         12detectionbatch
         13initbatch
         14stackbatch
         15

  • branches/eam_branches/ipp-20110213/ippToPsps/src/Batch.h

    r30812 r31083  
    1 /** @file ippToPsps.h
     1/** @file Batch.h
    22 *
    33 *  @brief Batch
    … …  
    66 *
    77 *  @author IfA
    8  *  Copyright 2009 Institute for Astronomy, University of Hawaii
     8 *  Copyright 2011 Institute for Astronomy, University of Hawaii
    99 */
    1010
    … …  
    1212#define IPPTOPSPS_BATCH_H
    1313
     14#include <libxml/parser.h>
     15#include <libxml/tree.h>
     16
    1417#include <psmodules.h>
    1518#include <dvo_util.h>
    16 #include "Config.h"
    17 #include <libxml/parser.h>
    18 #include <libxml/tree.h>
     19
     20#include "FitsGenerator.h"
     21#include "Fits.h"
     22#include "InitData.h"
     23#include "Logger.h"
    1924
    2025/**
    … …  
    2530  - StackBatch
    2631
    27   All subclasses need to implement the run() method and may need to implenent print() and/or init()
     32  All subclasses need to implement the run() method and may need to implement print()
    2833  */
    2934typedef struct Batch {
    3035
    3136    // fields
    32     char surveyType[10];        // the survey type, eg 3PI, MD01, STS, SSS
    33     int8_t surveyID;            // survey ID
    34     char fitsInPath[1000];      // path to FITS input
    35     char resultsPath[1000];     // path to results file
    36     xmlDocPtr resultsXmlDoc;    // pointer to XML document for results
    37     uint16_t numOfInputFiles;   // number of input files
    38     char** inputFiles;          // array of input file names
    39     char fitsOutFile[100];      // FITS output filename
    40     char fitsOutPath[1000];     // path to FITS output
    41     fitsfile *fitsOut;          // output FITS file
    42     char configsDir[500];       // path to IPP/PSPS mapping file
    43     pmConfig* pmconfig;         // pmConfig
    44     dvoConfig* dvoConfig;       // dvo database
    45     IppToPspsConfig* config;    // config structure
    46     char todaysDate[20];        // today's date
    47     int exitCode;               // ps exit code
     37    char surveyType[10];           // the survey type, eg 3PI, MD01, STS, SSS
     38    int8_t surveyID;               // survey ID
     39    char fitsInPath[1000];         // path to FITS input
     40    char resultsPath[1000];        // path to results file
     41    xmlDocPtr resultsXmlDoc;       // pointer to XML document for results
     42    uint16_t numOfInputFiles;      // number of input files
     43    char** inputFiles;             // array of input file names
     44    Fits *fitsOut;                 // output FITS file
     45    pmConfig* pmconfig;            // pmConfig
     46    dvoConfig* dvoConfig;          // dvo database
     47    FitsGenerator* fitsGenerator;  // FitsGenerator object
     48    InitData* initData;            // InitData object
     49    char todaysDate[20];           // today's date
     50    int exitCode;                  // ps exit code
     51    bool testMode;                 // test mode boolean
     52    Logger* logger;                // Logger object
    4853
    4954    // methods
    5055    bool (*parseArguments)();
    51     bool (*init)();
    5256    int (*run)();
    5357    void (*print)();
    … …  
    5761    bool (*gotConfig)();
    5862    bool (*gotSurveyType)();
     63
     64    // destructor
    5965    void (*destroy)();
    6066
    … …  
    6268
    6369// public functions
    64 bool new_Batch(Batch *this);
     70bool new_Batch(Logger* logger, Batch *this);
    6571
    6672void ippToPsps_VersionPrint(void);
Note: See TracChangeset for help on using the changeset viewer.