Update config templates for MODIS to match recent updates in EOS reader

Signed-off-by: Adam.Dybbroe <a000680@c20671.ad.smhi.se>
pytroll · Feb 3, 2016 · 3a6dab7 · 3a6dab7
1 parent 2c5be32
commit 3a6dab7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/etc/EOS-Aqua.cfg.template → etc/DREOS-Aqua.cfg.template b/etc/EOS-Aqua.cfg.template → etc/DREOS-Aqua.cfg.template
@@ -1,15 +1,17 @@
 [satellite]
+satname='aqua'
+number=''
+instruments=('modis',)
+
+[modis-level2]
+format=hdfeos_l1b.ModisReader
 instruments = ('modis',)
 
 [modis-level2]
 format=hdfeos_l1b
 dir=/data/prod/satellit/modis/lvl1
-
-filename250 = MYD02Qkm_A%Y%m%d_%H%M%S_*.hdf
-filename500 = MYD02Hkm_A%Y%m%d_%H%M%S_*.hdf
-filename1000 = MYD021km_A%Y%m%d_%H%M%S_*.hdf
-
-geofile1000 = MYD03_A%Y%m%d_%H%M%S_*.hdf
+filename = MYD02{resolution:1s}km_A{start_time:%y%j_%H%M%S}_{processing_time:%Y%j%H%M%S}.hdf
+geofile=MYD03_A{start_time:%y%j_%H%M%S}_{processing_time:%Y%j%H%M%S}.hdf
 
 [modis-level3]
 format = nc_pps_l2.PPSReader

diff --git a/etc/EOS-Terra.cfg.template → etc/DREOS-Terra.cfg.template b/etc/EOS-Terra.cfg.template → etc/DREOS-Terra.cfg.template
@@ -1,15 +1,14 @@
 [satellite]
-instruments = ('modis',)
+satname='terra'
+number=''
+instruments=('modis',)
 
 [modis-level2]
-format=hdfeos_l1b
+format=hdfeos_l1b.ModisReader
 dir=/data/prod/satellit/modis/lvl1
+filename = MOD02{resolution:1s}km_A{start_time:%y%j_%H%M%S}_{processing_time:%Y%j%H%M%S}.hdf
+geofile=MOD03_A{start_time:%y%j_%H%M%S}_{processing_time:%Y%j%H%M%S}.hdf
 
-filename250 = MOD02Qkm_A%y%j_%H%M%S_*.hdf
-filename500 = MOD02Hkm_A%y%j_%H%M%S_*.hdf
-filename1000 = MOD021km_A%y%j_%H%M%S_*.hdf
-
-geofile = MOD03_A%y%j_%H%M%S_*.hdf
 
 [modis-level3]
 format = nc_pps_l2.PPSReader