Changeset 2907 in Sophya for trunk/SophyaExt

Timestamp:

Jan 17, 2006, 10:09:29 AM (20 years ago)

Author:

ansari

Message:

debug/check fits : gestion NTuple colonnes double + init hdunum_ ds FitsFile(FitsInOutFile&) + correction gestion TArray/TMatrix/TVector ds fitsarrhand.h - Reza 17/01/2006

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsarrhand.h (modified) (1 diff)
• fitsfile.cc (modified) (2 diffs)
• fitsfile.h (modified) (1 diff)
• fitsntuple.cc (modified) (5 diffs)

trunk/SophyaExt/FitsIOServer/fitsarrhand.h

@@ -88 +88 @@
       if ( dobj == NULL) {
         if (naxis == 1) dobj = new TVector<T>;
-        else if (naxis == 1) dobj = new TMatrix<T>;
+        else if (naxis == 2) { 
+          if ( (naxes[0] == 1) || (naxes[1] == 1) )  
+            dobj = new TVector<T>;  
+          else dobj = new TMatrix<T>;
+        }
         else dobj = new TArray<T>;
         ownobj = true;

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -298 +298 @@
 {
   InitNull();
+  hdunum_ = fios.CurrentHDU();
 }
 
@@ -1145 +1146 @@
     {
       fits_read_col(fptr_,TFLOAT,ncol+1,NoLine+1,1,1,&fnull,&fdata[ncol],&anynul,&status);
+      if (status)
+        {
+          ResetStatus(status);
+          break;
+        }
+    }
+}
+
+/*! 
+Get the NoLine-th float 'line'  from the current BINTABLE extension on FITS file,
+*/
+void FitsInFile::GetBinTabLine(int NoLine, double* ddata) 
+{
+  int status= 0;
+  int    anynul;
+  double dnull= fnull_;
+  long nels=1;
+  int ncol;
+  for (ncol=0; ncol<nbcols_; ncol++)
+    {
+      fits_read_col(fptr_, TDOUBLE, ncol+1,NoLine+1,1,1,&dnull,&ddata[ncol],&anynul,&status);
       if (status)
         {

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -285 +285 @@
  void   GetBinTabLine(long NoLine, BnTblLine& ligne) ;
  void   GetBinTabLine(int NoLine, float* fdata) ;
+ void   GetBinTabLine(int NoLine, double* ddata) ;
  void   GetBinTabFCol(r_8* valeurs, int nentries, int NoCol) const;
  void   GetBinTabFCol(r_4* valeurs, int nentries, int NoCol) const;

trunk/SophyaExt/FitsIOServer/fitsntuple.cc

@@ -104 +104 @@
       ColName[k][LONNOM] =  '\0';
     }
+  // Reza Dec 2006 : Colonnes du NTuple de type double par defaut 
   for (k=0; k<nbcols;k++)
     {
       FitsFile::FitsDataType ss= is.ColTypeFromFits(k);
       string type;
-      if (ss !=  FitsFile::FitsDataType_float) 
+      if ( (ss !=  FitsFile::FitsDataType_double) && (ss != FitsFile::FitsDataType_float) )
         {
-          if (ss == FitsFile::FitsDataType_double) type= string("double");
+          if (ss == FitsFile::FitsDataType_int) type= string("integer");
           else
-            if (ss == FitsFile::FitsDataType_int) type= string("integer");
+            if (ss == FitsFile::FitsDataType_char) type = string("char*");
             else
-              if (ss == FitsFile::FitsDataType_char) type = string("char*");
-              else
-                type = string("unknown");
+              type = string("unknown");
           cout << " WARNING: the column " << k << " on fits file is not float but : " << type << endl;
         } 
     }
+  bool fgdouble = true;
+  if ( is.ColTypeFromFits(0) == FitsFile::FitsDataType_float ) fgdouble = false;
   if(dobj_ == NULL) 
     { 
-      dobj_= new NTuple(nbcols,ColName);
+      dobj_= new NTuple(nbcols,ColName,512,fgdouble);
       ownobj_ = true;      
     }
@@ -128 +129 @@
     {
       dobj_->Clean();
-      (*dobj_) = NTuple(nbcols,ColName);
+      (*dobj_) = NTuple(nbcols,ColName,512,fgdouble);
     }
   for (k=0; k<nbcols;k++) 
@@ -136 +137 @@
   delete [] ColName;
 
-  float* ligne = new float[nbcols];
+  // Reza Dec 2006 : Colonnes du NTuple de type double par defaut 
+  double* dligne = NULL;
+  float* fligne = NULL;
+  if (fgdouble) dligne = new double[nbcols];
+  else fligne = new float[nbcols];
 
   int firstln, lastln;
@@ -150 +155 @@
     }
   int numLigne;
-  for (numLigne=firstln; numLigne < lastln; numLigne++)
-    {
-      is.GetBinTabLine(numLigne, ligne);
-      dobj_->Fill((r_4*)ligne);
-    }
-  delete [] ligne;
+  if (fgdouble) 
+    for (numLigne=firstln; numLigne < lastln; numLigne++) {
+      is.GetBinTabLine(numLigne, dligne);
+      dobj_->Fill((r_8*)dligne);
+    }
+  else 
+    for (numLigne=firstln; numLigne < lastln; numLigne++) {
+      is.GetBinTabLine(numLigne, fligne);
+      dobj_->Fill((r_4*)fligne);
+    }
+  
+  if (dligne) delete [] dligne;
+  if (fligne) delete [] fligne;
 
   dobj_->Info()=is.DVListFromFits();
@@ -191 +203 @@
     }
 
-  string type(ncols, 'E');
-  vector<int> dummy;
-
-  os.makeHeaderBntblOnFits(type,Noms, nentries, ncols, &dvl, extname, dummy);
-   float* column =  new float[nentries];
-   for (k=0; k<ncols;k++)
-     {
-       int j;
-       for(j = 0; j < nentries; j++) column[j]= dobj_->GetVal(j,k);
-       os.PutColToFits(k, nentries, column);
-     }
-   delete [] column;
-
-}
-
+  // Gestion NTuple en double ou float / Reza Jan 2006
+  if (dobj_->mFgDouble) {    // NTuple avec colonnes double
+    string type(ncols, 'D');
+    vector<int> dummy;
+    
+    os.makeHeaderBntblOnFits(type,Noms, nentries, ncols, &dvl, extname, dummy);
+    double* column =  new double[nentries];
+    for (k=0; k<ncols;k++)
+      {
+        int j;
+        for(j = 0; j < nentries; j++) column[j]= dobj_->GetCell(j,k);
+        os.PutColToFits(k, nentries, column);
+      }
+    delete [] column;
+  }
+  else {   // NTuple avec colonnes float
+    string type(ncols, 'E');
+    vector<int> dummy;
+    
+    os.makeHeaderBntblOnFits(type,Noms, nentries, ncols, &dvl, extname, dummy);
+    float* column =  new float[nentries];
+    for (k=0; k<ncols;k++)
+      {
+        int j;
+        for(j = 0; j < nentries; j++) column[j]= dobj_->GetVal(j,k);
+        os.PutColToFits(k, nentries, column);
+      }
+    delete [] column;
+  }
+}
+