update EDD example Pipeline

CHESSComputing · Mar 24, 2023 · 49b3055 · 49b3055
1 parent c8f54d0
commit 49b3055
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/edd_config/ceria_calibration_config.yaml → edd/ceria_calibration_config.yaml b/edd_config/ceria_calibration_config.yaml → edd/ceria_calibration_config.yaml
@@ -1,13 +1,13 @@
-spec_file: edd_data/ceria_2222-2/spec.log
+spec_file: edd/ceria_2222-2/spec.log
 scan_number: 1
 
-flux_file: edd_data/flux.dft
+flux_file: edd/flux.dft
 
 detector_name: mca1
 num_bins: 2048
 max_energy_kev: 150
 
-hexrd_h5_material_file: edd_config/materials.h5
+hexrd_h5_material_file: edd/materials.h5
 
 tth_max: 90.0
 hkl_tth_tol: 0.15

diff --git a/edd_config/map.yaml → edd/map.yaml b/edd_config/map.yaml → edd/map.yaml
@@ -4,7 +4,7 @@ experiment_type: EDD
 sample:
   name: set2_c1-1
 spec_scans:
-  - spec_file: edd_data/set2_c1-1/spec.log
+  - spec_file: edd/set2_c1-1/spec.log
     scan_numbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
 independent_dimensions:
   - label: sample_y

diff --git a/edd_config/pipeline.yaml → edd/pipeline.yaml b/edd_config/pipeline.yaml → edd/pipeline.yaml
@@ -1,38 +1,47 @@
 pipeline:
 
+  # Download example data
+  - reader.URLReader:
+      url: https://gitlab01.classe.cornell.edu/api/v4/projects/308/repository/files/edd%2fdata.tar/raw?ref=main
+      headers:
+        PRIVATE-TOKEN: # your token here
+  - processor.URLResponseProcessor
+  - writer.ExtractArchiveWriter:
+      filename: edd
+
   # Calibrate detector
   - reader.YAMLReader:
-      filename: edd_config/ceria_calibration_config.yaml
+      filename: edd/ceria_calibration_config.yaml
       schema: MCACeriaCalibrationConfig
   - processor.MCACeriaCalibrationProcessor
   - writer.YAMLWriter:
-      filename: edd_data/ceria_calibrated.yaml
+      filename: edd/ceria_calibrated.yaml
       force_overwrite: true
 
   # Gather calibrated detector data
   - reader.MultipleReader:
       readers:
         - YAMLReader:
-            filename: edd_config/map.yaml
+            filename: edd/map.yaml
             schema: MapConfig
         - YAMLReader:
-            filename: edd_data/ceria_calibrated.yaml
+            filename: edd/ceria_calibrated.yaml
             schema: MCACeriaCalibrationConfig
   - processor.MCADataProcessor
   - writer.NexusWriter:
-      filename: edd_data/map_detector_data.nxs
+      filename: edd/map_detector_data.nxs
       force_overwrite: true
 
   # Compute sample strain map
   - reader.MultipleReader:
       readers:
         - YAMLReader:
-            filename: edd_data/map_detector_data.yaml
+            filename: edd/map_detector_data.nxs
         - YAMLReader:
-            filename: edd_config/strain_analysis_config.yaml
+            filename: edd/strain_analysis_config.yaml
             schema: StrainAnalysisConfig
   - processor.StrainAnalysisProcessor
   - writer.YAMLWriter:
-      filename: edd_data/map_strain_data.yaml
+      filename: edd/map_strain_data.yaml
       force_overwrite: true
 
diff --git a/edd_config/strain_analysis_config.yaml → edd/strain_analysis_config.yaml b/edd_config/strain_analysis_config.yaml → edd/strain_analysis_config.yaml