factor out external data dir

LSSTDESC · Apr 11, 2020 · 8ef429c · 8ef429c
1 parent 138cf9a
commit 8ef429c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/descqa/ColorDistribution.py b/descqa/ColorDistribution.py
@@ -44,8 +44,6 @@ class ColorDistribution(BaseValidationTest):
     summary_output_file = 'summary.txt'
     plot_pdf_file = 'plot_pdf.png'
     plot_cdf_file = 'plot_cdf.png'
-    sdss_path = '/global/cfs/cdirs/lsst/groups/CS/descqa/data/rongpu/SpecPhoto_sdss_mgs_extinction_corrected.fits'
-    deep2_path = '/global/cfs/cdirs/lsst/groups/CS/descqa/data/rongpu/DEEP2_uniq_Terapix_Subaru_trimmed_wights_added.fits'
 
     def __init__(self, **kwargs): # pylint: disable=W0231
 
@@ -77,6 +75,9 @@ def __init__(self, **kwargs): # pylint: disable=W0231
         self.binsize = self.bins[1] - self.bins[0]
 
         # Load validation catalog and define catalog-specific properties
+        self.sdss_path = os.path.join(self.external_data_dir, 'rongpu', 'SpecPhoto_sdss_mgs_extinction_corrected.fits')
+        self.deep2_path = os.path.join(self.external_data_dir, 'rongpu', 'DEEP2_uniq_Terapix_Subaru_trimmed_wights_added.fits')
+
         if self.validation_catalog == 'SDSS':
             obs_path = self.sdss_path
             obscat = Table.read(obs_path)

diff --git a/descqa/DensityVersusSkyPosition.py b/descqa/DensityVersusSkyPosition.py
@@ -34,7 +34,7 @@ def __init__(self,**kwargs): # pylint: disable=W0231
 
         self.kwargs = kwargs
         self.test_name = kwargs['test_name']
-        self.validation_path = kwargs['validation_map_filename']
+        self.validation_path = os.path.join(self.external_data_dir, kwargs['validation_map_filename'])
         self.nside = kwargs['nside']
         self.validation_data = hp.ud_grade(hp.read_map(self.validation_path), nside_out=self.nside)
         self.xlabel = kwargs['xlabel']

diff --git a/descqa/ImgPkTest.py b/descqa/ImgPkTest.py
@@ -37,6 +37,7 @@ def __init__(self, raft=None, rebinning=None, validation_data_path=None,
         if validation_data_path is None:
             self.validation_data = None
         else:
+            validation_data_path = os.path.join(self.external_data_dir, validation_data_path)
             self.validation_data = Table.read(validation_data_path)
         self.validation_data_label = validation_data_label
         self.pixel_scale = pixel_scale

diff --git a/descqa/base.py b/descqa/base.py
@@ -74,6 +74,7 @@ class BaseValidationTest(object):
     """
 
     data_dir = os.path.join(os.path.dirname(__file__), 'data')
+    external_data_dir = "/global/cfs/cdirs/lsst/groups/CS/descqa/data"
 
     def __init__(self, **kwargs):
         pass

diff --git a/descqa/configs/DensityVersusExtinction.yaml b/descqa/configs/DensityVersusExtinction.yaml
@@ -1,6 +1,6 @@
 subclass_name: DensityVersusSkyPosition.DensityVersusSkyPosition
 test_name: Density versus sky position
-validation_map_filename: /global/projecta/projectdirs/lsst/groups/LSS/DC1/systematics/lambda_sfd_ebv.fits
+validation_map_filename: DensityVersusExtinction/lambda_sfd_ebv.fits
 nside: 1024
 xlabel: 'E(B-V)'
 description: Variation of mean density of detected objects as a function of extinction (or other map)
diff --git a/descqa/configs/image_power_spec.yaml b/descqa/configs/image_power_spec.yaml
@@ -2,4 +2,4 @@ subclass_name: ImgPkTest.ImgPkTest
 description: 'Compute power spectrum of the background. It uses validation data from run #9 in DC2-production issue #140 (PhoSim full background model with sources in it)'
 included_by_default: true
 rebinning: 16
-validation_data_path: /global/projecta/projectdirs/lsst/groups/SSim/DC2/img_pk/reference_w_sources_R22.fits.gz
+validation_data_path: image_power_spec/reference_w_sources_R22.fits.gz