Merge branch 'dev' of https://github.com/agnwinds/python into dev

smangham · May 22, 2024 · 0cc366d · 0cc366d
2 parents 2895692 + 100c774
commit 0cc366d
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 16 deletions.
diff --git a/xdata/Readme.md b/xdata/Readme.md
@@ -0,0 +1,8 @@
+These are the current masterfiles intended for general use (though some more testing needs to be done)j
+
+fe\_17to27.dat - latest version based on ss x-ray code, includes H and Fe17-27 with macro atoms
+fe\_25fe\_26\_f10\_fe\_27\_f1.dat - newer model
+h20\_hetop\_standard80.dat - long standing macro atom set
+master_cno.dat - new macro atom set with H He C N O as macro atoms based on Chianti and Topbase
+standard80.dat - historical simple atom set
+standard80\_reduced.dat - an alternative simple atom set, which needs comparion with standard 80
diff --git a/xdata/fe_17to27_elem_ions.dat → xdata/atomic_macro/fe_17to27_elem_ions.dat b/xdata/fe_17to27_elem_ions.dat → xdata/atomic_macro/fe_17to27_elem_ions.dat
diff --git a/xdata/atomic_macro2/elem_ions_cno.dat b/xdata/atomic_macro2/elem_ions_cno.dat
@@ -31,7 +31,7 @@ Element 26 Fe 7.51 55.847000
 IonM H 1 1 2 13.59900 20 20 1s(2S_{1/2})
 IonM H 1 2 1 1.0000e+20 1 1 Bare
 
-IonM He 2 1 1 24.58800 53 53 1s^2(1S_0) 
+IonM He 2 1 1 24.58800 53 17 1s^2(1S_0) 
 IonM He 2 2 2 54.41800 10 10 1s(2S_{1/2}) 
 IonM He 2 3 1 1.0000e+20 1 1 Bare 
 
@@ -53,31 +53,31 @@ IonV B 5 4 1 259.37700 1000 0 1s^2(1S_0)
 IonV B 5 5 2 340.22900 1000 0 1s(2S_{1/2}) 
 IonV B 5 6 1 1.0000e+20 0 0 Bare 
 
-IonM C 6 1 1 11.26000 1000 10 1s^22s^22p^2(3P_0) 
-IonM C 6 2 2 24.38400 1000 10 1s^22s^22p(2P^o_{1/2}) 
+IonM C 6 1 1 11.26000 1000 13 1s^22s^22p^2(3P_0) 
+IonM C 6 2 2 24.38400 1000 11 1s^22s^22p(2P^o_{1/2}) 
 IonM C 6 3 1 47.88800 1000 20 1s^22s^2(1S_0) 
 IonM C 6 4 2 64.49400 1000 24 1s^22s(2S_{1/2}) 
-IonM C 6 5 1 392.09000 1000 31 1s^2(1S_0) 
+IonM C 6 5 1 392.09000 1000 17 1s^2(1S_0) 
 IonM C 6 6 2 489.99700 1000 16 1s(2S_{1/2}) 
 IonM C 6 7 1 1.0000e+20 1 1 Bare 
 
-IonM N 7 1 4 14.53400 1000 10 1s^22s^22p^3(4S^o_{3/2}) 
-IonM N 7 2 1 29.60200 1000 10 1s^22s^22p^2(3P_0) 
-IonM N 7 3 2 47.45000 1000 10 1s^22s^22p(2P^o_{1/2}) 
+IonM N 7 1 4 14.53400 1000  5 1s^22s^22p^3(4S^o_{3/2}) 
+IonM N 7 2 1 29.60200 1000 15 1s^22s^22p^2(3P_0) 
+IonM N 7 3 2 47.45000 1000 11 1s^22s^22p(2P^o_{1/2}) 
 IonM N 7 4 1 77.47400 1000 20 1s^22s^2(1S_0) 
 IonM N 7 5 2 97.89100 1000 25 1s^22s(2S_{1/2}) 
 IonM N 7 6 1 552.07400 1000 17 1s^2(1S_0) 
-IonM N 7 7 2 667.05100 1000 10 1s(2S_{1/2}) 
+IonM N 7 7 2 667.05100 1000 16 1s(2S_{1/2}) 
 IonM N 7 8 1 1.0000e+20 1 1 Bare 
 
-IonM O 8 1 5 13.61800 1000 10 1s^22s^22p^4(3P_2) 
-IonM O 8 2 4 35.11800 1000 10 1s^22s^22p^3(4S^o_{3/2}) 
-IonM O 8 3 1 54.93600 1000 10 1s^22s^22p^2(3P_0) 
-IonM O 8 4 2 77.41400 1000 10 1s^22s^22p(2P^o_{1/2}) 
-IonM O 8 5 1 113.90000 1000 10 1s^22s^2(1S_0) 
-IonM O 8 6 2 138.12100 1000 10 1s^22s(2S_{1/2}) 
-IonM O 8 7 1 739.33800 1000 10 1s^2(1S_0) 
-IonM O 8 8 2 871.41700 1000 10 1s(2S_{1/2}) 
+IonM O 8 1 5 13.61800 1000  7 1s^22s^22p^4(3P_2) 
+IonM O 8 2 4 35.11800 1000  5 1s^22s^22p^3(4S^o_{3/2}) 
+IonM O 8 3 1 54.93600 1000 15 1s^22s^22p^2(3P_0) 
+IonM O 8 4 2 77.41400 1000 11 1s^22s^22p(2P^o_{1/2}) 
+IonM O 8 5 1 113.90000 1000 20 1s^22s^2(1S_0) 
+IonM O 8 6 2 138.12100 1000 24 1s^22s(2S_{1/2}) 
+IonM O 8 7 1 739.33800 1000 17 1s^2(1S_0) 
+IonM O 8 8 2 871.41700 1000 16 1s(2S_{1/2}) 
 IonM O 8 9 1 1.0000e+20 1 1 Bare 
 
 IonV F 9 1 4 17.42300 1000 0 1s^22s^22p^5(2P^o_{3/2}) 

diff --git a/xdata/CIIICIVCV_c10.dat → zdata/CIIICIVCV_c10.dat b/xdata/CIIICIVCV_c10.dat → zdata/CIIICIVCV_c10.dat
diff --git a/xdata/CIIICIVCV_c10_CV1LVL.dat → zdata/CIIICIVCV_c10_CV1LVL.dat b/xdata/CIIICIVCV_c10_CV1LVL.dat → zdata/CIIICIVCV_c10_CV1LVL.dat
diff --git a/xdata/CIIICIV_c10.dat → zdata/CIIICIV_c10.dat b/xdata/CIIICIV_c10.dat → zdata/CIIICIV_c10.dat
diff --git a/zdata/Readme.md b/zdata/Readme.md
@@ -0,0 +1,21 @@
+This is a brief decscription of model sets that existed in the xdata directory. Many can be deleted.
+
+This directory is more generally to be used for test models
+
+CIIICIVCV\_c10.dat - macro atom data sets which Kiera made for testing
+CIIICIVCV\_c10\_CV1LVL.dat - macro atom data sets which Kiera made for testing
+CIIICIV\_c10.dat - macro atom data sets which Kiera made for testing
+c\_4to6.dat - test macro atom sets which Stuart made from his X-rah modelling
+c\_4to6\_o\_6to8.dat - test macro atom sets which Stuart made from his X-rah modelling
+fe\_23to27.dat - intermediate historical attempt for x-ray data
+h10\_hetop10.dat - diagnositic with other lines similar to Standard 80
+h10\_hetop\_lohe1\_standard80.dat - diagnostic with other lines similar to Standard 80, only one level of he1, 10 of 2. Delete?
+h10\_hetop\_only.dat - Just H and He (other elements commmented out in elemem ion file
+h10\_hetop\_standard80.dat - Reduced from similar with h20. Deleted
+h10\_standard80.dat - H but no helium macro atom
+h20.dat - pure H 
+h20\_hetop\_no\_recomb.dat - To force Milne relation.
+h3\_hetop3.dat - 3 H and 3 He (delete soon)
+h\_only.dat - Pure H. no macro. (Delete)
+standard80\_sn\_kurucz.dat - To be moved to data-release repository
+standard80\_test.dat - Very old (Delete)
diff --git a/xdata/c_4to6.dat → zdata/c_4to6.dat b/xdata/c_4to6.dat → zdata/c_4to6.dat
diff --git a/xdata/c_4to6_o_6to8.dat → zdata/c_4to6_o_6to8.dat b/xdata/c_4to6_o_6to8.dat → zdata/c_4to6_o_6to8.dat
diff --git a/xdata/fe_23to27.dat → zdata/fe_23to27.dat b/xdata/fe_23to27.dat → zdata/fe_23to27.dat
diff --git a/xdata/h10_hetop10.dat → zdata/h10_hetop10.dat b/xdata/h10_hetop10.dat → zdata/h10_hetop10.dat
diff --git a/xdata/h10_hetop_lohe1_standard80.dat → zdata/h10_hetop_lohe1_standard80.dat b/xdata/h10_hetop_lohe1_standard80.dat → zdata/h10_hetop_lohe1_standard80.dat
diff --git a/xdata/h10_hetop_only.dat → zdata/h10_hetop_only.dat b/xdata/h10_hetop_only.dat → zdata/h10_hetop_only.dat
diff --git a/xdata/h10_hetop_standard80.dat → zdata/h10_hetop_standard80.dat b/xdata/h10_hetop_standard80.dat → zdata/h10_hetop_standard80.dat
diff --git a/xdata/h10_standard80.dat → zdata/h10_standard80.dat b/xdata/h10_standard80.dat → zdata/h10_standard80.dat
diff --git a/xdata/h20.dat → zdata/h20.dat b/xdata/h20.dat → zdata/h20.dat
diff --git a/xdata/h20_hetop_no_recomb.dat → zdata/h20_hetop_no_recomb.dat b/xdata/h20_hetop_no_recomb.dat → zdata/h20_hetop_no_recomb.dat
diff --git a/xdata/h3_hetop3.dat → zdata/h3_hetop3.dat b/xdata/h3_hetop3.dat → zdata/h3_hetop3.dat
diff --git a/xdata/h_only.dat → zdata/h_only.dat b/xdata/h_only.dat → zdata/h_only.dat
diff --git a/xdata/standard80_sn_kurucz.dat → zdata/standard80_sn_kurucz.dat b/xdata/standard80_sn_kurucz.dat → zdata/standard80_sn_kurucz.dat
diff --git a/xdata/standard80_test.dat → zdata/standard80_test.dat b/xdata/standard80_test.dat → zdata/standard80_test.dat