diff --git a/Codigo3D_Coefs.py b/Codigo3D_Coefs.py index e71504d..6052020 100644 --- a/Codigo3D_Coefs.py +++ b/Codigo3D_Coefs.py @@ -84,12 +84,7 @@ class SHD: l,m = A[0][n],A[1][n] return l,m - def __init__(self,name="SHD",Lmin=2,Lmax=10,debug=False, - radiusMode = "geometric", - expansionMode = "abs"): - - self.__availableRadiusModes = ["expansion","geometric"] - self.__availableExpansionModes = ["fluct","abs"] + def __init__(self,name="SHD",Lmin=2,Lmax=10,debug=False): self.__DEBUG = debug @@ -110,34 +105,8 @@ class SHD: ch.setLevel(logging.INFO) ch.setFormatter(formatter) - #Create other logger. Log to file, with level DEBUG - fh = logging.FileHandler(f'{self.__name}.log') - fh.setLevel(logging.DEBUG) - fh.setFormatter(formatter) - self.logger.addHandler(ch) - self.logger.addHandler(fh) - - ###################################################### - - if radiusMode not in self.__availableRadiusModes: - self.logger.error("Radius mode {} not available. Available modes are: {}".format(radiusMode,self.__availableRadiusModes)) - raise ValueError - else: - self.__radiusMode = radiusMode - - if expansionMode not in self.__availableExpansionModes: - self.logger.error("Traj mode {} not available. Available modes are: {}".format(expansionMode,self.__availableExpansionModes)) - raise ValueError - else: - self.__expansionMode = expansionMode - - if self.__radiusMode == "expansion" and self.__expansionMode == "fluct": - #Not compatible - self.logger.error("Radius mode {} and traj mode {} not compatible".format(self.__radiusMode,self.__expansionMode)) - raise ValueError - - + def __setGrid(self): self.gridSize = self.thetaGrid.shape[0] self.grid = np.asarray([self.thetaGrid,self.phiGrid]).T diff --git a/Codigo3D_FuncionGeneral.py b/Codigo3D_FuncionGeneral.py index d408f92..49277e5 100644 --- a/Codigo3D_FuncionGeneral.py +++ b/Codigo3D_FuncionGeneral.py @@ -11,7 +11,7 @@ import Codigo3D_AjusteHelfrich as c3 def calculate_al(Datos,Lmaximo): - cdata = SHD(name="SPH",Lmin=0,Lmax=Lmaximo,expansionMode="abs",radiusMode="expansion") # def clase + cdata = SHD(name="SPH",Lmin=0,Lmax=Lmaximo) # def clase ### CARGAMOS DATOS A LA CLASE diff --git a/SPH.log b/SPH.log deleted file mode 100644 index 3cba4fc..0000000 --- a/SPH.log +++ /dev/null @@ -1,8 +0,0 @@ -09-Apr-2025 01:30:39 - sphAnalysis - INFO - Generating icosahedral grid with 3 subdivisions ... -09-Apr-2025 01:30:39 - sphAnalysis - INFO - Distributing trajectory points along grid ... -09-Apr-2025 01:31:47 - sphAnalysis - INFO - Performing spherical harmonic expansion ... -09-Apr-2025 01:31:51 - sphAnalysis - INFO - Realizando el calculo de valores medios... -09-Apr-2025 01:32:35 - sphAnalysis - INFO - Generating icosahedral grid with 3 subdivisions ... -09-Apr-2025 01:32:36 - sphAnalysis - INFO - Distributing trajectory points along grid ... -09-Apr-2025 01:33:45 - sphAnalysis - INFO - Performing spherical harmonic expansion ... -09-Apr-2025 01:33:50 - sphAnalysis - INFO - Realizando el calculo de valores medios... diff --git a/__pycache__/Codigo3D_AjusteHelfrich.cpython-311.pyc b/__pycache__/Codigo3D_AjusteHelfrich.cpython-311.pyc deleted file mode 100644 index 8110fb9..0000000 Binary files a/__pycache__/Codigo3D_AjusteHelfrich.cpython-311.pyc and /dev/null differ diff --git a/__pycache__/Codigo3D_Coefs.cpython-311.pyc b/__pycache__/Codigo3D_Coefs.cpython-311.pyc deleted file mode 100644 index 054247b..0000000 Binary files a/__pycache__/Codigo3D_Coefs.cpython-311.pyc and /dev/null differ diff --git a/__pycache__/Codigo3D_FuncionGeneral.cpython-311.pyc b/__pycache__/Codigo3D_FuncionGeneral.cpython-311.pyc deleted file mode 100644 index e066b59..0000000 Binary files a/__pycache__/Codigo3D_FuncionGeneral.cpython-311.pyc and /dev/null differ