Skip to content
Snippets Groups Projects
Commit 1e091635 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Removed some more .txt formats for intensity data

parent 0d96b92d
No related branches found
No related tags found
No related merge requests found
...@@ -157,7 +157,7 @@ def run_fitting(): ...@@ -157,7 +157,7 @@ def run_fitting():
simulation = get_simulation() simulation = get_simulation()
simulation.setSample(sample) simulation.setSample(sample)
real_data = IntensityDataIOFactory.readIntensityData('refdata_fitcylinderprisms.txt') real_data = IntensityDataIOFactory.readIntensityData('refdata_fitcylinderprisms.int.gz')
fit_suite = FitSuite() fit_suite = FitSuite()
fit_suite.addSimulationAndRealData(simulation, real_data) fit_suite.addSimulationAndRealData(simulation, real_data)
......
...@@ -110,13 +110,13 @@ def run_fitting(): @\label{script2::run_fitting}@ ...@@ -110,13 +110,13 @@ def run_fitting(): @\label{script2::run_fitting}@
simulation = get_simulation() simulation = get_simulation()
simulation.setSample(sample) @\label{script2::setup_simulation2}@ 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} \end{lstlisting}
Lines Lines
~\ref{script2::setup_simulation1}-~\ref{script2::setup_simulation2} ~\ref{script2::setup_simulation1}-~\ref{script2::setup_simulation2}
generate the generate the
sample and simulation description and assign the sample to the simulation. 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 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 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). parameters (\textit{i.e.} the dimensions of the cylinders and prisms).
......
...@@ -71,7 +71,7 @@ def get_sample(cylinder_height=1.0*nanometer, ...@@ -71,7 +71,7 @@ def get_sample(cylinder_height=1.0*nanometer,
def create_real_data(): def create_real_data():
""" """
Generating "real" data by adding noise to the simulated 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 # 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) sample = get_sample(5.0*nanometer, 5.0*nanometer, 5.0*nanometer, 5.0*nanometer)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment