SAMBA-ilum 1.0.0.420__tar.gz → 1.0.0.422__tar.gz

{samba_ilum-1.0.0.420 → samba_ilum-1.0.0.422}/PKG-INFO

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

{samba_ilum-1.0.0.420 → samba_ilum-1.0.0.422}/SAMBA_ilum.egg-info/PKG-INFO

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

{samba_ilum-1.0.0.420 → samba_ilum-1.0.0.422}/SAMBA_ilum.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ samba_ilum/__init__.py
 samba_ilum/__main__.py
 samba_ilum/src/BZ_2D.py
 samba_ilum/src/HeteroStructure_Generator.py
+samba_ilum/src/HeteroStructure_Generator_old.py
 samba_ilum/src/_info_pseudo.py
 samba_ilum/src/a-scan.py
 samba_ilum/src/a-scan_analysis.py

{samba_ilum-1.0.0.420 → samba_ilum-1.0.0.422}/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.420'
+version = '1.0.0.422'
 
 print(" ")
 print("=============================================================")
@@ -97,7 +97,10 @@ if (tarefa == 1):
    #--------------------------------------------------------------------------------------------------
    # Checking if the "SAMBA_HeteroStructure.input" file exists, if it does not exist it is created ---
    #--------------------------------------------------------------------------------------------------
-   if os.path.isfile(dir_files + '/SAMBA_HeteroStructure.input'):
+   if (n_Lattice == 2): code_HeteroStructure = '/SAMBA_HeteroStructure.input'
+   if (n_Lattice == 3): code_HeteroStructure = '/SAMBA_HeteroStructure_old.input'
+   #----------------------------------------------------
+   if os.path.isfile(dir_files + code_HeteroStructure ):
       0 == 0
    else:
       shutil.copyfile(dir_codes + '/SAMBA_HeteroStructure.input', dir_files + '/SAMBA_HeteroStructure.input')

{samba_ilum-1.0.0.420 → samba_ilum-1.0.0.422}/samba_ilum/src/BZ_2D.py

@@ -1,4 +1,5 @@
-#-----------------
+# SAMBA_ilum Copyright (C) 2024 - Closed source
+
 import numpy as np
 import sys
 import os

{samba_ilum-1.0.0.420 → samba_ilum-1.0.0.422}/samba_ilum/src/HeteroStructure_Generator.py

@@ -744,9 +744,9 @@ for s in range(len(files)):
 
        temp_area = files[s].replace('.dat', '').replace('_', ' ').split()
        area_min = temp_area[2];  area_max = temp_area[3]
-       #-------------------------------------------------------------------------------------------------------------------------------------
-       if (n_Lattice == 2):  Structures = open(diret + 'Matching_Lattices' + '/Matching_Lattices_' + area_min + '_' + area_max + '.dat', "w")
-       if (n_Lattice == 3):  Structures = open(diret + 'Matching_Lattices' + '/Matching_Lattices_' + area_min + '_' + area_max + '_12.dat', "w")
+       #-----------------------------------------------------------------------------------------------------------------------------------------------
+       if (n_Lattice == 2):  Structures = open(diret + 'Matching_Lattices' + '/Matching_Lattices_' + str(area_min) + '_' + str(area_max) + '.dat', "w")
+       if (n_Lattice == 3):  Structures = open(diret + 'Matching_Lattices' + '/Matching_Lattices_' + str(area_min) + '_' + str(area_max) + '_12.dat', "w")
        #--------------------------------------------------------------------------------------------------------------------------------------------------------
        A1x = SLattice1[:,0]; A1y = SLattice1[:,1]; dA1 = SLattice1[:,2]; B1x = SLattice1[:,3]; B1y = SLattice1[:,4]; dB1 = SLattice1[:,5]; ang1 = SLattice1[:,6]
        A2x = SLattice2[:,0]; A2y = SLattice2[:,1]; dA2 = SLattice2[:,2]; B2x = SLattice2[:,3]; B2y = SLattice2[:,4]; dB2 = SLattice2[:,5]; ang2 = SLattice2[:,6]
@@ -836,8 +836,8 @@ if (n_Lattice == 3 and cont == 1):
        print(f'etapa {s+1}/{len(files)}') 
        #---------------------------------
 
-       #-----------------------------------------------------------------------------------------------------------------------------------
-       SLattice1 = np.loadtxt(diret + 'Matching_Lattices' + '/Matching_Lattices_' + area_min + '_' + area_max + '_12.dat'); SLattice1.shape
+       #---------------------------------------------------------------------------------------------------------------------------------------------
+       SLattice1 = np.loadtxt(diret + 'Matching_Lattices' + '/Matching_Lattices_' + str(area_min) + '_' + str(area_max) + '_12.dat'); SLattice1.shape
        SLattice3 = np.loadtxt(diret + 'cells_Lattice3' + '/' + files[s]); SLattice3.shape
        #---------------------------------------------------------------------------------------------------------------
        Structures = open(diret + 'Matching_Lattices' + '/Matching_Lattices_' + area_min + '_' + area_max + '.dat', "w")