cleanup

2021-05-12 12:30:04 +02:00
parent aae35e2b63
commit a0f87fe141
5 changed files with 5 additions and 151 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,6 @@ tmp*
 paths.json
 scgenerator_log*
 .scgenerator_tmp
+sc-*.log

 .vscode
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,5 @@ matplotlib
 scipy
 ray
 send2trash
-toml
+toml
+tqdm
--- a/sc-DEBUG.log
+++ b/sc-DEBUG.log
--- a/scgenerator.log
+++ b/scgenerator.log
@@ -1,150 +0,0 @@
-scgenerator.initialize: computed initial N = 8.66
-scgenerator.initialize: computed initial N = 8.66
-scgenerator.initialize: computed initial N = 8.66
-scgenerator.initialize: computed initial N = 8.66
-scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: scgenerator.initialize: computed initial N = 8.66
-INFO: id 0 wavelength 8.35e-07 num 0: energy conserved
-INFO: id 2 wavelength 8.35e-07 num 2: energy conserved
-INFO: id 3 wavelength 8.35e-07 num 3: energy conserved
-INFO: id 4 wavelength 8.35e-07 num 4: energy conserved
-INFO: id 5 wavelength 8.35e-07 num 5: energy conserved
-INFO: id 9 wavelength 8.35e-07 num 9: energy conserved
-INFO: id 10 wavelength 8.3375e-07 num 0: energy conserved
-INFO: id 14 wavelength 8.3375e-07 num 4: energy conserved
-INFO: id 16 wavelength 8.3375e-07 num 6: energy conserved
-INFO: id 19 wavelength 8.3375e-07 num 9: energy conserved
-INFO: id 21 wavelength 8.325e-07 num 1: energy conserved
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: energy conserved
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: energy conserved
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: energy conserved
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: energy conserved
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: energy conserved
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: energy conserved
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: energy conserved
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: energy conserved
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: energy conserved
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: energy conserved
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: energy conserved
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: energy conserved
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: energy conserved
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: energy conserved
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: [34mremaining : 0h 0min 56s (11% in total). [31mETA : 2021-02-04 13:58:43[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: energy conserved
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: [34mremaining : 0h 0min 56s (11% in total). [31mETA : 2021-02-04 13:58:43[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: [34mremaining : 0h 0min 56s (11% in total). [31mETA : 2021-02-04 13:58:43[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: energy conserved
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: energy conserved
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: [34mremaining : 0h 0min 56s (11% in total). [31mETA : 2021-02-04 13:58:45[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: Computing 64 new spectra, first one at 0.00031746031746031746m
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: step 1 rejected with h = 1.5873e-04, doing over
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: step 1 rejected with h = 7.9365e-05, doing over
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: step 1 rejected with h = 3.9683e-05, doing over
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:58:54[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:58:54[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:58:55[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: [34mremaining : 0h 1min 12s (11% in total). [31mETA : 2021-02-04 13:59:03[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:58:56[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:58:56[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:58:58[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: [34mremaining : 0h 1min 12s (11% in total). [31mETA : 2021-02-04 13:59:07[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: [34mremaining : 0h 1min 12s (11% in total). [31mETA : 2021-02-04 13:59:08[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: [34mremaining : 0h 1min 4s (11% in total). [31mETA : 2021-02-04 13:59:00[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: [34mremaining : 0h 1min 12s (11% in total). [31mETA : 2021-02-04 13:59:08[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: [34mremaining : 0h 1min 12s (11% in total). [31mETA : 2021-02-04 13:59:09[0m (217 steps). z = 0.0022, h = 5.9367e-06
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: [34mremaining : 0h 1min 12s (11% in total). [31mETA : 2021-02-04 13:59:10[0m (214 steps). z = 0.0022, h = 2.4732e-07
-INFO: id 0 gamma 0.11 wavelength 8.35e-07 num 0: [34mremaining : 0h 1min 13s (20% in total). [31mETA : 2021-02-04 13:59:12[0m (504 steps). z = 0.0041, h = 4.1803e-06
-INFO: id 1 gamma 0.11 wavelength 8.35e-07 num 1: [34mremaining : 0h 1min 9s (20% in total). [31mETA : 2021-02-04 13:59:08[0m (504 steps). z = 0.0041, h = 4.1803e-06
-INFO: id 2 gamma 0.11 wavelength 8.35e-07 num 2: [34mremaining : 0h 1min 13s (20% in total). [31mETA : 2021-02-04 13:59:12[0m (504 steps). z = 0.0041, h = 4.1803e-06
-INFO: id 5 gamma 0.11 wavelength 8.35e-07 num 5: [34mremaining : 0h 1min 13s (20% in total). [31mETA : 2021-02-04 13:59:13[0m (504 steps). z = 0.0041, h = 4.1803e-06
-INFO: id 9 gamma 0.11 wavelength 8.35e-07 num 9: [34mremaining : 0h 1min 17s (20% in total). [31mETA : 2021-02-04 13:59:19[0m (504 steps). z = 0.0041, h = 4.1803e-06
-INFO: id 10 gamma 0.11 wavelength 8.3375e-07 num 0: [34mremaining : 0h 1min 17s (20% in total). [31mETA : 2021-02-04 13:59:19[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 11 gamma 0.11 wavelength 8.3375e-07 num 1: [34mremaining : 0h 1min 17s (20% in total). [31mETA : 2021-02-04 13:59:19[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 13 gamma 0.11 wavelength 8.3375e-07 num 3: [34mremaining : 0h 1min 17s (20% in total). [31mETA : 2021-02-04 13:59:20[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 12 gamma 0.11 wavelength 8.3375e-07 num 2: [34mremaining : 0h 1min 21s (20% in total). [31mETA : 2021-02-04 13:59:24[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 16 gamma 0.11 wavelength 8.3375e-07 num 6: [34mremaining : 0h 1min 17s (20% in total). [31mETA : 2021-02-04 13:59:21[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 20 gamma 0.11 wavelength 8.3375e-07 num 0: [34mremaining : 0h 1min 21s (20% in total). [31mETA : 2021-02-04 13:59:27[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 21 gamma 0.11 wavelength 8.3375e-07 num 1: [34mremaining : 0h 1min 21s (20% in total). [31mETA : 2021-02-04 13:59:28[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 23 gamma 0.11 wavelength 8.3375e-07 num 3: [34mremaining : 0h 1min 25s (20% in total). [31mETA : 2021-02-04 13:59:33[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 25 gamma 0.11 wavelength 8.3375e-07 num 5: [34mremaining : 0h 1min 21s (20% in total). [31mETA : 2021-02-04 13:59:29[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 26 gamma 0.11 wavelength 8.3375e-07 num 6: [34mremaining : 0h 1min 21s (20% in total). [31mETA : 2021-02-04 13:59:29[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 29 gamma 0.11 wavelength 8.3375e-07 num 9: [34mremaining : 0h 1min 21s (20% in total). [31mETA : 2021-02-04 13:59:30[0m (504 steps). z = 0.0041, h = 4.9094e-06
-INFO: id 31 gamma 0.12 wavelength 8.35e-07 num 1: [34mremaining : 0h 1min 40s (20% in total). [31mETA : 2021-02-04 13:59:55[0m (634 steps). z = 0.0041, h = 2.6475e-07
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,11 +20,13 @@ package_dir =
    = src
 install_requires =
    numpy
+    numba
    matplotlib
    scipy
    ray
    send2trash
    toml
+    tqdm


 [options.package_data]