SAMBA-ilum 1.0.0.531__tar.gz → 1.0.0.532__tar.gz

{samba_ilum-1.0.0.531 → samba_ilum-1.0.0.532}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SAMBA_ilum
-Version: 1.0.0.531
+Version: 1.0.0.532
 Summary: ...
 Author: Augusto de Lelis Araujo
 Author-email: augusto-lelis@outlook.com

{samba_ilum-1.0.0.531 → samba_ilum-1.0.0.532}/SAMBA_ilum.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SAMBA_ilum
-Version: 1.0.0.531
+Version: 1.0.0.532
 Summary: ...
 Author: Augusto de Lelis Araujo
 Author-email: augusto-lelis@outlook.com

{samba_ilum-1.0.0.531 → samba_ilum-1.0.0.532}/samba_ilum/__main__.py

@@ -16,7 +16,7 @@ dir_samba = os.path.dirname(os.path.realpath(__file__))
 print(f'{dir_samba}')
 #--------------------
 
-version = '1.0.0.531'
+version = '1.0.0.532'
 
 print(" ")
 print("=============================================================")

{samba_ilum-1.0.0.531 → samba_ilum-1.0.0.532}/samba_ilum/src/HeteroStructure_Generator.py

@@ -1976,19 +1976,18 @@ for i in range(len(files)):
     VTemp1 = VTemp[-1].split()
     #-------------------------
     pulo = n_Lattice +4 
-    tag1_str  = VTemp[pulo + 1];   tag1  = [float(x) for x in tag1_str.split('_')]    # mismatch_areas_12_21
-    tag2_str  = VTemp[pulo + 5];   tag2  = [float(x) for x in tag2_str.split('_')]    # var_areas
-    tag3_str  = VTemp[pulo + 9];   tag3  = [float(x) for x in tag3_str.split('_')]    # var_vectors
-    tag4_str  = VTemp[pulo + 13];  tag4  = [float(x) for x in tag4_str.split('_')]    # mismatch_angles_12_21
-    tag5_str  = VTemp[pulo + 17];  tag5  = [float(x) for x in tag5_str.split('_')]    # var_angles
-    tag6_str  = VTemp[pulo + 21];  tag6  = [float(x) for x in tag6_str.split('_')]    # rotation_angle
-    tag7_str  = VTemp[pulo + 25];  tag7  = [float(x) for x in tag7_str.split('_')]    # MSCell_1
-    tag8_str  = VTemp[pulo + 29];  tag8  = [float(x) for x in tag8_str.split('_')]    # MSCell_2
-    tag9_str  = VTemp[pulo + 33];  tag9  = [float(x) for x in tag9_str.split('_')]    # MDeform_1
-    tag10_str = VTemp[pulo + 37];  tag10 = [float(x) for x in tag10_str.split('_')]   # MDeform_2
-    #--------------------------------------------------------------------------------------------
-    data_hash = [tag1, tag2, tag3, tag4, tag5, tag6, tag7, tag8, tag9, tag10]
-    #------------------------------------------------------------------------
+    tag1_str = VTemp[pulo + 1];   tag1 = [float(x) for x in tag1_str.split('_')]   # mismatch_areas_12_21
+    tag2_str = VTemp[pulo + 5];   tag2 = [float(x) for x in tag2_str.split('_')]   # var_areas
+    tag3_str = VTemp[pulo + 9];   tag3 = [float(x) for x in tag3_str.split('_')]   # var_vectors
+    tag4_str = VTemp[pulo + 13];  tag4 = [float(x) for x in tag4_str.split('_')]   # mismatch_angles_12_21
+    tag5_str = VTemp[pulo + 17];  tag5 = [float(x) for x in tag5_str.split('_')]   # var_angles
+    tag6_str = VTemp[pulo + 25];  tag6 = [float(x) for x in tag6_str.split('_')]   # MSCell_1
+    tag7_str = VTemp[pulo + 29];  tag7 = [float(x) for x in tag7_str.split('_')]   # MSCell_2
+    tag8_str = VTemp[pulo + 33];  tag8 = [float(x) for x in tag8_str.split('_')]   # MDeform_1
+    tag9_str = VTemp[pulo + 37];  tag9 = [float(x) for x in tag9_str.split('_')]   # MDeform_2
+    #-----------------------------------------------------------------------------------------
+    data_hash = [tag1, tag2, tag3, tag4, tag5, tag6, tag7, tag8, tag9]
+    #-----------------------------------------------------------------
     new_id = hashlib.sha1(json.dumps(data_hash, separators=(',', ':')).encode('utf-8')).hexdigest()[:8]
     #--------------------------------------------------------------------------------------------------
 

{samba_ilum-1.0.0.531 → samba_ilum-1.0.0.532}/setup.py

@@ -6,7 +6,7 @@ import json
 
 setup(
     name = "SAMBA_ilum",
-    version = "1.0.0.531",
+    version = "1.0.0.532",
     entry_points={'console_scripts': ['samba_ilum = samba_ilum:main']},
     description = "...",
     author = "Augusto de Lelis Araujo",