Changeset 619

Timestamp:

09/16/08 09:46:05 (2 months ago)

Author:

laidler

Message:

r618 caused a few tests to fail. After investigation, I determined these failures were either within the looser syn_pysyn acceptance criteria and loosened the criteria; or, that the code change revealed a real condition of the throughput files to which pysynphot is now properly sensitive, and so changed the reference answers accordingly.

Files:

• trunk/pysynphot/test/other_etc_test.py (modified) (6 diffs)

trunk/pysynphot/test/other_etc_test.py

@@ -98 +98 @@
-
-class CalcphotTestCase(testutil.FPTestCase):
+    #Loosened accuracy for r618 (no taper)
-    def setUp(self):
-        self.sp = S.FileSpectrum(testdata)
@@ -106 +107 @@
-        "countrate"
-        countrate = self.obs.countrate()
-
+,1e-4
-
-    def testefflam(self):
@@ -112 +113 @@
-        synphot_efflerg = 5304.462
-        efflam = self.obs.efflam()
-
+, 1e-4
-
-
@@ -241 +242 @@
-
-    def test5cr(self):
+        #Loosened accuracy for r618 (no tapering)
-        spectrum = "spectrum=rn(icat(k93models,5770,0.0,4.5),band(johnson,v),20.0,vegamag)"
-        instrument = "instrument=acs,sbc,F125LP"
-        parameters = [spectrum, instrument]
-        countrate = etc.countrate(parameters)
-25
+3
-
-
@@ -297 +299 @@
-    
-    def test6(self):
+        #Replaced answer for r618 (no tapering)
+        #The throughput files used in this case don't actually go
+        #all the way to zero.
-        spectrum = "spectrum=((earthshine.fits*0.5)%2brn(spec(Zodi.fits),band(V),22.7,vegamag)%2b(el1215a.fits*0.5)%2b(el1302a.fits*0.5)%2b(el1356a.fits*0.5)%2b(el2471a.fits*0.5))"
-        instrument = "instrument=acs,sbc,F140LP"
-        parameters = [spectrum, instrument]
-        countrate = etc.countrate(parameters)
-34405
+77036
-
-
@@ -308 +313 @@
-
-    def test9(self):
+        #Changed answer for r618 (no tapering): this obsmode doesn't
+        #go all the way to zero with this comptab
-        spectrum = "spectrum= rn(unit(1,flam),band(johnson,v),15.0,vegamag)"
-        instrument = "instrument=stis,ccd"
-        parameters = [spectrum, instrument]
-        countrate = etc.countrate(parameters)
-36130.9
+40470.7
-
-    def test10(self):