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

Timestamp:

Sep 27, 2001, 7:45:52 PM (24 years ago)

Author:

cmv

Message:

possibilite d'ecrire directement des TVector fabtwriter cmv 27/9/01

File:

• trunk/SophyaExt/FitsIOServer/fabtcolread.cc (modified) (10 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -98 +98 @@
  SetNulVal();
  SetDebug(lp);
- BuffLen = (blen<=0) ? 1: blen;
- BuffSens = bsens;
  NFitsRead = 0;
  FitsPtr = NULL;
  LineDeb = LineFin = -1;
  Buffer = NULL;
- NBuffer = 0;
+ ChangeBuffer(blen,bsens);
 
  //////////////////////////
@@ -112 +110 @@
  int sta=0;
  if(FitsFN.size() <= 0 ) {
-   IHdu = -1;
+   IHdu = -1; Delete();
    throw ParmError("FitsABTColRead::Init: Fits file name error\n");
  }
@@ -145 +143 @@
    }
  if(IHdu<=0 || IHdu>NHdu) {
-   IHdu = 0;
    cout<<"NO BINARY or ASCII hdu found"<<endl;
-   Delete();
+   IHdu = 0; Delete();
    throw TypeMismatchExc("FitsABTColRead::Init: NO BINARY or ASCII hdu found\n");
  }
@@ -230 +227 @@
        <<" TUnit="<<ColTUnit<<" TForm="<<ColTForm<<endl;
 
- // Prepare buffer
- NBuffer = (BuffSens==0) ? BuffLen+1: BuffLen;
- Buffer = new double[NBuffer];
 }
 
@@ -246 +240 @@
 void FitsABTColRead::ChangeBuffer(long blen,long bsens)
 {
+ long oldnbuffer = NBuffer;
+
+ // Compute buffer caracteristics
  BuffLen = (blen<=0)? 1: blen;
  BuffSens = bsens;
-
- // De-allocate
- if(Buffer==NULL) return;
- delete [] Buffer; Buffer=NULL;
+ NBuffer = BuffLen;
+ if(bsens==0 && NBuffer%2==0) NBuffer++;
+
+ // De-allocate if necessary
+ if(Buffer!=NULL && oldnbuffer!=NBuffer)
+   {delete [] Buffer; Buffer=NULL;}
+
+ // Re-allocate
+ if(Buffer==NULL) Buffer = new double[NBuffer];
 
  // Tell program that nothing is into buffer
  LineDeb = LineFin = -1;
-
- // Re-allocate
- NBuffer = (BuffSens==0) ? BuffLen+1: BuffLen;
- Buffer = new double[NBuffer];
 }
 
@@ -264 +262 @@
 void FitsABTColRead::Delete()
 {
- if(Buffer==NULL) return;
- delete [] Buffer; Buffer=NULL;
+ if(Buffer!=NULL) {delete [] Buffer; Buffer=NULL;}
  LineDeb = LineFin = -1;
  int sta = 0;
@@ -279 +276 @@
   \endverbatim
 */
-r_8 FitsABTColRead::Read(long n)
+double FitsABTColRead::Read(long n)
 // Attention: n=nline [0,NBline[, cfistio veut [1,NBline]
 // Attention: colnum  [0,NBcol[ , cfistio veut [1,NBcol]
@@ -288 +285 @@
 
  // Pas de bufferisation, on lit betement
- if(BuffLen==1) {
+ if(NBuffer==1) {
    NFitsRead++;
    fits_read_col_dbl(FitsPtr,ColNum+1,n+1,1,1,NulVal,Buffer,&anynul,&sta);
@@ -308 +305 @@
    if(BuffSens>0) { // Cas remplissage forward
      row1 = n+1;
-     row2 = row1+BuffLen-1; if(row2>NBline) row2 = NBline;
+     row2 = row1+NBuffer-1; if(row2>NBline) row2 = NBline;
    } else if(BuffSens<0) { // Cas remplissage backward
      row2 = n+1;
-     row1 = row2-BuffLen+1; if(row1<1) row1 = 1;
+     row1 = row2-NBuffer+1; if(row1<1) row1 = 1;
    } else { // Cas remplissage centre
-     row1 = n+1 - BuffLen/2; if(row1<1) row1 = 1;
-     row2 = n+1 + BuffLen/2; if(row2>NBline) row2 = NBline;
+     row1 = n+1 - NBuffer/2; if(row1<1) row1 = 1;
+     row2 = n+1 + NBuffer/2; if(row2>NBline) row2 = NBline;
    }
    nrow = row2 - row1 + 1;
@@ -339 +336 @@
   \endverbatim
 */
-void FitsABTColRead::Read(long n1,long n2,TVector<r_8>& data)
+void FitsABTColRead::Read(long n1,long n2,TVector<double>& data)
 {
  if(n1<0 || n1>=NBline || n2<0 || n2>=NBline || n1>n2)