Merge branch 'release-v2.0.0' into development

JeffersonLab · May 8, 2017 · 8463082 · 8463082
2 parents e3e5c42 + 3ecb3a0
commit 8463082
Show file tree

Hide file tree

Showing 4 changed files with 5,002 additions and 2 deletions.
diff --git a/tests/data/pyfit/rho/RHOfit b/tests/data/pyfit/rho/RHOfit
@@ -18,5 +18,5 @@ General Fitting:
   save name: outputRHOFIT
   setup name: setup_function
   processing name: processing_function
-  data location: tests/data/pyfit/rho/RHOw.txt
+  data location: tests/data/pyfit/rho/RHOw.csv
   likelihood type: likelihood
diff --git a/tests/data/pyfit/rho/RHOsim b/tests/data/pyfit/rho/RHOsim
@@ -8,6 +8,6 @@ Simulator:
     A1: 100.
     A2: 0.4
   setup name: setup_function
-  data location: tests/data/pyfit/rho/total_events.txt
+  data location: tests/data/pyfit/rho/flat_data.csv
   processing name: processing_function
   save name: outputRHO