Changeset 4029 in Sophya for trunk/SophyaExt/FitsIOServer/fabtcolread.h

Timestamp:

Oct 22, 2011, 1:15:49 PM (14 years ago)

Author:

cmv

Message:

suppression lecture Bufferisee de FitsABTColRd (inutile: cfitsio gere bufferisation en interne et complication code), cmv 22/10/2011

File:

• trunk/SophyaExt/FitsIOServer/fabtcolread.h (modified) (9 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.h

@@ -68 +68 @@
 class FitsABTColRd : public AnyDataObj {
 public:
-  FitsABTColRd(FitsOpenFile* fof,string collabel,int ihdu=0
-              ,long blen=100,long bsens=1,int lp=0);
-  FitsABTColRd(FitsOpenFile* fof,int colnum,int ihdu=0
-              ,long blen=100,long bsens=1,int lp=0);
+  FitsABTColRd(FitsOpenFile* fof,string collabel,int ihdu=0,int lp=0);
+  FitsABTColRd(FitsOpenFile* fof,int colnum,int ihdu=0,int lp=0);
   FitsABTColRd(FitsABTColRd& fbt);
   FitsABTColRd();
   virtual ~FitsABTColRd();
-
-  void ChangeBuffer(long blen=100,long bsens=1);
 
   double    ReadKey(const char *keyname);
@@ -83 +79 @@
   string    ReadKeyS(const char *keyname);
 
-  double Read(LONGLONG n,long nfirstel,bool usebuffer=true);
-  inline double Read(LONGLONG n,bool usebuffer=true) {return Read(n,0,usebuffer);}
+  double Read(LONGLONG n,long nfirstel=0);
+  int_8  ReadLL(LONGLONG n,long nfirstel=0);
   complex<r_8> ReadComplex(LONGLONG n,long nfirstel=0);
   char* ReadInStr(LONGLONG n,long nfirstel=0);
@@ -95 +91 @@
 
   //! return the value of the first row
-  double ReadFirstRow(long nfirstel,bool usebuffer=false) {return Read(0,nfirstel,usebuffer);}
-  double ReadFirstRow(bool usebuffer=false) {return Read(0,usebuffer);}
+  double ReadFirstRow(long nfirstel) {return Read(0,nfirstel);}
+  double ReadFirstRow(void) {return Read(0);}
   //! return the value of the last row
-  double ReadLastRow(long nfirstel,bool usebuffer=false) {return Read(NBline-1,nfirstel,usebuffer);}
-  double ReadLastRow(bool usebuffer=false) {return Read(NBline-1,usebuffer);}
+  double ReadLastRow(long nfirstel) {return Read(NBline-1,nfirstel);}
+  double ReadLastRow(void) {return Read(NBline-1);}
 
   LONGLONG FirstRow(long nfirstel,double val1,double val2,LONGLONG rowstart=-1);
@@ -144 +140 @@
   //! Get the columns fits repeat that is read
   inline long GetColRepeat(void) const {return ColRepeat;}
-  //! Get the read requested buffer length
-  inline long GetBLen(void) const {return BuffLen;}
-  //! Get the read buffer direction
-  inline long GetBSens(void) const {return BuffSens;}
   //! Print to os
   virtual void Print(ostream& os,int lp=1) const;
   //! Print to stdout
   inline  void Print(int lp=1) const {Print(cout,lp);}
-  //! Get the read effective buffer length
-  inline long GetNBuffer(void) const {return NBuffer;}
-  //! Get the read bufferpointer
-  inline double* GetBuffer(void) {return Buffer;}
 
 protected:
-  void Init(FitsOpenFile* fof,const char *collabel,int colnum
-           ,int ihdu,long blen,long bsens,int lp);
+  void Init(FitsOpenFile* fof,const char *collabel,int colnum,int ihdu,int lp);
   void Delete(void);
 
@@ -170 +157 @@
   double NulVal;
   unsigned short DbgLevel;
-  long BuffLen, BuffSens;
 
   LONGLONG NFitsRead;
   FitsOpenFile* FitsOF;
-  LONGLONG LineDeb, LineFin;
-  double *Buffer;
-  long NBuffer;
 };
 
@@ -183 +166 @@
 class FitsABTColRead : public FitsABTColRd {
 public:
-  FitsABTColRead(string fname,string collabel,int ihdu=0
-                ,long blen=100,long bsens=1,int lp=0);
-  FitsABTColRead(string fname,int colnum,int ihdu=0
-                ,long blen=100,long bsens=1,int lp=0);
-  FitsABTColRead(const char *cfname,const char *collabel,int ihdu=0
-                ,long blen=100,long bsens=1,int lp=0);
-  FitsABTColRead(const char *cfname,int colnum,int ihdu=0
-                ,long blen=100,long bsens=1,int lp=0);
+  FitsABTColRead(string fname,string collabel,int ihdu=0,int lp=0);
+  FitsABTColRead(string fname,int colnum,int ihdu=0,int lp=0);
+  FitsABTColRead(const char *cfname,const char *collabel,int ihdu=0,int lp=0);
+  FitsABTColRead(const char *cfname,int colnum,int ihdu=0,int lp=0);
   FitsABTColRead(FitsABTColRead& fbt);
   FitsABTColRead();
@@ -198 +177 @@
 
 ///////////////////////////////////////////////////////////////////
-//! Class for reading ALL the columns in a FITS ASCII or BINARY table (no bufferisation)
+//! Class for reading ALL the columns in a FITS ASCII or BINARY table
 class FitsABTColRd1F : public AnyDataObj {
 public:
@@ -209 +188 @@
   string    ReadKeyS(const char *keyname);
 
-  double Read(int ColNum,LONGLONG n,long nfirstel);
-  inline double Read(int ColNum,LONGLONG n) {return Read(ColNum,n,0);}
+  double Read(int ColNum,LONGLONG n,long nfirstel=0);
+  int_8  ReadLL(int ColNum,LONGLONG n,long nfirstel=0);
   complex<r_8> ReadComplex(int ColNum,LONGLONG n,long nfirstel=0);
   char* ReadInStr(int ColNum,LONGLONG n,long nfirstel=0);
@@ -258 +237 @@
   //! Print to stdout
   inline  void Print(int lp=1) const {Print(cout,lp);}
-  //! Get the read effective buffer length
 
 protected: