clean up code

3 files changed, 21 insertions, 21 deletions

diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C
index ae59cc1..243a562 100644
--- a/tksao/frame/basecommand.C
+++ b/tksao/frame/basecommand.C
@@ -2337,7 +2337,7 @@ void Base::hasWCSCmd(Coord::CoordSystem sys)
 
 void Base::hasWCSAltCmd()
 {
-  Tcl_AppendResult(interp, (currentContext->cfits && currentContext->cfits->wcsHeader() ? "1" : "0"), NULL);
+  Tcl_AppendResult(interp, (currentContext->cfits && currentContext->cfits->wcsAltHeader() ? "1" : "0"), NULL);
 }
 
 void Base::hasWCSCelCmd(Coord::CoordSystem sys)
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
index 51ab692..0d35f5f 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -126,7 +126,7 @@ FitsImage::FitsImage(Context* cx, Tcl_Interp* pp)
   wcs3DSav_ =NULL;
   wcsHPXSav_ =0;
 #endif
-  wcsHeader_ =NULL;
+  wcsAltHeader_ =NULL;
   wfpc2Header_ =NULL;
 
   iisMode_ =0;
@@ -216,8 +216,8 @@ FitsImage::~FitsImage()
   }
 #endif
 
-  if (wcsHeader_)
-    delete wcsHeader_;
+  if (wcsAltHeader_)
+    delete wcsAltHeader_;
   if (wfpc2Header_)
     delete wfpc2Header_;
 }
@@ -972,11 +972,11 @@ void FitsImage::appendWCS(istream& str)
   memcpy(cards+hd->headbytes(), hh->cards(), hh->headbytes());
 
   delete hh;
-  if (wcsHeader_)
-    delete wcsHeader_;
+  if (wcsAltHeader_)
+    delete wcsAltHeader_;
 
-  wcsHeader_ = new FitsHead(cards,ll,FitsHead::ALLOC);
-  initWCS(wcsHeader_, NULL);
+  wcsAltHeader_ = new FitsHead(cards,ll,FitsHead::ALLOC);
+  initWCS(wcsAltHeader_, NULL);
 }
 
 char* FitsImage::display(FitsHead* hd)
@@ -1015,8 +1015,8 @@ char* FitsImage::displayPrimary()
 
 char* FitsImage::displayWCS()
 {
-  if (wcsHeader_)
-    return display(wcsHeader_);
+  if (wcsAltHeader_)
+    return display(wcsAltHeader_);
   else if (wfpc2Header_)
     return display(wfpc2Header_);
   else
@@ -1337,10 +1337,10 @@ void FitsImage::resetWCS()
   objectKeyword_ = dupstr(image_->getString("OBJECT"));
 
   // Process WCS keywords
-  if (wcsHeader_)
-    delete wcsHeader_;
+  if (wcsAltHeader_)
+    delete wcsAltHeader_;
 
-  wcsHeader_ = NULL;
+  wcsAltHeader_ = NULL;
   initWCS(image_->head(),
 	  image_->primary() && image_->inherit() ? image_->primary() : NULL);
 }
@@ -1350,8 +1350,8 @@ void FitsImage::initWCS0(const Vector& pix)
 {
   FitsHead* hd =NULL;
   FitsHead* prim =NULL;
-  if (wcsHeader_)
-    hd = wcsHeader_;
+  if (wcsAltHeader_)
+    hd = wcsAltHeader_;
   else if (wfpc2Header_)
     hd = wfpc2Header_;
   else {
@@ -2490,11 +2490,11 @@ void FitsImage::replaceWCS(istream& str)
   objectKeyword_ = dupstr(hh->getString("OBJECT"));
 
   // Process WCS keywords
-  if (wcsHeader_)
-    delete wcsHeader_;
+  if (wcsAltHeader_)
+    delete wcsAltHeader_;
 
-  wcsHeader_ = hh;
-  initWCS(wcsHeader_, NULL);
+  wcsAltHeader_ = hh;
+  initWCS(wcsAltHeader_, NULL);
 }
 
 void FitsImage::reset()
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index ed85307..6db675d 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -129,7 +129,7 @@ class FitsImage {
   int* wcs3DSav_;
   int wcsHPXSav_;
 #endif
-  FitsHead* wcsHeader_; // alt wcs header
+  FitsHead* wcsAltHeader_; // alt wcs header
   FitsHead* wfpc2Header_; // wcs header for wfpc2
 
   Matrix wcsToRef_;          // iraf/wcs matrix
@@ -380,7 +380,7 @@ class FitsImage {
   int hasATMV() {return keyATMV;}
   int hasDTMV() {return keyDTMV;}
 
-  FitsHead* wcsHeader() {return wcsHeader_;}
+  FitsHead* wcsAltHeader() {return wcsAltHeader_;}
 
   int isIIS() {return iisMode_;}
   Vector& iisz() {return iisz_;}