Changeset 1510 for trunk/src

Timestamp:

02/18/09 15:15:57 (16 years ago)

Author:

Malte Marquarding

Message:

Ticket #110: export velocity if restfreq is given otherwise frequency. add elevattion,azimuth etc to FITS header

File:

• trunk/src/STFITSImageWriter.cpp (modified) (2 diffs)

trunk/src/STFITSImageWriter.cpp

@@ -190 +190 @@
       throw(AipsError(errMsg));
     }
+    
+    int status = 0;
+    fitsfile *fptr;     
+    if( fits_open_file(&fptr, fileName.c_str(), READWRITE, &status) ) 
+      throw AipsError("Coudn't open fits file for modification");
+
     if (isClass_) {
       // Add CLASS specific information
@@ -196 +202 @@
       // CTYPE1 :  FREQ-XYZ -> FREQ
       // CRVAL1 :  -> CRVAL1-RESTFREQ
-      int status = 0;
-      fitsfile *fptr;     
-      if( fits_open_file(&fptr, fileName.c_str(), READWRITE, &status) ) 
-        throw AipsError("Coudn't open fits file for CLASS modification");
-
+      
       // Use preferVelocity which seems to work.
       // When no restfrequency is given this will set up the correct
       // frequency axis. Otherwise it uses a velocity axis
-      //       if ( fits_update_key(fptr, TSTRING, "CTYPE1", (char *)"FREQ",
-      //                            NULL, &status) )
-      //         throw AipsError("Couldn't modify CTYPE1.");
-      //       float restf,refval,newfreq;
-      //       fits_read_key(fptr, TFLOAT, "CRVAL1", 
-      //                     &refval, NULL, &status);
-      //       fits_read_key(fptr, TFLOAT, "RESTFREQ", 
-      //                     &restf, NULL, &status);
-      //       newfreq = refval - restf;
-      //       if ( fits_update_key(fptr, TFLOAT, "CRVAL1", &newfreq,  NULL, &status) )
-      //         throw AipsError("Couldn't modify CRVAL1");
-
-
-      Float tsys = stable.getTsys(row0);
-      if ( fits_update_key(fptr, TFLOAT, "TSYS", &tsys,
-                           "System temperature", &status) ) {
-        throw AipsError("Couldn't modify TSYS");        
+      char ctyp[84];
+      fits_read_key(fptr, TSTRING, "CTYPE1", ctyp, NULL, &status);
+      if (String(ctyp).contains("FREQ", 0)) {
+        float restf,refval;
+        fits_read_key(fptr, TFLOAT, "CRVAL1", 
+                      &refval, NULL, &status);
+        restf = 0.0;
+        if ( fits_update_key(fptr, TFLOAT, "CRVAL1", &restf,
+                             NULL, &status) ) {
+          throw AipsError("Couldn't modify CRVAL1");        
+        }
+        if ( fits_update_key(fptr, TFLOAT, "RESTFREQ", &refval,
+                             NULL, &status) ) {
+          throw AipsError("Couldn't modify RESTFREQ");        
+        }
+      } else {
+        float refval = sC.referenceValue()[0];
+        if ( fits_update_key(fptr, TFLOAT, "RESTFREQ", &refval,
+                             NULL, &status) ) {
+          throw AipsError("Couldn't modify RESTFREQ");        
+        }
+        
       }
-      Float otime = Float(stable.getIntTime(row0));
-      if ( fits_update_key(fptr, TFLOAT, "OBSTIME", &otime,
-                           "Integration time", &status) ) {
-        throw AipsError("Couldn't modify OBSTIME");        
-      }
-
-      const char* oname = stable.getSourceName(row0).c_str();
-      if ( fits_update_key(fptr, TSTRING, "OBJECT", (char *)oname,
-                           NULL, &status) ) {
-        throw AipsError("Couldn't modify OBJECT");        
-      }
-      fits_close_file(fptr, &status);
-    }
+    }
+
+    Float tsys = stable.getTsys(row0);
+    if ( fits_update_key(fptr, TFLOAT, "TSYS", &tsys,
+                         "System temperature", &status) ) {
+      throw AipsError("Couldn't modify TSYS");        
+    }
+    Float otime = Float(stable.getIntTime(row0));
+    if ( fits_update_key(fptr, TFLOAT, "OBSTIME", &otime,
+                         "Integration time", &status) ) {
+      throw AipsError("Couldn't modify OBSTIME");        
+    }
+    
+    const char* oname = stable.getSourceName(row0).c_str();
+    if ( fits_update_key(fptr, TSTRING, "OBJECT", (char *)oname,
+                         NULL, &status) ) {
+      throw AipsError("Couldn't modify OBJECT");        
+    }
+    Float elev = stable.getElevation(row0)/C::pi*180.0;
+    if ( fits_update_key(fptr, TFLOAT, "ELEVATIO", &elev,
+                         "Telescope elevation (degrees)", &status) ) {
+      throw AipsError("Couldn't modify ELEVATIO");        
+    }
+    Float azi = stable.getAzimuth(row0)/C::pi*180.0;
+    if ( fits_update_key(fptr, TFLOAT, "AZIMUTH", &azi,
+                         "Telescope azimuth (degrees)", &status) ) {
+      throw AipsError("Couldn't modify AZIMUTH");        
+    }
+    fits_close_file(fptr, &status);
+  
     //pushLog(String(oss));
     ++iter;