Merge branch 'pre-master' of github.com:pytroll/mpop into pre-master

etc/EARSMetop-A.cfg.template

@@ -3,9 +3,9 @@ variant = EARS
 instruments = ('avhrr/3',)
 
 [avhrr/3-level3]
-filename = %(product)s_%Y%m%d_%H%M00_%(satellite)s.h5*
-dir = /path/to/my/ears/nwc
-format = nwcsaf_pps
+format = nc_pps_l2.PPSReader
+cloud_product_filename = W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,METOPA+%(product)s_C_EUMS_%Y%m%d%H%M00_%(orbit)s.nc*
+cloud_product_geofilename = W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,METOPA+CMA_C_EUMS_%Y%m%d%H%M00_%(orbit)s.nc*
 
 [avhrr/3-level1]
 format=eps1a

etc/EARSMetop-B.cfg.template

@@ -0,0 +1,62 @@
+[satellite]
+satname = Metop-B
+number =
+variant = EARS
+instruments = ('avhrr/3',)
+
+[avhrr/3-level3]
+format = nc_pps_l2.PPSReader
+# W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,NOAA19+CTTH_C_EUMS_20150820141700_33658.nc.bz2
+cloud_product_filename = W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,METOPB+%(product)s_C_EUMS_%Y%m%d%H%M00_%(orbit)s.nc*
+cloud_product_geofilename = W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,METOPB+CMA_C_EUMS_%Y%m%d%H%M00_%(orbit)s.nc*
+
+[avhrr/3-level1]
+format=eps1a
+shortname=M01
+dir=/path/to/my/ears/avhrr
+filename=AVHR_HRP_00_M01_%Y%m%d%H%M*
+
+[avhrr/3-granules]
+type=bzipped eps1a
+granularity=60
+full_scan_period=0.1667
+scan_width=2048
+dir=/path/to/my/ears/avhrr
+filename=AVHR_HRP_00_M02_%Y%m%d%H%M*
+
+
+[avhrr/3-1]
+name = '1'
+frequency = (0.58, 0.63, 0.68)
+resolution = 1090
+size = (2048,)
+
+[avhrr/3-2]
+name = '2'
+frequency = (0.725, 0.8625, 1.0)
+resolution = 1090
+size = (2048,)
+
+[avhrr/3-3]
+name = '3A'
+frequency = (1.58, 1.61, 1.64)
+resolution = 1090
+size = (2048,)
+
+[avhrr/3-4]
+name = '3B'
+frequency = (3.55, 3.74, 3.93)
+resolution = 1090
+size = (2048,)
+
+[avhrr/3-5]
+name = '4'
+frequency = (10.3, 10.8, 11.3)
+resolution = 1090
+size = (2500, 2500)
+
+[avhrr/3-6]
+name = '5'
+frequency = (11.5, 12.0, 12.5)
+resolution = 1090
+size = (2500, 2500)

etc/EARSNOAA-19.cfg.template

@@ -3,9 +3,10 @@ variant = EARS
 instruments = ('avhrr/3',)
 
 [avhrr/3-level3]
-filename = %(product)s_%Y%m%d_%H%M00_%(satellite)s.h5*
-dir = /path/to/my/ears/nwc
-format = nwcsaf_pps
+format = nc_pps_l2.PPSReader
+# W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,NOAA19+CTTH_C_EUMS_20150820141700_33658.nc.bz2
+cloud_product_filename = W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,NOAA19+%(product)s_C_EUMS_%Y%m%d%H%M00_%(orbit)s.nc*
+cloud_product_geofilename = W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,NOAA19+CMA_C_EUMS_%Y%m%d%H%M00_%(orbit)s.nc*
 
 [avhrr/3-level1]
 format=hrpt
@@ -21,7 +22,6 @@ scan_width=2048
 dir=/path/to/my/ears/avhrr
 filename=avhrr_%Y%m%d_%H%M%S_noaa19.hrp.bz2
 
-
 [avhrr/3-1]
 name = '1'
 frequency = (0.58, 0.63, 0.68)

etc/FY-3B.cfg.template

@@ -0,0 +1,60 @@
+[satellite]
+instruments = ('virr',)
+satname = fy3
+
+[virr-level2]
+format=fy3_virr
+# clear_FY3B_26293_02-DEC-2015_14-02-13_VIRRX_L1B.HDF
+dir=/data/to/my/fengyun3/virr/file/
+filename = clear_FY3B_%(orbit)s_%d-%b-%Y_%H-%M-%S_VIRRX_L1B.HDF
+
+[virr-1]
+name = '1'
+frequency = (0.58, 0.63, 0.68)
+resolution = 1000
+
+[virr-2]
+name = '2'
+frequency = (0.84, 0.865, 0.89)
+resolution = 1000
+
+[virr-3]
+name = '3'
+frequency = (3.55, 3.74, 3.93)
+resolution = 1000
+
+[virr-4]
+name = '4'
+frequency = (10.3, 10.8, 11.3)
+resolution = 1000
+
+[virr-5]
+name = '5'
+frequency = (11.5, 12.0, 12.5)
+resolution = 1000
+
+[virr-6]
+name = '6'
+frequency = (1.55, 1.6, 1.64)
+resolution = 1000
+
+[virr-7]
+name = '7'
+frequency = (0.43, 0.455, 0.48)
+resolution = 1000
+
+[virr-8]
+name = '8'
+frequency = (0.48, 0.505, 0.53)
+resolution = 1000
+
+[virr-9]
+name = '9'
+frequency = (0.53, 0.555, 0.58)
+resolution = 1000
+
+[virr-10]
+name = '10'
+frequency = (1.325, 1.36, 1.395)
+resolution = 1000
+