Changeset 1752 in Sophya

Timestamp:

Nov 13, 2001, 3:35:05 PM (24 years ago)

Author:

lemeur

Message:

interface avec spheres theta-phi

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (9 diffs)
• fitsspherehealpix.h (modified) (1 diff)
• fitsspherethetaphi.cc (added)
• fitsspherethetaphi.h (added)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -839 +839 @@
       //          status = 0;
       //        }
-      if (nentries != nrows_*repeat)
-        {
-          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat << endl;
-          throw PException(" FitsFile:::GetBinTabFCol ");
-        }
+      //   if (nentries != nrows_*repeat)
+      //        {
+      //          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat << endl;
+          //      throw PException(" FitsFile:::GetBinTabFCol ");
+      //        }
       fits_read_col(fptr_,TDOUBLE,NoCol+1,1,1,nels,&dnull,valeurs,
                             &anull,&status);
@@ -878 +878 @@
       //          status = 0;
       //        }
-      if (nentries != nrows_*repeat)
-        {
-          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat << endl;
-          throw PException(" FitsFile:::GetBinTabFCol ");
-        }
+      //  if (nentries != nrows_*repeat)
+      //        {
+      //          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat << endl;
+          //      throw PException(" FitsFile:::GetBinTabFCol ");
+      //        }
       fits_read_col(fptr_,TFLOAT,NoCol+1,1,1,nels,&fnull,valeurs,
                             &anull,&status);
@@ -899 +899 @@
       long repeat,width;
       fits_get_coltype(fptr_, NoCol+1,&DTYPE,&repeat,&width,&status);
-      if( DTYPE != TLONG &&  DTYPE != TINT &&  DTYPE != TSHORT ) 
-        {
-          throw IOExc("FitsFile::GetBinTabFCol, tentative de lecture non entier");
+      cout << " en lecture fits trouve le type " << DTYPE << endl;
+      if( DTYPE != TLONG &&  DTYPE != TINT) 
+        {
+          throw IOExc("FitsFile::GetBinTabFCol, probleme de lecture d'entiers");
         }
       long nels=nentries;
@@ -913 +914 @@
       //          status = 0;
       //        }
-      if (nentries != nrows_*repeat)
-        {
-          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat << endl;
-          throw PException(" FitsFile:::GetBinTabFCol ");
-        }
+      // if (nentries != nrows_*repeat)
+      //        {
+      //          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat << endl;
+          //      throw PException(" FitsFile:::GetBinTabFCol ");
+      //        }
+
+
+
+      // voir commentaire dans putColToFits()
       fits_read_col(fptr_,TINT,NoCol+1,1,1,nels,&inull,valeurs,
                             &anull,&status);
@@ -942 +947 @@
       int    anull;
       char* cnull= "";
-      if (nentries != nrows_*repeat/width)
-        {
-          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat/width << endl;
-          throw PException(" FitsFile:::GetBinTabFCol ");
-        }
+      // if (nentries != nrows_*repeat/width)
+      //        {
+      //          cout << " found " << nentries << " pixels, expected:  " << nrows_*repeat/width << endl;
+          //      throw PException(" FitsFile:::GetBinTabFCol ");
+      //        }
       long frow=1;
       long felem=1;
@@ -1623 +1628 @@
   //  for (int toto=0; toto < 10; toto++) cout << donnees[toto] << endl;
   fits_write_col(fptr_,TDOUBLE,nocol+1,1,1,nentries, donnees ,&status);
-  if( status )  printerror( status,"erreur ecriture du fichier fits" );
+  if( status )  printerror( status,"erreur ecriture col. double, dans fichier fits" );
 }
 
@@ -1656 +1661 @@
     } 
   fits_write_col(fptr_,TFLOAT,nocol+1,1,1,nentries, donnees ,&status);
-  if( status )  printerror( status,"erreur ecriture du fichier fits" );
+  if( status )  printerror( status,"erreur ecriture col. floats, dans fichier fits" );
 }
 
@@ -1683 +1688 @@
   long repeat, width;
   fits_get_coltype(fptr_, nocol+1, &code, &repeat,&width, &status);
-  if( code != TLONG &&  code != TINT &&  code != TSHORT ) 
-    {
-      cout << " WARNING : types don't match (PutColToFits) : on fits file= " << code << " (FITS code), to be written= INT " << endl;
+    
+
+// la logique voudrait qu'on distingue TLONG et TINT. Mais si j'ecris 
+// et relis immediatement quelque chose en TLONG l'experience montre 
+// que ca foire. Donc, je fais tout en TINT, d'ailleurs cfitsio n'a pas
+// (apparemment) d'entiers de longueur superieure a 32 bits.
+// En fait, je n'y comprend rien. A suivre (GLM).
+  if (code == TINT || code == TLONG )
+    {
+      cout << " j'ecris des TINT" << endl;
+      fits_write_col(fptr_,TINT,nocol+1,1,1,nentries, donnees ,&status);
+    }
+  else if (code == TSHORT) 
+    {
+      cout << " j'ecris des TSHORT " << endl;
+      fits_write_col(fptr_,TSHORT,nocol+1,1,1,nentries, donnees ,&status);
+    }
+  else
+    {
+      cout << " WARNING : types don't match (PutColToFits) : on fits file= " << code << " (FITS code), to be written= integers " << endl;
     } 
-  fits_write_col(fptr_,TINT,nocol+1,1,1,nentries, donnees ,&status);
-  if( status )  printerror( status," ecriture du fichier fits" );
+  if( status )  printerror( status,"erreur ecriture col. entiers, dans fichier fits" );
 }
 
@@ -1719 +1740 @@
     } 
   fits_write_col(fptr_,TSTRING,nocol+1,1,1,nentries, donnees ,&status);
-  if( status )  printerror( status,"erreur ecriture du fichier fits" );
+  if( status )  printerror( status,"erreur ecriture col. chars, dans fichier fits" );
 }
 

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h

@@ -30 +30 @@
 void Mollweide_picture_projection(char flnm[]);
 void sinus_picture_projection(char flnm[]);
- void ReWriteFromFitsToFits(FitsInFile& headerin, FitsOutFile& os); 
-
+//void ReWriteFromFitsToFits(FitsInFile& headerin, FitsOutFile& os); 
 
 inline operator SphereHEALPix<T>() { return(*dobj_); }