From 526141b885e57d365dd59e388188ec19def3fe3f Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Mon, 4 Dec 2017 12:38:50 -0500
Subject: update AST WCS
---
tksao/frame/fitsimage.h | 1 -
tksao/frame/fitsmap.C | 26 --------------------------
tksao/frame/frame3dbase.C | 2 +-
tksao/frame/frblt.C | 2 +-
4 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index 14333fc..fd5e5a4 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -457,7 +457,6 @@ class FitsImage {
Vector3d mapToRef(const Vector3d&, Coord::CoordSystem, Coord::SkyFrame =Coord::FK5);
#endif
double mapFromRef3axis(double, Coord::CoordSystem);
- double mapToRef3axis(double, Coord::CoordSystem);
double mapFromImage3axis(double, Coord::CoordSystem);
double mapToImage3axis(double, Coord::CoordSystem);
double mapLenFromRef(double, Coord::CoordSystem, Coord::DistFormat =Coord::DEGREE);
diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C
index f75a54c..e25943c 100644
--- a/tksao/frame/fitsmap.C
+++ b/tksao/frame/fitsmap.C
@@ -518,32 +518,6 @@ void FitsImage::listDistFromRef(ostream& str,
// 3D
-double FitsImage::mapFromRef3axis(double vv, Coord::CoordSystem out)
-{
- switch (out) {
- case Coord::IMAGE:
- case Coord::PHYSICAL:
- case Coord::AMPLIFIER:
- case Coord::DETECTOR:
- return vv+.5;
- default:
- return pix2wcsx(vv+.5,out);
- }
-}
-
-double FitsImage::mapToRef3axis(double vv, Coord::CoordSystem in)
-{
- switch (in) {
- case Coord::IMAGE:
- case Coord::PHYSICAL:
- case Coord::AMPLIFIER:
- case Coord::DETECTOR:
- return vv-.5;
- default:
- return wcs2pixx(vv,in) -.5;
- }
-}
-
double FitsImage::mapFromImage3axis(double vv, Coord::CoordSystem sys)
{
if (sys >= Coord::WCS)
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C
index 3b39d3e..0708441 100644
--- a/tksao/frame/frame3dbase.C
+++ b/tksao/frame/frame3dbase.C
@@ -210,7 +210,7 @@ void Frame3dBase::coordToTclArray(FitsImage* ptr, const Vector3d& vv,
doubleToTclArray(rr[0], var, base, "x");
doubleToTclArray(rr[1], var, base, "y");
- double ss = ptr->mapFromRef3axis(((Vector3d&)vv)[2],out);
+ double ss = ptr->mapFromImage3axis(((Vector3d&)vv)[2]+.5,out);
doubleToTclArray(ss, var, base, "z");
}
#else
diff --git a/tksao/frame/frblt.C b/tksao/frame/frblt.C
index 1584197..ba3d6b9 100644
--- a/tksao/frame/frblt.C
+++ b/tksao/frame/frblt.C
@@ -283,7 +283,7 @@ int Base::markerAnalysisPlot3d(Marker* pp, double** x, double** y,
// main loop
SETSIGBUS
for (int kk=0; kk<srcd; kk++) {
- (*x)[kk] = ptr->mapFromRef3axis(kk+.5+zparams->zmin, sys);
+ (*x)[kk] = ptr->mapFromImage3axis(kk+.5+.5+zparams->zmin, sys);
bool* mptr=msk;
long* iptr=idx;
--
cgit v0.12