Changeset 1352 in Sophya for trunk/SophyaExt

Timestamp:

Dec 7, 2000, 5:32:49 PM (25 years ago)

Author:

yvon

Message:

les arguments pointeur de diverses fonctions sont passes de int a int_4 etc
+ quelques debogues associes

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (12 diffs)
• fitsfile.h (modified) (5 diffs)
• fitsxntuple.cc (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -712 +712 @@
 \param <nentries>  number of data to be read
 */
-void FitsInFile::GetBinTabFCol(double* valeurs,int nentries, int NoCol) const
+void FitsInFile::GetBinTabFCol(r_8* valeurs,int nentries, int NoCol) const
     {
       int status= 0;
@@ -749 +749 @@
  same as previous method with float data 
 */
-void FitsInFile::GetBinTabFCol(float* valeurs,int nentries, int NoCol) const
+void FitsInFile::GetBinTabFCol(r_4* valeurs,int nentries, int NoCol) const
     {
       int status= 0;
@@ -786 +786 @@
 */
 
-void FitsInFile::GetBinTabFCol(int* valeurs,int nentries, int NoCol) const
+void FitsInFile::GetBinTabFCol(int_4* valeurs,int nentries, int NoCol) const
     {
       int status= 0;
@@ -853 +853 @@
 \param <nentries>  number of data to be read
 */
-void FitsInFile::GetSingleColumn(double* map, int nentries) const
+void FitsInFile::GetSingleColumn(r_8* map, int nentries) const
 { 
   int status = 0;
@@ -888 +888 @@
 same as above with float data 
 */
-void FitsInFile::GetSingleColumn(float* map, int nentries) const
+void FitsInFile::GetSingleColumn(r_4* map, int nentries) const
 {
   int status = 0;
@@ -921 +921 @@
  same as above with int data 
 */
-void FitsInFile::GetSingleColumn( int* map, int nentries) const
+void FitsInFile::GetSingleColumn( int_4* map, int nentries) const
 {
   int status = 0;
@@ -1328 +1328 @@
 \param <nbData>  number of data to be written
 */
-void FitsOutFile::PutImageToFits(int nbData, double* map) const
+void FitsOutFile::PutImageToFits(int nbData, r_8* map) const
 {
   int status = 0;
@@ -1340 +1340 @@
 same as previous method with float data 
 */
-void FitsOutFile::PutImageToFits(int nbData, float* map) const
+void FitsOutFile::PutImageToFits(int nbData, r_4* map) const
 {
   int status = 0;
@@ -1352 +1352 @@
 
  same as previous method with int data */
-void FitsOutFile::PutImageToFits( int nbData, int* map) const
+void FitsOutFile::PutImageToFits( int nbData, int_4* map) const
 {
   int status = 0;
@@ -1480 +1480 @@
 \param <nentries>  number of data to be written
 */
-void FitsOutFile::PutColToFits(int nocol, int nentries, double* donnees) const
+void FitsOutFile::PutColToFits(int nocol, int nentries, r_8* donnees) const
 {
   int status = 0;
@@ -1509 +1509 @@
 same as previous method with float data 
 */
-void FitsOutFile::PutColToFits(int nocol, int nentries, float* donnees) const
+void FitsOutFile::PutColToFits(int nocol, int nentries, r_4* donnees) const
 {
   int status = 0;
@@ -1541 +1541 @@
 same as previous method with int data 
 */
-void FitsOutFile::PutColToFits(int nocol, int nentries, int* donnees) const
+void FitsOutFile::PutColToFits(int nocol, int nentries, int_4* donnees) const
 {
   int status = 0;

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -68 +68 @@
      FitsDataType_int,
      FitsDataType_char,
-     FitsDataType_ASCII,
+     FitsDataType_ASCII
    };
 
@@ -171 +171 @@
  void   GetBinTabLine(long NoLine, BnTblLine& ligne) ;
  void   GetBinTabLine(int NoLine, float* fdata) ;
- void   GetBinTabFCol(double* valeurs, int nentries, int NoCol) const;
- void   GetBinTabFCol(float* valeurs, int nentries, int NoCol) const;
- void   GetBinTabFCol(int* valeurs, int nentries,  int NoCol) const;
+ void   GetBinTabFCol(r_8* valeurs, int nentries, int NoCol) const;
+ void   GetBinTabFCol(r_4* valeurs, int nentries, int NoCol) const;
+ void   GetBinTabFCol(int_4* valeurs, int nentries,  int NoCol) const;
  void   GetBinTabFCol(char** valeurs,int nentries, int NoCol) const;
 
@@ -189 +189 @@
 
 
-  void    GetSingleColumn(double* map, int nentries) const;
-
-  void    GetSingleColumn(float*  map, int nentries) const;
-
-  void    GetSingleColumn(int* map, int nentries) const;
+  void    GetSingleColumn(r_8* map, int nentries) const;
+
+  void    GetSingleColumn(r_4*  map, int nentries) const;
+
+  void    GetSingleColumn(int_4* map, int nentries) const;
 
   private :
@@ -240 +240 @@
 
    void makeHeaderImageOnFits(char type, int nbdim, int* naxisn, DVList* dvl) ;
-   void PutImageToFits( int nbData, double* map) const;
-   void PutImageToFits(int nbData, float* map ) const;
-   void PutImageToFits(int nbData, int* map) const;
+   void PutImageToFits( int nbData, r_8* map) const;
+   void PutImageToFits(int nbData, r_4* map ) const;
+   void PutImageToFits(int nbData, int_4* map) const;
 
 
@@ -253 +253 @@
 
    void makeHeaderBntblOnFits ( string fieldType, vector<string> Noms, int nentries, int tfields, DVList* dvl, string extname,  vector<int> taille_des_chaines) ;
-   void PutColToFits(int nocol, int nentries, double* donnees) const;
-   void PutColToFits(int nocol, int nentries, float* donnees) const;
-   void PutColToFits(int nocol, int nentries, int* donnees) const;
+   void PutColToFits(int nocol, int nentries, r_8* donnees) const;
+   void PutColToFits(int nocol, int nentries, r_4* donnees) const;
+   void PutColToFits(int nocol, int nentries, int_4* donnees) const;
    void PutColToFits(int nocol, int nentries, char** donnees) const;
    void PutBinTabLine(long NoLine,  BnTblLine& ligne) const;

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -260 +260 @@
    if (dobj_->NIVar() > 0)
      { 
-       int* icolumn = new int[nrows];
+       int_4* icolumn = new int_4[nrows];
        for (k=0; k<dobj_->NIVar();k++)
          {