summaryrefslogtreecommitdiffstats
path: root/tksao
diff options
context:
space:
mode:
Diffstat (limited to 'tksao')
-rw-r--r--tksao/frame/base.C6
-rw-r--r--tksao/frame/fitsimage.C200
-rw-r--r--tksao/frame/grid25d.C3
-rw-r--r--tksao/frame/grid2d.C3
-rw-r--r--tksao/frame/grid3d.C3
-rw-r--r--tksao/frame/wcsast.C13
6 files changed, 91 insertions, 137 deletions
diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index c02fa6f..df69044 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -390,14 +390,12 @@ Matrix Base::calcAlignWCS(FitsImage* fits1, FitsImage* fits2,
AstFrameSet* wcs1 = (AstFrameSet*)astCopy(fits1->ast_);
wcsSystem(wcs1,sys1);
- if (!fits1->hasWCSHPX())
- wcsSkyFrame(wcs1,sky);
+ wcsSkyFrame(wcs1,sky);
astInvert(wcs1);
AstFrameSet* wcs2 = (AstFrameSet*)astCopy(fits2->ast_);
wcsSystem(wcs2,sys2);
- if (!fits2->hasWCSHPX())
- wcsSkyFrame(wcs2,sky);
+ wcsSkyFrame(wcs2,sky);
astInvert(wcs2);
AstFrameSet* cvt = (AstFrameSet*)astConvert(wcs2, wcs1, "");
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
index 0ac4dae..d401542 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -1129,11 +1129,9 @@ void FitsImage::initWCS(FitsHead* hd)
delete wcsState_;
wcsState_ = new WCSState();
- // need wcsHPX_
astBegin;
wcsSystem(ast_,wcsState_->wcsSystem_);
- if (!wcsHPX_)
- wcsSkyFrame(ast_,wcsState_->wcsSkyFrame_);
+ wcsSkyFrame(ast_,wcsState_->wcsSkyFrame_);
astEnd;
// must wait until wcsState_ is realized
@@ -1357,13 +1355,11 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
if (sky1 != sky2) {
AstFrameSet* wcs1 = (AstFrameSet*)astCopy(ast_);
wcsSystem(wcs1,sys1);
- if (!wcsHPX_)
- wcsSkyFrame(wcs1,sky1);
+ wcsSkyFrame(wcs1,sky1);
AstFrameSet* wcs2 = (AstFrameSet*)astCopy(ast_);
wcsSystem(wcs2,sys2);
- if (!wcsHPX_)
- wcsSkyFrame(wcs2,sky2);
+ wcsSkyFrame(wcs2,sky2);
AstFrameSet* cvt = (AstFrameSet*)astConvert(wcs1, wcs2, "SKY");
if (cvt != AST__NULL) {
@@ -1378,8 +1374,7 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
if (ptr1 && ptr2) {
AstFrameSet* wcs = (AstFrameSet*)astCopy(ast_);
wcsSystem(wcs,sys2);
- if (!wcsHPX_)
- wcsSkyFrame(wcs,sky2);
+ wcsSkyFrame(wcs,sky2);
Tcl_Obj* objrr = Tcl_NewListObj(0,NULL);
for(int jj=0; jj<nxx2; jj++) {
@@ -2640,6 +2635,10 @@ Coord::Orientation FitsImage::getWCSOrientation(Coord::CoordSystem sys,
if (!hasWCS(sys))
return Coord::NORMAL;
+ // special case
+ if (wcsHPX_)
+ return Coord::NORMAL;
+
astClearStatus; // just to make sure
astBegin; // start memory management
@@ -2671,53 +2670,36 @@ double FitsImage::getWCSRotation(Coord::CoordSystem sys, Coord::SkyFrame sky)
if (!hasWCS(sys))
return 0;
+ // special case
+ if (wcsHPX_)
+ return 0;
+
astClearStatus; // just to make sure
astBegin; // start memory management
setWCSSystem(sys);
setWCSSkyFrame(sky);
- if (!wcsHPX_) {
- Vector in[3];
- Vector out[3];
- in[0] = center();
- in[1] = center()+Vector(0,1);
- in[2] = center()+Vector(1,0);
- wcsTran(ast_, 3, in, 1, out);
- double ang = wcsAxAngle(ast_,out[0], out[1]);
- double ang3 = wcsAngle(ast_,out[1],out[0],out[2]);
-
- astEnd;
-
- if ((!(isnan(ang )||isinf(ang) ||(ang ==-DBL_MAX)||(ang ==DBL_MAX))) &&
- (!(isnan(ang3)||isinf(ang3)||(ang3==-DBL_MAX)||(ang3==DBL_MAX)))) {
- if ((hasWCSCel(sys) && ang3>0) || (!hasWCSCel(sys) && ang3<0))
- return -ang;
- else
- return ang;
- }
- else
- return 0;
- }
- else { // special case for HPX
- Vector cc = center();
- Vector wcc = wcsTran(ast_, cc, 1);
- Vector wnorth = wcc + Vector(0,.001);
- Vector north = wcsTran(ast_, wnorth,0);
-
- int current = astGetI(ast_,"Current");
- int base = astGetI(ast_,"Base");
- astSetI(ast_,"Current",base);
- double ang = wcsAxAngle(ast_,cc,north);
- astSetI(ast_,"Current",current);
+ Vector in[3];
+ Vector out[3];
+ in[0] = center();
+ in[1] = center()+Vector(0,1);
+ in[2] = center()+Vector(1,0);
+ wcsTran(ast_, 3, in, 1, out);
+ double ang = wcsAxAngle(ast_,out[0], out[1]);
+ double ang3 = wcsAngle(ast_,out[1],out[0],out[2]);
- astEnd;
+ astEnd;
- if (!(isnan(ang)||isinf(ang)||(ang == -DBL_MAX)||(ang == DBL_MAX)))
- return ang;
+ if ((!(isnan(ang )||isinf(ang) ||(ang ==-DBL_MAX)||(ang ==DBL_MAX))) &&
+ (!(isnan(ang3)||isinf(ang3)||(ang3==-DBL_MAX)||(ang3==DBL_MAX)))) {
+ if ((hasWCSCel(sys) && ang3>0) || (!hasWCSCel(sys) && ang3<0))
+ return -ang;
else
- return 0;
+ return ang;
}
+ else
+ return 0;
}
double FitsImage::getWCSDist(const Vector& vv1, const Vector& vv2,
@@ -3000,95 +2982,69 @@ void FitsImage::scanWCS(FitsHead* hd)
if (image_) {
const char* str = image_->getKeyword(key);
if (str) {
- if (!strncmp(str+5,"HPX",3))
+ if (!strncmp(str+5,"HPX",3) || (!strncmp(str+5,"XPH",3)))
wcsHPX_ =1;
delete [] str;
}
}
- int hasWCSAST = hd->find("BEGAST_A") ? 1 : 0;
-
astClearStatus;
astBegin;
+ int naxis = astGetI(ast_, "Nframe");
+ // wcs_[]
// since we have ast_
wcs_[0] =1;
wcsNaxes_[0] = astGetI(ast_,"Naxes");
- if (!hasWCSAST && !wcsHPX_) {
- // fill out wcs_ array
- int nn = astGetI(ast_, "Nframe");
- for (int ii=0; ii<nn; ii++) {
- AstFrameSet* ff = (AstFrameSet*)astGetFrame(ast_,ii+1);
- const char* id = astGetC(ff, "Ident");
- if (id && *id) {
- int jj = (*id == ' ') ? 0 : *id-'@';
- wcs_[jj] = 1;
- wcsNaxes_[jj] = astGetI(ff,"Naxes");
- }
+ // fill out wcs_ array
+ for (int kk=0; kk<naxis; kk++) {
+ AstFrameSet* ff = (AstFrameSet*)astGetFrame(ast_,kk+1);
+ const char* id = astGetC(ff, "Ident");
+ if (id && *id) {
+ int jj = (*id == ' ') ? 0 : *id-'@';
+ wcs_[jj] = 1;
+ wcsNaxes_[jj] = astGetI(ff,"Naxes");
}
}
- if (wcsHPX_) {
- wcsCel_[0] = 1;
- wcsCelLon_[0] = 1;
- wcsCelLat_[0] = 2;
- }
- else if (hasWCSAST) {
+ // wcsCel_[]
+ for (int kk=0; kk<naxis; kk++) {
+ AstFrame* ff = (AstFrame*)astGetFrame(ast_,kk+1);
+ int ii=0; // current WCS
+ const char* id = astGetC(ff, "Ident");
+ if (id && *id)
+ ii = (*id == ' ') ? 0 : *id-'@';
+
AstFrameSet* fs =
- (AstFrameSet*)astFindFrame(ast_, astSkyFrame(" MaxAxes=4")," ");
+ (AstFrameSet*)astFindFrame(ff, astSkyFrame(" MaxAxes=4")," ");
if (fs) {
- wcsCel_[0] = 1;
- const char* str = astGetC(ast_, "System");
- if (!strncmp(str,"Unknown",7))
- wcsCel_[0] = 0;
-
- if (wcsCel_[0]) {
- for (int jj=0; jj<wcsNaxes_[0]; jj++) {
+ wcsCel_[ii] =1;
+ const char* str = astGetC(ff, "System");
+ if (str && *str) {
+ // cerr << "System: " << str << endl;
+ for (int jj=0; jj<wcsNaxes_[ii]; jj++) {
ostringstream str;
str << "Symbol(" << jj+1 << ")" << ends;
- const char* ss = astGetC(ast_, str.str().c_str());
+ const char* ss = astGetC(ff, str.str().c_str());
+ // cerr << "Symbol: " << ss << endl;
if (ss) {
- if (!strcmp(ss,"RA")||!strcmp(ss,"l")||!strcmp(ss,"Lambda"))
- wcsCelLon_[0] = jj+1;
- else if (!strcmp(ss,"Dec")||!strcmp(ss,"b")||!strcmp(ss,"Beta"))
- wcsCelLat_[0] = jj+1;
- }
- }
- }
- }
- }
- else {
- int nn = astGetI(ast_, "Nframe");
-
- for (int kk=0; kk<nn; kk++) {
- AstFrame* ff = (AstFrame*)astGetFrame(ast_,kk+1);
- const char* id = astGetC(ff, "Ident");
- if (id && *id) {
- int ii = (*id == ' ') ? 0 : *id-'@';
-
- AstFrameSet* fs =
- (AstFrameSet*)astFindFrame(ff, astSkyFrame(" MaxAxes=4")," ");
- if (fs) {
- wcsCel_[ii] =1;
- const char* str = astGetC(ff, "System");
- if (!strncmp(str,"Unknown",7))
- wcsCel_[ii] =0;
-
- if (wcsCel_[ii]) {
- for (int jj=0; jj<wcsNaxes_[ii]; jj++) {
- ostringstream str;
- str << "Symbol(" << jj+1 << ")" << ends;
- const char* ss = astGetC(ff, str.str().c_str());
- if (ss) {
- if (!strcmp(ss,"RA")||!strcmp(ss,"l")||!strcmp(ss,"Lambda"))
- wcsCelLon_[ii] = jj+1;
- else if (!strcmp(ss,"Dec")||!strcmp(ss,"b")||!strcmp(ss,"Beta"))
- wcsCelLat_[ii] = jj+1;
- }
- }
+ if (!strcmp(ss,"RA") ||
+ !strcmp(ss,"l") ||
+ !strcmp(ss,"Lambda") ||
+ !strcmp(ss+1,"LON") ||
+ !strcmp(ss+2,"LN"))
+ wcsCelLon_[ii] = jj+1;
+ else if (!strcmp(ss,"Dec") ||
+ !strcmp(ss,"b") ||
+ !strcmp(ss,"Beta") ||
+ !strcmp(ss+1,"LAT") ||
+ !strcmp(ss+2,"LT"))
+ wcsCelLat_[ii] = jj+1;
}
}
+ // cerr << "wcsCelLon(" << ii << "): " << wcsCelLon_[ii] << endl;
+ // cerr << "wcsCelLat(" << ii << "): " << wcsCelLat_[ii] << endl;
}
}
}
@@ -3153,22 +3109,16 @@ int FitsImage::checkWCS(Vector3d& vv)
void FitsImage::setWCSSystem(Coord::CoordSystem sys)
{
- if (wcsState_->wcsSystem_ != sys) {
- wcsSystem(ast_,sys);
- wcsState_->wcsSystem_ = sys;
- }
+ if (wcsState_->wcsSystem_ != sys)
+ if (wcsSystem(ast_,sys))
+ wcsState_->wcsSystem_ = sys;
}
void FitsImage::setWCSSkyFrame(Coord::SkyFrame sky)
{
- // not valid for HPX
- if (wcsHPX_)
- return;
-
- if (wcsState_->wcsSkyFrame_ != sky) {
- wcsSkyFrame(ast_,sky);
- wcsState_->wcsSkyFrame_ = sky;
- }
+ if (wcsState_->wcsSkyFrame_ != sky)
+ if (wcsSkyFrame(ast_,sky))
+ wcsState_->wcsSkyFrame_ = sky;
}
void FitsImage::setWCSFormat(Coord::CoordSystem sys, Coord::SkyFrame sky,
diff --git a/tksao/frame/grid25d.C b/tksao/frame/grid25d.C
index 2e623ec..0fa8a2d 100644
--- a/tksao/frame/grid25d.C
+++ b/tksao/frame/grid25d.C
@@ -62,8 +62,7 @@ int Grid25d::doit(RenderMode rm)
AstFrameSet* ast = (AstFrameSet*)astCopy(fits->ast_);
wcsSystem(ast,system_);
- if (!fits->hasWCSHPX())
- wcsSkyFrame(ast,sky_);
+ wcsSkyFrame(ast,sky_);
int naxes = astGetI(ast,"Naxes");
switch (naxes) {
diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C
index 65a363a..e6c4d02 100644
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
@@ -63,8 +63,7 @@ int Grid2d::doit(RenderMode rm)
AstFrameSet* ast = (AstFrameSet*)astCopy(fits->ast_);
wcsSystem(ast,system_);
- if (!fits->hasWCSHPX())
- wcsSkyFrame(ast,sky_);
+ wcsSkyFrame(ast,sky_);
int naxes = astGetI(ast,"Naxes");
switch (naxes) {
diff --git a/tksao/frame/grid3d.C b/tksao/frame/grid3d.C
index 74f0445..7443f5c 100644
--- a/tksao/frame/grid3d.C
+++ b/tksao/frame/grid3d.C
@@ -63,8 +63,7 @@ int Grid3d::doit(RenderMode rm)
AstFrameSet* ast = (AstFrameSet*)astCopy(fits->ast_);
wcsSystem(ast,system_);
- if (!fits->hasWCSHPX())
- wcsSkyFrame(ast,sky_);
+ wcsSkyFrame(ast,sky_);
int naxes = astGetI(ast,"Naxes");
switch (naxes) {
diff --git a/tksao/frame/wcsast.C b/tksao/frame/wcsast.C
index 18d930b..e0ef678 100644
--- a/tksao/frame/wcsast.C
+++ b/tksao/frame/wcsast.C
@@ -27,8 +27,17 @@ int wcsSystem(AstFrameSet* ast, Coord::CoordSystem sys)
int wcsSkyFrame(AstFrameSet* ast, Coord::SkyFrame sky)
{
- // verify there is a sky frame
- if (!astFindFrame(ast, astSkyFrame(" MaxAxes=4")," "))
+ // is a skyFrame?
+ AstFrameSet* fs =
+ (AstFrameSet*)astFindFrame(ast, astSkyFrame(" MaxAxes=4")," ");
+ if (!fs)
+ return 0;
+ // equatorial? (aka have a System)
+ const char* str =astGetC(fs, "System");
+ if (!str || !*str)
+ return 0;
+ // could be general spherical (aka HPX)
+ if (!strncmp(str,"Unknown",7))
return 0;
switch (sky) {
generated by cgit v0.12 at 2025-03-29 11:21:19 (GMT)