Update L1A CWL and test script to support using two paths for L0 files

Author: mcduffie

cwl/l1a_package.cwl

@@ -20,10 +20,14 @@ $graph:
   - class: ScatterFeatureRequirement
 
   inputs:
-    input_dir:
+    input_ephatt_dir:
       type: Directory
-      label: L0 Data Directory
-      doc: Directory containing L0 files
+      label: L0 SNPP_EphAtt Data Directory
+      doc: Directory containing L0 emphemeris and attitude files
+    input_science_dir:
+      type: Directory
+      label: L0 ATMS Science Data Directory
+      doc: Directory containing L0 science packet files
     static_dir:
       type: Directory
       label: Static Inputs
@@ -41,7 +45,8 @@ $graph:
     l1a_process:
       run: "#l1a_pge"
       in:
-        input_dir: input_dir
+        input_ephatt_dir: input_ephatt_dir
+        input_science_dir: input_science_dir
         static_dir: static_dir
         start_datetime: start_datetime
         end_datetime: end_datetime
@@ -70,15 +75,18 @@ $graph:
 
   arguments: [
     "$(runtime.outdir)/processed_notebook.ipynb",
-    "-p", "input_path", "$(inputs.input_dir)",
+    "-p", "input_ephatt_path", "$(inputs.input_ephatt_dir)",
+    "-p", "input_science_path", "$(inputs.input_science_dir)",
     "-p", "output_path", "$(runtime.outdir)",
     "-p", "data_static_path", "$(inputs.static_dir)",
     "-p", "start_datetime", "$(inputs.start_datetime)",
     "-p", "end_datetime", "$(inputs.end_datetime)",
   ]
 
   inputs:
-    input_dir:
+    input_ephatt_dir:
+      type: Directory
+    input_science_dir:
       type: Directory
     static_dir:
       type: Directory

cwl/l1a_package.yml

@@ -29,7 +29,8 @@ fi
 cwltool \
     --outdir ${PGE_OUT_DIR} \
     ${cwl_path}/l1a_package.cwl \
-    --input_dir ${PGE_IN_DIR} \
+    --input_ephatt_dir ${PGE_IN_DIR}/ephatt \
+    --input_science_dir ${PGE_IN_DIR}/atms_science \
     --static_dir ${PGE_STATIC_DIR} \
     --start_datetime $(grep start_datetime ${cwl_path}/l1a_package.yml | awk '{print $2}' | sed 's/\"//g') \
     --end_datetime $(grep end_datetime ${cwl_path}/l1a_package.yml | awk '{print $2}' | sed 's/\"//g') \