Changeset 3301 for trunk/ElementTable.py

Timestamp:

Mar 1, 2018 3:14:02 PM (5 years ago)

Author:

vondreele

Message:

copy lowest valent magnetic formfactors to missing zero valent elements - mostly rare earths & actinides

File:

• trunk/ElementTable.py (modified) (1 diff)

trunk/ElementTable.py

@@ -142 +142 @@
     (["Rh","Rh+1"],                                     8,4, "Rhodium",     Metcolor,         0.258,(10,125,140)),
     (["Pd","Pd+1"],                                     9,4, "Palladium",   Metcolor,         0.270,(0,105,133)),
-    (["Ce+2"],                                      3.5,6.5, "Cerium",      REcolor,          0.474,(255,255,199)),
-    (["Nd+2"],                                      5.5,6.5, "Neodymium",   REcolor,          0.516,(199,255,199)),
-    (["Sm+2","Sm+3"],                               7.5,6.5, "Samarium",    REcolor,          0.558,(143,255,199)),
-    (["Eu+2","Eu+3"],                               8.5,6.5, "Europium",    REcolor,          0.582,(97,255,199)),
-    (["Gd+2","Gd+3"],                               9.5,6.5, "Gadolinium",  REcolor,          0.610,(69,255,199)),
-    (["Tb+2","Tb+3"],                              10.5,6.5, "Terbium",     REcolor,          0.624,(48,255,199)),
-    (["Dy+2","Dy+3"],                              11.5,6.5, "Dysprosium",  REcolor,          0.648,(31,255,199)),
-    (["Ho+2","Ho+3"],                              12.5,6.5, "Holmium",     REcolor,          0.672,(0,255,156)),
-    (["Er+2","Er+3"],                              13.5,6.5, "Erbium",      REcolor,          0.696,(0,230,117)),
-    (["Tm+2","Tm+3"],                              14.5,6.5, "Thulium",     REcolor,          0.723,(0,212,82)),
-    (["Yb+2","Yb+3"],                              15.5,6.5, "Ytterbium",   REcolor,          0.750,(0,191,56)),
-    (["Hf+2","Hf+#"],                                   3,5, "Hafnium",     Metcolor,         0.804,(77,194,255)),
-    (["Ta+2","Ta+3","Ta+4"],                            4,5, "Tantalum",    Metcolor,         0.834,(77,166,255)),
+    #NB: zero valent atoms are copied from lowest valent ion for many of these
+    (["Ce","Ce+2"],                                      3.5,6.5, "Cerium",      REcolor,          0.474,(255,255,199)),
+    (["Nd","Nd+2"],                                      5.5,6.5, "Neodymium",   REcolor,          0.516,(199,255,199)),
+    (["Sm","Sm+2","Sm+3"],                               7.5,6.5, "Samarium",    REcolor,          0.558,(143,255,199)),
+    (["Eu","Eu+2","Eu+3"],                               8.5,6.5, "Europium",    REcolor,          0.582,(97,255,199)),
+    (["Gd","Gd+2","Gd+3"],                               9.5,6.5, "Gadolinium",  REcolor,          0.610,(69,255,199)),
+    (["Tb","Tb+2","Tb+3"],                              10.5,6.5, "Terbium",     REcolor,          0.624,(48,255,199)),
+    (["Dy","Dy+2","Dy+3"],                              11.5,6.5, "Dysprosium",  REcolor,          0.648,(31,255,199)),
+    (["Ho","Ho+2","Ho+3"],                              12.5,6.5, "Holmium",     REcolor,          0.672,(0,255,156)),
+    (["Er","Er+2","Er+3"],                              13.5,6.5, "Erbium",      REcolor,          0.696,(0,230,117)),
+    (["Tm","Tm+2","Tm+3"],                              14.5,6.5, "Thulium",     REcolor,          0.723,(0,212,82)),
+    (["Yb","Yb+2","Yb+3"],                              15.5,6.5, "Ytterbium",   REcolor,          0.750,(0,191,56)),
+    (["Hf","Hf+2","Hf+3"],                                   3,5, "Hafnium",     Metcolor,         0.804,(77,194,255)),
+    (["Ta","Ta+2","Ta+3","Ta+4"],                            4,5, "Tantalum",    Metcolor,         0.834,(77,166,255)),
     (["W","W+1","W+2","W+3","W+4","W+5"],               5,5, "Tungsten",    Metcolor,         0.864,(33,148,214)),
     (["Re","Re+1","Re+2","Re+3","Re+4","Re+5","Re+6"],  6,5, "Rhenium",     Metcolor,         0.900,(38,125,171)),
     (["Os","Os+1","Os+2","Os+3","Os+4","Os+5","Os+6","Os+7"],  7,5, "Osmium",      Metcolor,         0.919,(38,102,150)),
     (["Ir","Ir+1","Ir+2","Ir+3","Ir+4","Ir+5","Ir+6"],  8,5, "Iridium",     Metcolor,         0.948,(23,84,135)),
-    (["Pt+1","Pt+2","Pt+3","Pt+4","Pt+5","Pt+6"],       9,5, "Platinium",   Metcolor,         0.984,(208,208,224)),
-    (["Au+1","Au+2","Au+3","Au+4","Au+5"],             10,5, "Gold",        Metcolor,         1.014,(255,209,35)),
-(["U+3","U+4","U+5"],                           5.5,7.5, "Uranium",     REcolor,          1.470,(0,143,255)),
-    (["Np+3","Np+4","Np+5","Np+6"],                 6.5,7.5, "Neptunium",   REcolor,       1.536,(0,128,255)),
-    (["Pu+3","Pu+4","Pu+5","Pu+6"],                 7.5,7.5, "Plutonium",   REcolor,       1.584,(0,107,255)),
-    (["Am+2","Am+3","Am+4","Am+5","Am+6","Am+7"],   8.5,7.5, "Americium",   REcolor,          1.626,(84,92,242)),
+    (["Pt","Pt+1","Pt+2","Pt+3","Pt+4","Pt+5","Pt+6"],       9,5, "Platinium",   Metcolor,         0.984,(208,208,224)),
+    (["Au","Au+1","Au+2","Au+3","Au+4","Au+5"],             10,5, "Gold",        Metcolor,         1.014,(255,209,35)),
+    (["U","U+3","U+4","U+5"],                           5.5,7.5, "Uranium",     REcolor,          1.470,(0,143,255)),
+    (["Np","Np+3","Np+4","Np+5","Np+6"],                 6.5,7.5, "Neptunium",   REcolor,       1.536,(0,128,255)),
+    (["Pu","Pu+3","Pu+4","Pu+5","Pu+6"],                 7.5,7.5, "Plutonium",   REcolor,       1.584,(0,107,255)),
+    (["Am","Am+2","Am+3","Am+4","Am+5","Am+6","Am+7"],   8.5,7.5, "Americium",   REcolor,          1.626,(84,92,242)),
     ]