Target and path fixes.

jeremyh · Sep 26, 2016 · d23049f · d23049f
1 parent d44a12d
commit d23049f
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/workflow/nbar.py b/workflow/nbar.py
@@ -180,7 +180,7 @@ def requires(self):
     def output(self):
         out_path = self.out_path
         out_path = pjoin(out_path, CONFIG.get('work', 'targets_root'))
-        target = pjoin(out_path, 'GetAerosolAncillaryData.task')
+        target = pjoin(out_path, 'GetBrdfAncillaryData.task')
         return luigi.LocalTarget(target)
 
     def run(self):
@@ -410,10 +410,10 @@ def run(self):
         lat_fname = pjoin(out_path, CONFIG.get('work', 'lat_grid_fname'))
 
         # load the ancillary point values
-        ozone_fname = pjoin(out_path, CONFIG.get('work', 'ozone_target'))
-        vapour_fname = pjoin(out_path, CONFIG.get('work', 'vapour_target'))
-        aerosol_fname = pjoin(out_path, CONFIG.get('work', 'aerosol_target'))
-        elevation_fname = pjoin(out_path, CONFIG.get('work', 'dem_target'))
+        ozone_fname = pjoin(out_path, CONFIG.get('work', 'ozone_fname'))
+        vapour_fname = pjoin(out_path, CONFIG.get('work', 'vapour_fname'))
+        aerosol_fname = pjoin(out_path, CONFIG.get('work', 'aerosol_fname'))
+        elevation_fname = pjoin(out_path, CONFIG.get('work', 'dem_fname'))
         ozone = load_value(ozone_fname)
         vapour = load_value(vapour_fname)
         aerosol = load_value(aerosol_fname)
@@ -1351,7 +1351,7 @@ def run(self):
             rfl_lvl_fnames[(self.band_num, level)] = pjoin(outdir, outfname)
 
         # calculate reflectance for lambertian, brdf, and terrain correction 
-        gaip.calculate_reflectance(acqs, bilinear_fname, rori, brdf_data,
+        gaip.calculate_reflectance(acqs, bilinear_data, rori, brdf_data,
                                    self_shadow_fname, sun_fname,
                                    satellite_fname, solar_zenith_fname,
                                    solar_azimuth_fname, satellite_view_fname,
@@ -1406,7 +1406,7 @@ def output(self):
         out_path = self.out_path
         out_path = pjoin(out_path, CONFIG.get('work', 'targets_root'))
         target = pjoin(out_path, 'WriteMetadata.task')
-        return luigi.LocalTarget(target.format(band=self.band_num))
+        return luigi.LocalTarget(target)
 
     def run(self):
         acqs = gaip.acquisitions(self.l1t_path)
@@ -1512,7 +1512,7 @@ def requires(self):
         return [WriteMetadata(self.l1t_path, self.work_path)]
 
     def output(self):
-        out_path = pjoin(self.out_path, CONFIG.get('work', 'targets_root'))
+        out_path = pjoin(self.work_path, CONFIG.get('work', 'targets_root'))
         target = pjoin(out_path, 'Packager_{}.task')
         return luigi.LocalTarget(target.format(self.product))