summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordencheva <dencheva@stsci.edu>2009-04-24 17:27:53 -0400
committerdencheva <dencheva@stsci.edu>2009-04-24 17:27:53 -0400
commitf295c5599888f33ea53c82d522505d0c441939b7 (patch)
tree6417a41015686fae3abcd0ae363007a701b35aea
parent2d6661ce6b4fcdf9815bc03c14eeef496d7eab69 (diff)
downloadstwcs_hcf-f295c5599888f33ea53c82d522505d0c441939b7.tar.gz
More formatting corrections
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/development/trunk/updatewcs@7948 fe389314-cf27-0410-b35b-8c050e845b92
-rw-r--r--wcsutil/__init__.py24
1 files changed, 20 insertions, 4 deletions
diff --git a/wcsutil/__init__.py b/wcsutil/__init__.py
index cdc847d..aa67b9a 100644
--- a/wcsutil/__init__.py
+++ b/wcsutil/__init__.py
@@ -237,7 +237,11 @@ class HSTWCS(WCS):
def all_pix2sky(self, *args, **kwargs):
origin = self.get_origin(*args)
if self.det2imext != None and self.d2imerr > self.minerr:
- return WCS.all_pix2sky(self, self.det2im(*args),origin )
+ img = WCS.all_pix2sky(self, self.det2im(*args),origin )
+ if len(args) == 3:
+ return [img[:, i] for i in range(img.shape[1])]
+ else:
+ return img
else:
return WCS.all_pix2sky(self, *args)
all_pix2sky.__doc__ = """
@@ -250,7 +254,11 @@ class HSTWCS(WCS):
def pix2foc(self, *args, **kwargs):
origin = self.get_origin(*args)
if self.det2imext != None and self.d2imerr > self.minerr:
- return WCS.pix2foc(self, self.det2im(*args), origin)
+ img = WCS.pix2foc(self, self.det2im(*args), origin)
+ if len(args)==3:
+ return [img[:, i] for i in range(img.shape[1])]
+ else:
+ return img
else:
return WCS.pix2foc(self, *args)
@@ -264,7 +272,11 @@ class HSTWCS(WCS):
def p4_pix2foc(self, *args, **kwargs):
origin = self.get_origin(*args)
if self.det2imext != None and self.d2imerr > self.minerr:
- return WCS.p4_pix2foc(self, self.det2im(*args), origin)
+ img = WCS.p4_pix2foc(self, self.det2im(*args), origin)
+ if len(args)==3:
+ return [img[:, i] for i in range(img.shape[1])]
+ else:
+ return img
else:
return WCS.p4_pix2foc(self, *args)
@@ -278,7 +290,11 @@ class HSTWCS(WCS):
def sip_pix2foc(self, *args, **kwargs):
origin = self.get_origin(*args)
if self.det2imext != None and self.d2imerr > self.minerr:
- return WCS.sip_pix2foc(self, self.det2im(*args), origin)
+ img = WCS.sip_pix2foc(self, self.det2im(*args), origin)
+ if len(args)==3:
+ return [img[:, i] for i in range(img.shape[1])]
+ else:
+ return img
else:
return WCS.sip_pix2foc(self, *args)