Rename all validation_data_jointcal -> testdata_jointcal

lsst · Dec 20, 2016 · 76c983b · 76c983b
1 parent 8542a26
commit 76c983b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/tests/test_jointcal_cfht.py b/tests/test_jointcal_cfht.py
@@ -15,7 +15,7 @@
 import jointcalTestBase
 
 try:
-    data_dir = lsst.utils.getPackageDir('validation_data_jointcal')
+    data_dir = lsst.utils.getPackageDir('testdata_jointcal')
     os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(data_dir, 'cfht_and_index')
 except lsst.pex.exceptions.NotFoundError:
     data_dir = None
@@ -36,7 +36,7 @@ class JointcalTestCFHT(jointcalTestBase.JointcalTestBase, lsst.utils.tests.TestC
     def setUp(self):
         do_plot = False
 
-        # position of the validation_data_cfht catalog
+        # center of the cfht validation_data catalog
         center = lsst.afw.coord.IcrsCoord(214.884832*lsst.afw.geom.degrees, 52.6622199*lsst.afw.geom.degrees)
         radius = 3*lsst.afw.geom.degrees
 
@@ -48,7 +48,7 @@ def setUp(self):
                         all_visits=all_visits,
                         do_plot=do_plot)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     def test_jointcalTask_2_visits(self):
         # NOTE: The relative RMS limit was empirically determined from the
         # first run of jointcal on this data. We should always do better than

diff --git a/tests/test_jointcal_decam.py b/tests/test_jointcal_decam.py
@@ -15,7 +15,7 @@
 import jointcalTestBase
 
 try:
-    data_dir = lsst.utils.getPackageDir('validation_data_jointcal')
+    data_dir = lsst.utils.getPackageDir('testdata_jointcal')
     os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(data_dir, 'decam_and_index')
 except lsst.pex.exceptions.NotFoundError:
     data_dir = None
@@ -36,7 +36,7 @@ class JointcalTestDECAM(jointcalTestBase.JointcalTestBase, lsst.utils.tests.Test
     def setUp(self):
         do_plot = False
 
-        # position of the validation_data_decam catalog
+        # center of the decam validation_data catalog
         center = lsst.afw.coord.IcrsCoord(150.1191666*lsst.afw.geom.degrees, 2.20583333*lsst.afw.geom.degrees)
         radius = 3*lsst.afw.geom.degrees
 
@@ -51,7 +51,7 @@ def setUp(self):
                         other_args=other_args,
                         do_plot=do_plot)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     def test_jointcalTask_2_visits(self):
         # NOTE: The relative RMS limit was empirically determined from the
         # first run of jointcal on this data. We should always do better than

diff --git a/tests/test_jointcal_hsc.py b/tests/test_jointcal_hsc.py
@@ -36,7 +36,7 @@ class JointcalTestHSC(jointcalTestBase.JointcalTestBase, lsst.utils.tests.TestCa
     def setUp(self):
         do_plot = False
 
-        # position of this validation_data_hsc catalog
+        # center of the hsc validation_data catalog
         center = lsst.afw.coord.IcrsCoord(320.367492*lsst.afw.geom.degrees, 0.3131554*lsst.afw.geom.degrees)
         radius = 5*lsst.afw.geom.degrees
 

diff --git a/tests/test_jointcal_lsstSim.py b/tests/test_jointcal_lsstSim.py
@@ -14,7 +14,7 @@
 import jointcalTestBase
 
 try:
-    data_dir = lsst.utils.getPackageDir('validation_data_jointcal')
+    data_dir = lsst.utils.getPackageDir('testdata_jointcal')
     os.environ['ASTROMETRY_NET_DATA_DIR'] = os.path.join(data_dir, 'twinkles1_and_index')
 except lsst.pex.exceptions.NotFoundError:
     data_dir = None
@@ -49,32 +49,32 @@ def setUp(self):
                         other_args=other_args,
                         do_plot=do_plot)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     @unittest.skip('jointcal currently fails if only given one catalog!')
     def testJointCalTask_1_visits(self):
         self._testJointCalTask(2, 0, absolute_error)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     def testJointCalTask_2_visits(self):
         # NOTE: The relative RMS limits were empirically determined from the
         # first run of jointcal on this data. We should always do better than
         # this in the future!
         relative_error = 9.7e-3*u.arcsecond
         self._testJointCalTask(2, relative_error, absolute_error)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     @unittest.skip('Keeping this around for diagnostics on the behavior with n catalogs.')
     def testJointCalTask_4_visits(self):
         relative_error = 8.2e-3*u.arcsecond
         self._testJointCalTask(4, relative_error, absolute_error)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     @unittest.skip('Keeping this around for diagnostics on the behavior with n catalogs.')
     def testJointCalTask_7_visits(self):
         relative_error = 8.1e-3*u.arcsecond
         self._testJointCalTask(7, relative_error, absolute_error)
 
-    @unittest.skipIf(data_dir is None, "validation_data_jointcal not setup")
+    @unittest.skipIf(data_dir is None, "testdata_jointcal not setup")
     def testJointCalTask_10_visits(self):
         relative_error = 7.9e-3*u.arcsecond
         self._testJointCalTask(10, relative_error, absolute_error)

diff --git a/ups/jointcal.table b/ups/jointcal.table
@@ -12,7 +12,7 @@ setupRequired(pipe_tasks)
 setupRequired(jointcal_cholmod)
 
 # for the testing files
-setupOptional(validation_data_jointcal)
+setupOptional(testdata_jointcal)
 setupOptional(validation_data_hsc)
 
 envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)