in the middle of sorting circular import

This commit is contained in:
Benoît Sierro
2021-08-27 10:59:11 +02:00
parent 6c869d5c6c
commit 5751a86e79
19 changed files with 603 additions and 732 deletions

View File

@@ -7,7 +7,7 @@ import toml
from scgenerator import defaults, utils, math
from scgenerator.errors import *
from scgenerator.physics import pulse, units
from scgenerator.utils.parameter import BareConfig, BareParams
from scgenerator.utils.parameter import BareConfig, Parameters
def load_conf(name):
@@ -143,10 +143,10 @@ class TestInitializeMethods(unittest.TestCase):
init.Config(**conf("good5")).__dict__.items(),
)
def setup_conf_custom_field(self, path) -> BareParams:
def setup_conf_custom_field(self, path) -> Parameters:
conf = load_conf(path)
conf = BareParams(**conf)
conf = Parameters(**conf)
init.build_sim_grid_in_place(conf)
return conf
@@ -192,12 +192,12 @@ class TestInitializeMethods(unittest.TestCase):
self.assertTrue(result)
conf = self.setup_conf_custom_field("custom_field/wavelength_shift1")
result = init.Params.from_bare(conf)
result = Parameters(**conf)
self.assertAlmostEqual(units.m.inv(result.w)[np.argmax(math.abs2(result.spec_0))], 1050e-9)
conf = self.setup_conf_custom_field("custom_field/wavelength_shift1")
conf.wavelength = 1593e-9
result = init.Params.from_bare(conf)
result = Parameters(**conf)
conf = load_conf("custom_field/wavelength_shift2")
conf = init.Config(**conf)

View File

@@ -1,12 +0,0 @@
import scgenerator as sc
from pathlib import Path
import os
os.chdir("/Users/benoitsierro/Nextcloud/PhD/Supercontinuum/PCF Simulations/")
root = Path("PM1550+PMHNLF+PM1550+PM2000")
confs = sc.io.load_config_sequence(root / "4_PM2000.toml")
final = sc.utils.final_config_from_sequence(*confs)
print(final)