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

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.cc (modified) (29 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -1 @@
-/* Lecteur de colonne de table Fits (binaire ou ASCII) avec buffer */
+/* Lecteur de colonne de table Fits (binaire ou ASCII) */
 #include "sopnamsp.h"
 #include "machdefs.h"
@@ -307 +307 @@
   \param collabel : label of the column to be read
   \param ihdu : number of the HDU where the column is.
-  \param blen : read buffer length
-  \param bsens : buffer reading direction
   \param lp : debug level
   \verbatim
   - if ihdu<=0 first BINARY or ASCII table is taken
   - if ihdu>nhdu ihdu is set to nhdu
-  - bsens>0    read forward
-    bsens<0    read backward
-    bsens==0   read centered
   \endverbatim
   \warning ihdu = [1,nhdu]
 */
-FitsABTColRd::FitsABTColRd(FitsOpenFile* fof,string collabel
-                          ,int ihdu,long blen,long bsens,int lp)
-{
-  Init(fof,collabel.c_str(),-1,ihdu,blen,bsens,lp);
+FitsABTColRd::FitsABTColRd(FitsOpenFile* fof,string collabel,int ihdu,int lp)
+{
+  Init(fof,collabel.c_str(),-1,ihdu,lp);
 }
 
@@ -331 +325 @@
   \warning col = [0,ncol[
 */
-FitsABTColRd::FitsABTColRd(FitsOpenFile* fof,int colnum
-                          ,int ihdu,long blen,long bsens,int lp)
-{
-  Init(fof,"",colnum,ihdu,blen,bsens,lp);
+FitsABTColRd::FitsABTColRd(FitsOpenFile* fof,int colnum,int ihdu,int lp)
+{
+  Init(fof,"",colnum,ihdu,lp);
 }
 
@@ -340 +333 @@
 FitsABTColRd::FitsABTColRd(FitsABTColRd& fbt)
 {
-  Init(fbt.GetFitsOpenFile(),fbt.GetColLabel().c_str()
-      ,fbt.GetColNum(),fbt.HDU()
-      ,fbt.GetBLen(),fbt.GetBSens(),fbt.DbgLevel);
+  Init(fbt.GetFitsOpenFile(),fbt.GetColLabel().c_str(),fbt.GetColNum(),fbt.HDU(),fbt.DbgLevel);
 }
 
@@ -355 +346 @@
  NFitsRead = 0;
  FitsOF = NULL;
- LineDeb = LineFin = -1;
- Buffer = NULL;
 }
 
 /*! Init routine called by the constructor */
-void FitsABTColRd::Init(FitsOpenFile* fof,const char* collabel,int colnum
-                        ,int ihdu,long blen,long bsens,int lp)
+void FitsABTColRd::Init(FitsOpenFile* fof,const char* collabel,int colnum,int ihdu,int lp)
 {
  // Initialisation des Parametres Generaux
@@ -371 +359 @@
  NFitsRead = 0;
  FitsOF = NULL;
- LineDeb = LineFin = -1;
- Buffer = NULL;
 
  // Caracteristiques du FitsOpenFile
@@ -475 +461 @@
  fits_get_col_display_width(GetFitsPtr(),ColNum+1,&ColDispWidth,&sta);
 
- // Set the buffer for reading
- ChangeBuffer(blen,bsens);
-
  if(DbgLevel)
    cout<<"FitsABTColRd::Init Num="<<ColNum<<" Label="<<ColLabel
@@ -497 +480 @@
 {
  if(StrBuff!=NULL) {delete [] StrBuff; StrBuff=NULL;}
- if(Buffer!=NULL) {delete [] Buffer; Buffer=NULL;}
- LineDeb = LineFin = -1;
  //--- Surtout on ne "fits_close_file" pas le fichier FITS !!!
-}
-
-//////////////////////////////////////////////////////////////
-/*! Change the buffer caracteristiques (see creator) */
-void FitsABTColRd::ChangeBuffer(long blen,long bsens)
-{
- long oldnbuffer = NBuffer;
-
- // Compute buffer caracteristics
- BuffLen = (blen<=0 || ColRepeat!=1)? 1: blen;
- BuffSens = bsens;
- NBuffer = BuffLen;
- if(bsens==0 && NBuffer%2==0) NBuffer++;
-
- // De-allocate if necessary
- if(Buffer!=NULL) {
-   // On des-alloue si pas assez de place
-   // ou si l'ancienne place est beaucoup trop grande (>25%)
-   if(oldnbuffer<NBuffer || (oldnbuffer>NBuffer+long(0.25*NBuffer)) )
-     {delete [] Buffer; Buffer=NULL;}
- }
-
- // Re-allocate
- if(Buffer==NULL) Buffer = new double[NBuffer];
-
- // Tell program that nothing is into buffer
- LineDeb = LineFin = -1;
 }
 
@@ -576 +530 @@
   \return value in double
   \param n : number of the row to be read.
-  \verbatim
-  usebuffer == true  : use read optimisation with bufferisation
-            == false : no optimisation with bufferisation
-                       just read one value
-  \endverbatim
-*/
-double FitsABTColRd::Read(LONGLONG n,long nfirstel,bool usebuffer)
+*/
+double FitsABTColRd::Read(LONGLONG n,long nfirstel)
 // Attention: n=nline [0,NBline[, cfistio veut [1,NBline]
 // Attention: colnum  [0,NBcol[ , cfistio veut [1,NBcol]
@@ -593 +542 @@
    throw RangeCheckError("FitsABTColRd::Read try to read outside element range: nfirstel>repeat\n");
 
- // Pas de bufferisation (ou repeat=1), on lit betement
- if(NBuffer==1 || !usebuffer || ColRepeat!=1) {
-   NFitsRead++;
-   double val;
-   fits_read_col(GetFitsPtr(),TDOUBLE,ColNum+1,n+1,nfirstel+1,1,NULL,&val,NULL,&sta);
-   if(sta) {
-     FitsOpenFile::printerror(sta);
-     throw NotAvailableOperation("FitsABTColRd::Read: Error Reading Fits file\n");
-   }
-   // On ne remplit Buffer[0] que si on a choisit
-   // un mode de lecture non bufferise (n==1) DES LE DEBUT.
-   // Si on a initialement choisit un mode bufferise (avec n>1),
-   // Buffer contient les valeurs chargees auparavent.
-   // Il ne faut pas faire {Buffer[0]=val; LineDeb=LineFin=n;}
-   // car on perd l'info de ces valeurs.
-   if(NBuffer==1) {Buffer[0]=val; LineDeb=LineFin=n;}
-   return val;
- }
-
- // Gestion avec bufferisation (uniquement dans le cas repeat=1)
- if(!Buffer)
-   throw RangeCheckError("FitsABTColRd::Read: Buffer not allocated\n");
- if(n<LineDeb || n>LineFin) {
-   NFitsRead++;
-   LONGLONG row1,row2,nrow;
-   if(BuffSens>0) { // Cas remplissage forward
-     row1 = n+1;
-     row2 = row1+NBuffer-1; if(row2>NBline) row2 = NBline;
-   } else if(BuffSens<0) { // Cas remplissage backward
-     row2 = n+1;
-     row1 = row2-NBuffer+1; if(row1<1) row1 = 1;
-   } else { // Cas remplissage centre
-     row1 = n+1 - NBuffer/2; if(row1<1) row1 = 1;
-     row2 = n+1 + NBuffer/2; if(row2>NBline) row2 = NBline;
-   }
-   nrow = row2 - row1 + 1;
-   LineDeb = row1-1; LineFin = row2-1;
-   //cout<<"DBG-FitsRead: row1="<<row1<<" row2="<<row2<<" nrow="<<nrow
-   //    <<" LineDeb,Fin="<<LineDeb<<","<<LineFin<<endl;
-   fits_read_col(GetFitsPtr(),TDOUBLE,ColNum+1,row1,1,nrow,NULL,Buffer,NULL,&sta);
-   if(sta) {
-     FitsOpenFile::printerror(sta);
-     LineDeb = LineFin = -1;
-     throw NotAvailableOperation("FitsABTColRd::Read: Error Reading Fits file\n");
-   }
- }
-
- long ibuf = n-LineDeb;
- return Buffer[ibuf];
+ double val;
+ fits_read_col(GetFitsPtr(),TDOUBLE,ColNum+1,n+1,nfirstel+1,1,NULL,&val,NULL,&sta);
+ if(sta) {
+   FitsOpenFile::printerror(sta);
+   throw NotAvailableOperation("FitsABTColRd::Read: Error Reading Fits file\n");
+ }
+ NFitsRead++;
+ return val;
+}
+
+/*!
+  Read row "n" element "nfirstel" and return a long long int
+*/
+int_8 FitsABTColRd::ReadLL(LONGLONG n,long nfirstel)
+{
+ int sta=0;
+ if(n<0 || n>=NBline)
+   throw RangeCheckError("FitsABTColRd::ReadLL try to read outside line range\n");
+ if(nfirstel<0 || nfirstel>=ColRepeat)
+   throw RangeCheckError("FitsABTColRd::ReadLL try to read outside element range: nfirstel>repeat\n");
+
+ int_8 val;
+ fits_read_col(GetFitsPtr(),TLONGLONG,ColNum+1,n+1,nfirstel+1,1,NULL,&val,NULL,&sta);
+ if(sta) {
+   FitsOpenFile::printerror(sta);
+   throw NotAvailableOperation("FitsABTColRd::ReadLL: Error Reading Fits file\n");
+ }
+ NFitsRead++;
+ return val;
 }
 
@@ -661 +590 @@
    throw NotAvailableOperation("FitsABTColRd::ReadComplex: Error Reading Fits file\n");
  }
+ NFitsRead++;
  return complex<r_8>(val[0],val[1]);
 }
@@ -678 +608 @@
  char nullstr[]="";
 
- NFitsRead++;
  fits_read_col(GetFitsPtr(),TSTRING,ColNum+1,n+1,nfirstel+1,1,nullstr,&StrBuff,NULL,&sta);
  if(sta) {
@@ -684 +613 @@
    throw NotAvailableOperation("FitsABTColRd::ReadInStr: Error Reading Fits file\n");
  }
+ NFitsRead++;
 
  return StrBuff;
@@ -741 +671 @@
    throw NotAvailableOperation("FitsABTColRd::Read_TVector<double>: Error Reading Fits file\n");
  }
+ NFitsRead += nread;
 
  return nread;
@@ -767 +698 @@
    throw NotAvailableOperation("FitsABTColRd::Read_TVector<float>: Error Reading Fits file\n");
  }
+ NFitsRead += nread;
 
  return nread;
@@ -792 +724 @@
    throw NotAvailableOperation("FitsABTColRd::Read_TVector<uint_2>: Error Reading Fits file\n");
  }
+ NFitsRead += nread;
 
  return nread;
@@ -819 +752 @@
    throw NotAvailableOperation("FitsABTColRd::Read_TVector<int_4>: Error Reading Fits file\n");
  }
+ NFitsRead += nread;
 
  return nread;
@@ -845 +779 @@
    throw NotAvailableOperation("FitsABTColRd::Read_TVector<int_8>: Error Reading Fits file\n");
  }
+ NFitsRead += nread;
 
  return nread;
@@ -870 +805 @@
  LONGLONG row = -1;
  if(NBline==0) return row;
- // Change buffer for efficiency
- long bsens=BuffSens; bool bchange=false;
- if(bsens<=0) {ChangeBuffer(BuffLen,1); bchange=true;}
  if(rowstart<0) rowstart = 0;
  if(rowstart>=NBline) rowstart = NBline-1;
@@ -881 +813 @@
    break;
  }
- if(bchange) ChangeBuffer(BuffLen,bsens);
  return row;
 }
@@ -902 +833 @@
  LONGLONG row = -1;
  if(NBline==0) return row;
- // Change buffer for efficiency
- long bsens=BuffSens; bool bchange=false;
- if(bsens>=0) {ChangeBuffer(BuffLen,-1); bchange=true;}
  if(rowstart<0 || rowstart>=NBline) rowstart = NBline-1;
  for(LONGLONG i=rowstart;i>=0;i--) {
@@ -912 +840 @@
    break;
  }
- if(bchange) ChangeBuffer(BuffLen,bsens);
  return row;
 }
@@ -919 +846 @@
 void FitsABTColRd::Print(ostream& os,int lp) const
 {
- os<<"FitsABTColRd:Print ("<<BuffLen<<","<<BuffSens<<","<<NulVal<<")"
+ os<<"FitsABTColRd:Print ("<<NulVal<<")"
    <<" ncols="<<NBcol<<" nrows="<<NBline;
  if(lp>0) os<<" NRead="<<NFitsRead;
@@ -971 +898 @@
   \param collabel : label of the column to be read
   \param ihdu : number of the HDU where the column is.
-  \param blen : read buffer length
-  \param bsens : buffer reading direction
   \param lp : debug level
   \verbatim
   - if ihdu<=0 first BINARY or ASCII table is taken
   - if ihdu>nhdu ihdu is set to nhdu
-  - bsens>0    read forward
-    bsens<0    read backward
-    bsens==0   read centered
   \endverbatim
   \warning ihdu = [1,nhdu]
 */
-FitsABTColRead::FitsABTColRead(string fname,string collabel
-                              ,int ihdu,long blen,long bsens,int lp)
-: FitsABTColRd(new FitsOpenFile(fname),collabel,ihdu,blen,bsens,lp)
+FitsABTColRead::FitsABTColRead(string fname,string collabel,int ihdu,int lp)
+: FitsABTColRd(new FitsOpenFile(fname),collabel,ihdu,lp)
 {
 }
@@ -995 +916 @@
   \warning col = [0,ncol[
 */
-FitsABTColRead::FitsABTColRead(string fname,int colnum
-                              ,int ihdu,long blen,long bsens,int lp)
-: FitsABTColRd(new FitsOpenFile(fname),colnum,ihdu,blen,bsens,lp)
+FitsABTColRead::FitsABTColRead(string fname,int colnum,int ihdu,int lp)
+: FitsABTColRd(new FitsOpenFile(fname),colnum,ihdu,lp)
 {
 }
 
 /*! Constructor. see below */
-FitsABTColRead::FitsABTColRead(const char * cfname,const char* collabel
-                              ,int ihdu,long blen,long bsens,int lp)
-: FitsABTColRd(new FitsOpenFile(cfname),collabel,ihdu,blen,bsens,lp)
+FitsABTColRead::FitsABTColRead(const char * cfname,const char* collabel,int ihdu,int lp)
+: FitsABTColRd(new FitsOpenFile(cfname),collabel,ihdu,lp)
 {
 }
 
 /*! Constructor. see below */
-FitsABTColRead::FitsABTColRead(const char * cfname,int colnum
-                              ,int ihdu,long blen,long bsens,int lp)
-: FitsABTColRd(new FitsOpenFile(cfname),colnum,ihdu,blen,bsens,lp)
+FitsABTColRead::FitsABTColRead(const char * cfname,int colnum,int ihdu,int lp)
+: FitsABTColRd(new FitsOpenFile(cfname),colnum,ihdu,lp)
 {
 }
@@ -1026 +944 @@
  // FitsABTColRead ferme le fichier FITS: il faut dupliquer le FitsOpenFile
  FitsOpenFile* fof = new FitsOpenFile(*fbt.GetFitsOpenFile());
- Init(fof,fbt.GetColLabel().c_str()
-     ,fbt.GetColNum(),fbt.HDU()
-     ,fbt.GetBLen(),fbt.GetBSens(),fbt.DbgLevel);
+ Init(fof,fbt.GetColLabel().c_str(),fbt.GetColNum(),fbt.HDU(),fbt.DbgLevel);
 }
 
@@ -1239 +1155 @@
   \return value in double
   \param n : number of the row to be read.
-  \verbatim
-  usebuffer == true  : use read optimisation with bufferisation
-            == false : no optimisation with bufferisation
-                       just read one value
-  \endverbatim
 */
 double FitsABTColRd1F::Read(int ColNum,LONGLONG n,long nfirstel)
@@ -1269 +1180 @@
 
 /*!
+  Read row "n" element "nfirstel" and return a long long int
+*/
+int_8 FitsABTColRd1F::ReadLL(int ColNum,LONGLONG n,long nfirstel)
+{
+ int sta=0;
+ if(ColNum<0 || ColNum>=NBcol)
+   throw RangeCheckError("FitsABTColRd1F::ReadLL try to read outside column range\n");
+ if(n<0 || n>=NBline)
+   throw RangeCheckError("FitsABTColRd1F::ReadLL try to read outside line range\n");
+ if(nfirstel<0 || nfirstel>=ColRepeat[ColNum])
+   throw RangeCheckError("FitsABTColRd1F::ReadLL try to read outside element range: nfirstel>repeat\n");
+
+ int_8 val;
+ fits_read_col(GetFitsPtr(),TLONGLONG,ColNum+1,n+1,nfirstel+1,1,NULL,&val,NULL,&sta);
+ if(sta) {
+   FitsOpenFile::printerror(sta);
+   throw NotAvailableOperation("FitsABTColRd1F::ReadLL: Error Reading Fits file\n");
+ }
+ return val;
+}
+
+
+/*!
   Read row "n" element "nfirstel" and return a complex value
 */
@@ -1311 +1245 @@
    throw NotAvailableOperation("FitsABTColRd::ReadInStr: Error Reading Fits file\n");
  }
-
  return StrBuff[ColNum];
 }