From 1e091635f5f59b57c2e632048fc7c35e46ac860c Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Thu, 6 Nov 2014 13:27:08 +0100
Subject: [PATCH] Removed some more .txt formats for intensity data
---
Doc/UserManual/AppendixListings.tex | 2 +-
Doc/UserManual/FittingExamples.tex | 4 ++--
.../FitCylindersPrisms_detailed.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/UserManual/AppendixListings.tex b/Doc/UserManual/AppendixListings.tex
index 18ff93b257b..0591a5d3878 100755
--- a/Doc/UserManual/AppendixListings.tex
+++ b/Doc/UserManual/AppendixListings.tex
@@ -157,7 +157,7 @@ def run_fitting():
simulation = get_simulation()
simulation.setSample(sample)
- real_data = IntensityDataIOFactory.readIntensityData('refdata_fitcylinderprisms.txt')
+ real_data = IntensityDataIOFactory.readIntensityData('refdata_fitcylinderprisms.int.gz')
fit_suite = FitSuite()
fit_suite.addSimulationAndRealData(simulation, real_data)
diff --git a/Doc/UserManual/FittingExamples.tex b/Doc/UserManual/FittingExamples.tex
index 056758102a7..f6990b8a5b5 100755
--- a/Doc/UserManual/FittingExamples.tex
+++ b/Doc/UserManual/FittingExamples.tex
@@ -110,13 +110,13 @@ def run_fitting(): @\label{script2::run_fitting}@
simulation = get_simulation()
simulation.setSample(sample) @\label{script2::setup_simulation2}@
- real_data = IntensityDataIOFactory.readIntensityData('refdata_fitcylinderprisms.txt') @\label{script2::real_data}@
+ real_data = IntensityDataIOFactory.readIntensityData('refdata_fitcylinderprisms.int.gz') @\label{script2::real_data}@
\end{lstlisting}
Lines
~\ref{script2::setup_simulation1}-~\ref{script2::setup_simulation2}
generate the
sample and simulation description and assign the sample to the simulation.
-Our reference data are contained in the file \Code{'refdata\_fitcylinderprisms.txt'}.
+Our reference data are contained in the file \Code{'refdata\_fitcylinderprisms.int.gz'}.
This reference had been generated by adding noise
on the scattered intensity from a numerical sample with a fixed length of 5~nm for the four fitting
parameters (\textit{i.e.} the dimensions of the cylinders and prisms).
diff --git a/Examples/python/fitting/ex002_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py b/Examples/python/fitting/ex002_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py
index 339ae704855..c1caa63ef9f 100644
--- a/Examples/python/fitting/ex002_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py
+++ b/Examples/python/fitting/ex002_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py
@@ -71,7 +71,7 @@ def get_sample(cylinder_height=1.0*nanometer,
def create_real_data():
"""
Generating "real" data by adding noise to the simulated data.
- This function has been used once to generate refdata_fitcylinderprisms.txt
+ This function has been used once to generate refdata_fitcylinderprisms.int
"""
# creating sample with set of parameters we will later try to find during the fit
sample = get_sample(5.0*nanometer, 5.0*nanometer, 5.0*nanometer, 5.0*nanometer)
--
GitLab