diff --git a/Core/Export/ExportToPython.cpp b/Core/Export/ExportToPython.cpp index 5508eb1f5e99b07227b6772dc8c1641565bcf943..5b34c1da785fc01acbac52449df7268b4fe8fe3f 100644 --- a/Core/Export/ExportToPython.cpp +++ b/Core/Export/ExportToPython.cpp @@ -576,6 +576,9 @@ std::string ExportToPython::defineMultiLayers() const result << "\n" << indent() << "# Defining Multilayers\n"; for (auto it=themap->begin(); it!=themap->end(); ++it) { result << indent() << it->second << " = ba.MultiLayer()\n"; + double ccl = it->first->crossCorrLength(); + if (ccl > 0.0) + result << indent() << it->second << ".setCrossCorrLength(" << ccl << ")\n"; size_t numberOfLayers = it->first->numberOfLayers(); diff --git a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp index e07213d211ab08b7b7d0e1024217651871cf1843..91e8c883e1dc7f2c198082dacb1ecc7d5a9d0d3e 100644 --- a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp +++ b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp @@ -27,7 +27,7 @@ MultiLayerWithRoughnessBuilder::MultiLayerWithRoughnessBuilder() , m_sigma(1.0*Units::nanometer) , m_hurst(0.3) , m_lateralCorrLength(5.0*Units::nanometer) - , m_crossCorrLength(1e-4) + , m_crossCorrLength(10.0*Units::nanometer) { init_parameters(); } diff --git a/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py b/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py index 94024e9a21ea3da4185fa84576628d377ee4590c..335ba51577140616d19e6cb5518353f76deb7184 100644 --- a/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py +++ b/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py @@ -37,7 +37,7 @@ def get_sample(): my_sample.addLayerWithTopRoughness(l_part_b, roughness) my_sample.addLayerWithTopRoughness(l_substrate, roughness) - my_sample.setCrossCorrLength(1e-4) + my_sample.setCrossCorrLength(10*nm) print(my_sample.treeToString()) diff --git a/Examples/python/simulation/ex05_BeamAndDetector/SpecularSimulation.py b/Examples/python/simulation/ex05_BeamAndDetector/SpecularSimulation.py index dac9471bbf5638988fae7d5920a58cb52387d334..2244b145b58a2490fa5908c611bdbb925cfbd03b 100644 --- a/Examples/python/simulation/ex05_BeamAndDetector/SpecularSimulation.py +++ b/Examples/python/simulation/ex05_BeamAndDetector/SpecularSimulation.py @@ -38,7 +38,6 @@ def get_sample(): my_sample.addLayerWithTopRoughness(l_part_b, roughness) my_sample.addLayerWithTopRoughness(l_substrate, roughness) - # my_sample.setCrossCorrLength(1e-4) return my_sample diff --git a/Tests/ReferenceData/PyPersist/CorrelatedRoughness.ref.int.gz b/Tests/ReferenceData/PyPersist/CorrelatedRoughness.ref.int.gz index 203e1071d69710fd48fdb2e2708a5b81a39ad3d8..e324a47c09c8917d4d5c43c42dd03af60605f3bf 100644 Binary files a/Tests/ReferenceData/PyPersist/CorrelatedRoughness.ref.int.gz and b/Tests/ReferenceData/PyPersist/CorrelatedRoughness.ref.int.gz differ diff --git a/Tests/ReferenceData/StandardSuite/MultiLayerWithRoughness.int.gz b/Tests/ReferenceData/StandardSuite/MultiLayerWithRoughness.int.gz index 4b94cd865256811bb4b712fc94e320c9ab1dd3ae..130142bfb0f8ea14188d0e9dd802dfdc694b1f50 100644 Binary files a/Tests/ReferenceData/StandardSuite/MultiLayerWithRoughness.int.gz and b/Tests/ReferenceData/StandardSuite/MultiLayerWithRoughness.int.gz differ