Changeset 1904 for trunk/src


Ignore:
Timestamp:
08/26/10 13:04:24 (14 years ago)
Author:
Malte Marquarding
Message:

pass down record for filler options

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/FillerBase.h

    r1819 r1904  
    4343    virtual ~FillerBase() {;}
    4444
    45 //    virtual bool open(const std::string& filename, const Record& rec) = 0;
    46     virtual bool open(const std::string& filename) = 0;
     45    virtual bool open(const std::string& filename, const casa::Record& rec) = 0;
     46    //    virtual bool open(const std::string& filename) = 0;
    4747    virtual void fill() = 0;
    4848    virtual void close() = 0;
  • trunk/src/FillerWrapper.h

    r1819 r1904  
    1616#include <casa/Exceptions.h>
    1717#include <casa/Utilities/CountedPtr.h>
     18#include <casa/Containers/Record.h>
    1819#include <casa/OS/File.h>
    1920
     
    3839
    3940
    40 //  void open(const std::string& filename, casa::Record rec) {
    41   void open(const std::string& filename) {
     41  void open(const std::string& filename, const casa::Record& rec) {
     42    //  void open(const std::string& filename) {
    4243    casa::File file(filename);
    4344    if ( !file.exists() ) {
     
    4546    }
    4647    filler_ = new PKSFiller(stable_);
    47 //    if (filler_->open(filename, rec)) {
    48     if (filler_->open(filename)) {
     48    if (filler_->open(filename, rec)) {
     49      //    if (filler_->open(filename)) {
    4950      attached_ = true;
    5051      return;
    5152    }
    5253    filler_ = new NROFiller(stable_);
    53 //    if (filler_->open(filename, rec)) {
    54     if (filler_->open(filename)) {
     54    if (filler_->open(filename, rec)) {
     55      //    if (filler_->open(filename)) {
    5556      attached_ = true;
    5657      return;
  • trunk/src/NROFiller.cpp

    r1819 r1904  
    2020#include "NROFiller.h"
    2121#include "STHeader.h"
     22#include <casa/Containers/Record.h>
    2223#include <atnf/PKSIO/SrcType.h>
    2324
     
    3637}
    3738
    38 bool NROFiller::open(const std::string& filename)
     39  bool NROFiller::open(const std::string& filename, const Record& rec)
    3940{
    4041  bool status = true ;
  • trunk/src/NROFiller.h

    r1819 r1904  
    4545    virtual ~NROFiller();
    4646
    47     bool open(const std::string& filename) ;
     47    bool open(const std::string& filename, const casa::Record& rec) ;
    4848    void fill() ;
    4949    void close() ;
  • trunk/src/PKSFiller.cpp

    r1880 r1904  
    2222#include <casa/Logging/LogIO.h>
    2323
     24#include <casa/Containers/Record.h>
    2425#include <measures/Measures/MDirection.h>
    2526#include <measures/Measures/MeasConvert.h>
     
    5859}
    5960
    60 bool PKSFiller::open( const std::string& filename)
     61bool PKSFiller::open( const std::string& filename, const Record& rec)
    6162{
    6263  Bool haveBase, haveSpectra;
  • trunk/src/PKSFiller.h

    r1819 r1904  
    2020#include <casa/Arrays/Vector.h>
    2121
     22
    2223#include "FillerBase.h"
    2324#include "Scantable.h"
    2425
     26class casa::Record;
    2527class PKSreader;
    2628
     
    3436    virtual ~PKSFiller();
    3537
    36 //    bool open(const std::string& filename, const Record& rec)=0;
    37     bool open(const std::string& filename);
     38    bool open(const std::string& filename, const casa::Record& rec);
     39    //    bool open(const std::string& filename);
    3840    void fill();
    3941    void close();
Note: See TracChangeset for help on using the changeset viewer.