Changeset 1246 in Sophya for trunk/SophyaExt

Timestamp:

Oct 19, 2000, 4:35:11 PM (25 years ago)

Author:

ansari

Message:

dvlist dans primary header de fits

Location:

trunk/SophyaExt/FitsIOServer

Files:

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

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -104 +104 @@
 void FitsIOHandler::Read(FitsInFile& is, int hdunum) 
 {
-  //  if (hdunum == 0 ) is.moveToFollowingHeader();
-  //  else is.ReadFInit(hdunum);
   is.ReadFInit(hdunum);
   ReadFromFits(is);
@@ -199 +197 @@
   \class SOPHYA::FitsInFile
 
-class for saving  SOPHYA objects on FITS Format Files (uses cfitsio lib)
+class for reading  SOPHYA objects from FITS Format Files (uses cfitsio lib)
 */
 
@@ -341 +339 @@
         {
           // on calcule le numero de header a lire
-          if (imageOnPrimary_ == true) hdunum_ = 1;
+          if (imageOnPrimary_ == true ) hdunum_ = 1;
           else hdunum_ = 2;
         }
@@ -420 +418 @@
       else
         {
-          throw PException(" first header : no image, probably error in hdunum");
+          // the object to be read is probably a bin or ascii table
+          // (on an extension)
+          hdunum_++;
+          getHeader();
+
+          //      throw PException(" first header : no image, probably error in hdunum");
         }
     }
@@ -1193 +1196 @@
   long naxis = nbdim;
   long* naxes = new long[nbdim];
-  //  if (hdunum_ == 1)
-  if (hdunum_ == 0)
+  bool hdunfirst= (hdunum_ == 0);
+  if (hdunfirst)
     {
       if (imageOnPrimary_ == false)
@@ -1200 +1203 @@
           hdunum_ = 1;
           fits_create_img(fptr_,FLOAT_IMG,0,naxes,&status);
-          writeSignatureOnFits();       }
-      //      else  hdunum_--;
+        }
     }
   int k;
@@ -1218 +1220 @@
           throw PException("FitsFile:::makeHeaderImageOnFits:unprogrammed type of data ");
         }
-
+  // on ajoute eventuellement un dvlist prepare et la doc SOPHYA
   hdunum_++;
+  if (hdunfirst) 
+    {
+      addDVListOnPrimary();
+      writeSignatureOnFits(1);
+    }
 
   // write supplementary keywords
@@ -1242 +1249 @@
   fits_write_img(fptr_,TDOUBLE,1,npix,map,&status); 
   if( status ) printerror( status, "erreur ecriture PutImageToFits" );
-  //  writeSignatureOnFits();
 }
 
@@ -1255 +1261 @@
   fits_write_img(fptr_,TFLOAT,1,npix, map,&status); 
   if( status ) printerror( status, "erreur ecriture PutImageToFits" );
-  //  writeSignatureOnFits();
 
 }
@@ -1269 +1274 @@
   fits_write_img(fptr_,TINT,1,npix,map,&status); 
   if( status ) printerror( status, "erreur ecriture PutImageToFits" );
-  //  writeSignatureOnFits();
 }
 
@@ -1366 +1370 @@
                   NULL,extn,&status);
   if( status ) printerror( status );
-  if ( hdunum_ == 0 ) hdunum_ = 2;
+  // on ajoute eventuellement un dvlist prepare
+  if ( hdunum_ == 0 )
+    {
+      hdunum_ = 2;
+      addDVListOnPrimary();
+      writeSignatureOnFits(1);
+    }
   else  hdunum_++;
   int ii;
@@ -1543 +1553 @@
 Put keywords from a DVList into the primary header of the fits-file 
 */
-void  FitsOutFile::DVListIntoPrimaryHeader(DVList& dvl) const
+void  FitsOutFile::DVListIntoPrimaryHeader(DVList& dvl) 
 {
   int status = 0;
   int hdutype;
-  fits_movabs_hdu(fptr_,1,&hdutype,&status);
-  addKeywordsOfDVList(dvl);
-  fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
-}
-
-
-void FitsOutFile::writeSignatureOnFits() const
-{
-  int status = 0;
+  if (hdunum_ == 0) 
+    {
+      if (dvlToPrimary_ == NULL) dvlToPrimary_ = new DVList(dvl);
+      else dvlToPrimary_->Merge(dvl);
+    }
+  else
+    {
+      fits_movabs_hdu(fptr_,1,&hdutype,&status);
+      addKeywordsOfDVList(dvl);
+      fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
+    }
+}
+
+
+void FitsOutFile::writeSignatureOnFits(int hdunum) const
+{
+  int status = 0;
+  int hdutype;
   char keyname[LEN_KEYWORD];
   char strval[FLEN_VALUE];
   char comment[FLEN_COMMENT];
+  if (hdunum_ == 0) 
+    {
+      cerr << " WARNING : can't write keywords on non existing primary header" << endl;
+      return;
+    }
+  fits_movabs_hdu(fptr_,1,&hdutype,&status);
+  //
   strncpy(keyname, "CREATOR", LEN_KEYWORD); 
   keyname[LEN_KEYWORD-1] = '\0';
@@ -1572 +1598 @@
   fits_write_comment(fptr_,"..............................................", &status);
   if( status ) printerror( status, "erreur writeSignatureOnFits"  );
-}
-
-
-void FitsOutFile::addKeywordsOfDVList(DVList& dvl) const
+  //
+  fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
+}
+
+
+void FitsOutFile::addKeywordsOfDVList( DVList& dvl) const
 {
   int status = 0;
   fits_write_comment(fptr_,"---------- keywords from SOPHYA ---------", &status);
-  if (hdunum_ == 1) writeSignatureOnFits();
   DVList::ValList::const_iterator it;
   for(it = dvl.Begin(); it != dvl.End(); it++)
@@ -1631 +1658 @@
 
 
-
+void FitsOutFile::addDVListOnPrimary()
+    {
+      int status = 0;
+      int hdutype;
+      if (hdunum_ == 0) 
+        {
+          cerr << " WARNING : can't write keywords on non existing primary header" << endl;
+          return;
+        }
+      if (dvlToPrimary_ != NULL)
+        {
+          fits_movabs_hdu(fptr_,1,&hdutype,&status);
+          addKeywordsOfDVList(*dvlToPrimary_);
+          delete dvlToPrimary_;
+          dvlToPrimary_ = NULL;
+          fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
+        }
+    }
+

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -213 +213 @@
    FitsOutFile(string const & flnm, WriteMode wrm = unknown );
    FitsOutFile(const char * flnm, WriteMode wrm = unknown );
-   ~FitsOutFile() { ;};
-   inline void InitNull() {;}
+   ~FitsOutFile() { if (dvlToPrimary_ != NULL) delete dvlToPrimary_;};
+   inline void InitNull() {dvlToPrimary_ = NULL;}
 
        //////////////////////////////////////////////////////////
@@ -253 +253 @@
 
 
-void  DVListIntoPrimaryHeader(DVList& dvl) const;
+void  DVListIntoPrimaryHeader(DVList& dvl) ;
 
 
@@ -260 +260 @@
 
   void openoutputfitsfile(const char * flnm, WriteMode wrm);
-  void writeSignatureOnFits() const; 
-  void addKeywordsOfDVList(DVList& dvl) const;
-
-
+  void writeSignatureOnFits(int hdunum) const; 
+  void addKeywordsOfDVList( DVList& dvl) const;
+  void addDVListOnPrimary();
+
+  DVList* dvlToPrimary_; /**< for transferring keywords when creating primary header */
  };