Changeset 1814 in Sophya

Timestamp:

Dec 14, 2001, 12:00:21 PM (24 years ago)

Author:

cmv

Message:

lecture/ecriture clefs fits cmv 14/12/01

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fabtcolread.cc (modified) (1 diff)
• fabtcolread.h (modified) (1 diff)
• fabtwriter.cc (modified) (2 diffs)
• fabtwriter.h (modified) (3 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -244 +244 @@
 }
 
+//////////////////////////////////////////////////////////////
+double FitsABTColRead::ReadKey(char *keyname)
+{
+ if(keyname==NULL) return 0.;
+ int sta=0; double val;
+ if(fits_read_key(FitsPtr,TDOUBLE,keyname,&val,NULL,&sta))
+   printerror(sta);
+ return val;
+}
 
 //////////////////////////////////////////////////////////////

trunk/SophyaExt/FitsIOServer/fabtcolread.h

@@ -29 +29 @@
 
   void ChangeBuffer(long blen=100,long bsens=1);
+
+  double ReadKey(char *keyname);
 
   double Read(long n,bool usebuffer=true);

trunk/SophyaExt/FitsIOServer/fabtwriter.cc

@@ -111 +111 @@
 {
  int sta = 0;
+ writekeys();
  if(fits_close_file(FitsPtr,&sta)) printerror(sta);
  FitsPtr = NULL;
+}
+
+/*! Flush the FitsIO buffer to set good Fits file in case of problems */
+void FitsABTWriter::Flush(void)
+{
+ if(FitsPtr==NULL) return;
+ int sta = 0;
+ if(fits_flush_file(FitsPtr,&sta)) printerror(sta);
+}
+
+/*! Write a double value into Fits Header */
+void FitsABTWriter::WriteKey(const char *keyname,double val,char* comment)
+{
+ if(keyname==NULL || strlen(keyname)<=0) return;
+ KeyDouble k;
+ k.keyname=keyname;
+ k.val=val;
+ if(comment) k.comment=comment; else k.comment="";
+ DoubleKey.push_back(k);
+}
+
+/*! Write a long value into Fits Header */
+void FitsABTWriter::WriteKey(const char *keyname,long val,char* comment)
+{
+ if(keyname==NULL || strlen(keyname)<=0) return;
+ KeyLong k;
+ k.keyname=keyname;
+ k.val=val;
+ if(comment) k.comment=comment; else k.comment="";
+ LongKey.push_back(k);
+}
+
+void FitsABTWriter::writekeys(void)
+// Ecriture effective des clefs
+{
+ int sta=0;
+ if(DoubleKey.size()>0)
+   for(unsigned int i=0;i<DoubleKey.size();i++) {
+     char* key = const_cast<char*>(DoubleKey[i].keyname.c_str());
+     char* com = const_cast<char*>(DoubleKey[i].comment.c_str());
+     double val = DoubleKey[i].val;
+     if(fits_update_key(FitsPtr,TDOUBLE,key,&val,com,&sta))
+       printerror(sta);
+   }
+ if(LongKey.size()>0)
+   for(unsigned int i=0;i<LongKey.size();i++) {
+     char* key = const_cast<char*>(LongKey[i].keyname.c_str());
+     char* com = const_cast<char*>(LongKey[i].comment.c_str());
+     long val = LongKey[i].val;
+     if(fits_update_key(FitsPtr,TLONG,key,&val,com,&sta))
+       printerror(sta);
+   }
+ DoubleKey.resize(0);
+ LongKey.resize(0);
 }
 
@@ -208 +263 @@
    throw NullPtrError("FitsABTWriter::createtbl: Error creating Table extension\n");
  }
+
+ // Append Fits key
+ writekeys();
 
  // menage

trunk/SophyaExt/FitsIOServer/fabtwriter.h

@@ -22 +22 @@
   FitsABTWriter(const char* cfname,int hdutype=BINARY_TBL,int lp=0);
   virtual ~FitsABTWriter();
+
+  void Flush(void);
+
+  //! Write a double value in Fits header.
+  void WriteKey(const char *keyname,double val,char* comment=NULL);
+  //! Write a long value in Fits header.
+  void WriteKey(const char *keyname,long val,char* comment=NULL);
 
   //! Add a new column to the FITS table and return its number (see addcol).
@@ -58 +65 @@
 
 protected:
+  struct KeyDouble {string keyname; double val; string comment;};
+  struct KeyLong   {string keyname; long   val; string comment;};
+
   void createfits(const char *cfname,int hdutype,int lp);
   int addcol(const char* label,const char* tform
             ,const char* tunit,int datatype);
   void createtbl(void);
+  void writekeys(void);
   void printerrorwrite(const char* type,int col,long row,int sta);
   void printerror(int sta) const;
@@ -74 +85 @@
   vector<string> TUnit;
   unsigned long NOverFlow;
+
+  vector<struct KeyDouble> DoubleKey;
+  vector<struct KeyLong>   LongKey;
 };