Changeset 861 in Sophya for trunk/SophyaExt

Timestamp:

Apr 10, 2000, 3:30:31 PM (25 years ago)

Author:

ansari

Message:

modif lecture Header image

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (3 diffs)
• fitsfile.h (modified) (3 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -147 +147 @@
       }
 }
-void FitsFile::makeHeaderImageOnFits(char type, int naxis1,int naxis2,int naxis3) const
-{
-  int status = 0;
-  long naxis = 3;
-  if (naxis3 <=1)
-    {
-      naxis--;
-      if (naxis2 <=1) naxis--;
-    }
-  long naxes[3];
-  naxes[0]= naxis1;
-  naxes[1]= naxis2;
-  naxes[2]= naxis3;
+void FitsFile::makeHeaderImageOnFits(char type, int nbdim, int* naxisn) const
+{
+  int status = 0;
+  long naxis = nbdim;
+  long* naxes = new long[nbdim];
+  for (int k=0; k< nbdim; k++) naxes[k] = (long)naxisn[k];
   if (type == 'D')
     fits_create_img(fptr_,DOUBLE_IMG,naxis,naxes,&status);
@@ -173 +166 @@
           throw PException("FitsFile:::makeHeaderImageOnFits:unprogrammed type of data ");
         }
+  delete [] naxes;
   if( status ) printerror( status );
 
@@ -221 +215 @@
 
   // read the NAXIS1 and NAXIS2 keyword to get image size
-  long naxes[3]= {0,0,0};
+  long* naxes = new long[naxis_] ;
   int nfound;
   fits_read_keys_lng(fptr_,"NAXIS",1,naxis_,naxes,&nfound,&status);
   if( status ) printerror( status );
-
-  naxis1_ = (int)naxes[0];
-  naxis2_ = (int)naxes[1];
-  naxis3_ = (int)naxes[2];
-
-  if(naxis_ == 3 && naxis3_ > 1) 
-    {
-      cout << "multi-dimensional image =" << naxis << endl;
-      cout << "length Z axis = " << naxis3_ << endl;
-      throw IOExc("FitsFile::put_fits_image %%Expected 1-D data or 2-D data");
-    }
-
-  nbData_ =  naxis1_;
-  if(naxis >= 2) nbData_*= naxis2_;
-  if(naxis == 3) nbData_*= naxis3_;
-}
-
-int FitsFile::nbDimOfImage() const
-{
-  int ndim=3;
-  if (naxis_ <3 ||  naxis3_ <= 1) ndim-- ;
-  if (naxis_ <2 || (naxis3_ <= 1 && naxis2_ <= 1) ) ndim--;
-  return ndim;
-}
+  if (nfound != naxis_ ) 
+    cout << " WARNING : " << nfound << " axes found, expexted naxis= " << naxis_ << endl;
+  int lastSize = naxes[naxis_-1]; 
+  while (lastSize <= 1) 
+    {
+      naxis_--;
+      lastSize = naxes[naxis_-1];
+    }
+
+  nbData_ =  1;
+  for (int k=0; k<naxis_; k++) 
+    {
+      naxisn_.push_back( (int)naxes[k] );
+      if (naxisn_[k] > 0) nbData_ *= naxisn_[k];
+
+    }
+  delete [] naxes;
+}
+
  
   void FitsFile::GetBinTabFCol(double* valeurs,int nentries, int NoCol) const

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -26 +26 @@
   void    GetSingleColumn(float*  map, int nentries) const;
   void    GetSingleColumn(int* map, int nentries) const;
-  int     nbDimOfImage() const;
+inline int nbDimOfImage() const {return naxis_;}
 inline int nbOfImageData() const { return nbData_; }
- inline void dimOfImageAxes(int& naxis1, int& naxis2, int& naxis3) const
-   {
-     naxis1 = naxis1_;
-     naxis2 = naxis2_;
-     naxis3 = naxis3_;
-   }
+ inline const vector<int>& dimOfImageAxes() const { return naxisn_;}
   int     NbColsFromFits() const;
   char    ColTypeFromFits(int nocol) const;
@@ -53 +48 @@
   void putColToFits(int nocol, int nentries, char** donnees) const;
   // Write elements into an ASCII or binary table column
-  void makeHeaderImageOnFits(char type, int naxis1,int naxis2,int naxis3) const;
+  void makeHeaderImageOnFits(char type, int nbdim, int* naxisn) const;
   void makeHeaderBntblOnFits ( char* fieldType, char** Noms, int nentries, int tfields, DVList &dvl, char* extname,  vector<int> taille_des_chaines) const;
 
@@ -79 +74 @@
   int bitpix_;
   int naxis_;
-  int naxis1_;
-  int naxis2_;
-  int naxis3_;
+  vector<int> naxisn_;
   int nbData_;