nucleardatapy 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

nucleardatapy/matter/setup_pheno.py

@@ -15,7 +15,9 @@ def pheno_models():
     #
     if nuda.env.verb: print("\nEnter pheno_models()")
     #
-    models = [ 'Skyrme', 'ESkyrme', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF' ]
+    # models = [ 'Skyrme', 'ESkyrme', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF' ]
+    models = [ 'Skyrme', 'ESkyrme', 'NLRH', 'DDRH', 'DDRHF' ]
+
     #print('Phenomenological models available in the toolkit:',models)
     models_lower = [ item.lower() for item in models ]
     #
@@ -52,7 +54,7 @@ def pheno_params( model ):
     #
     #print('For model:',model)
     if model.lower() == 'skyrme':
-        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2','F-', \
+        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2', 'F-', \
             'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', 'NRAPR', 'RATP', \
             'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
             'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', \
@@ -61,9 +63,7 @@ def pheno_params( model ):
     elif model.lower() == 'eskyrme':
         params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32',  'BSkG3','BSkG4' ]
     elif model.lower() == 'fayans':
-        params = [ 'SLy4', 'SkM*', 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)', \
-            'SV-min', 'SV-bas', 'SV-K218', 'SV-K226', 'SV-K241', 'SV-mas07', 'SV-mas08', 'SV-mas10',\
-            'SV-sym28', 'SV-sym32', 'SV-sym34', 'SV-kap00', 'SV-kap20', 'SV-kap60' ]
+        params = [ 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' ]
     elif model.lower() == 'gogny':
         params = [ 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' ]
     elif model.lower() == 'nlrh':
@@ -93,7 +93,11 @@ class setupPheno():
     'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', 'UNEDF0', 'UNEDF1'. 
 
     If `models` == 'ESkyrme', `param` can be: 'BSk22', 'BSk24', 'BSk25', \
-    'BSk26', 'BSk31', 'BSk32',  'BSkG3','BSkG4' .
+    'BSk26', 'BSk31', 'BSk32', 'BSkG3','BSkG4' .
+
+    If `models` == 'Fayans', `param` can be: 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' \
+
+    If `models` == 'Gogny', `param` can be: 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' \
 
     If `models` == 'NLRH', `param` can be: 'NL-SH', 'NL3', 'NL3II', 'PK1', 'PK1R', 'TM1'. 
 

nucleardatapy/matter/setup_pheno_esym.py

@@ -54,14 +54,18 @@ def pheno_esym_params( model ):
     #
     #print('For model:',model)
     if model.lower() == 'skyrme':
-        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'F-', \
+        params = [ 'BSK14', 'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2', 'F-', \
             'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', 'NRAPR', 'RATP', \
             'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
             'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', \
             'SLY4', 'SLY5', 'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', \
-            'UNEDF0', 'UNEDF1']
+            'UNEDF0', 'UNEDF1' ]
     elif model.lower() == 'eskyrme':
-        params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32', 'BSkG1', 'BSkG2', 'BSkG3' ]
+        params = [ 'BSk22', 'BSk24', 'BSk25', 'BSk26', 'BSk31', 'BSk32',  'BSkG3','BSkG4' ]
+    elif model.lower() == 'fayans':
+        params = [ 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' ]
+    elif model.lower() == 'gogny':
+        params = [ 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' ]
     elif model.lower() == 'nlrh':
         params = [ 'NL-SH', 'NL3', 'NL3II', 'PK1', 'PK1R', 'TM1' ]
     elif model.lower() == 'ddrh':
@@ -81,14 +85,18 @@ class setupPhenoEsym():
     interactions and choosen by the toolkit practitioner. \
     This choice is defined in the variables `model` and `param`.
 
-    If `models` == 'skyrme', `param` can be: 'BSK14', \
-    'BSK16', 'BSK17', 'BSK27', 'F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
+    If `models` == 'Skyrme', `param` can be: 'BSK14', \
+    'BSK16', 'BSK17', 'BSK27', 'BSkG1', 'BSkG2','F-', 'F+', 'F0', 'FPL', 'LNS', 'LNS1', 'LNS5', \
     'NRAPR', 'RATP', 'SAMI', 'SGII', 'SIII', 'SKGSIGMA', 'SKI2', 'SKI4', 'SKMP', \
     'SKMS', 'SKO', 'SKOP', 'SKP', 'SKRSIGMA', 'SKX', 'Skz2', 'SLY4', 'SLY5', \
     'SLY230A', 'SLY230B', 'SV', 'T6', 'T44', 'UNEDF0', 'UNEDF1'. 
 
     If `models` == 'ESkyrme', `param` can be: 'BSk22', 'BSk24', 'BSk25', \
-    'BSk26', 'BSk31', 'BSk32', 'BSkG1', 'BSkG2', 'BSkG3'.
+    'BSk26', 'BSk31', 'BSk32', 'BSkG3','BSkG4' .
+
+    If `models` == 'Fayans', `param` can be: 'Fy(IVP)', 'Fy(Dr,HDB)', 'Fy(std)' \
+
+    If `models` == 'Gogny', `param` can be: 'D1S', 'D1', 'D250', 'D260', 'D280', 'D300' \
 
     If `models` == 'NLRH', `param` can be: 'NL-SH', 'NL3', 'NL3II', 'PK1', 'PK1R', 'TM1'. 
 

nucleardatapy/nuc/setup_be_exp.py

@@ -537,6 +537,7 @@ class setupBEExp():
         self.sel_nucBE = []
         self.sel_nucBE_err = []
         #
+        self.sel_Zmin = 100
         self.sel_Zmax = 0
         #
         for ind in range(self.nbNuc):
@@ -587,6 +588,7 @@ class setupBEExp():
             nbNucSel = nbNucSel + 1
             self.sel_nucA.append( nucA )
             self.sel_nucZ.append( nucZ )
+            if nucZ < self.sel_Zmin: self.sel_Zmin = nucZ
             if nucZ > self.sel_Zmax: self.sel_Zmax = nucZ
             self.sel_nucN.append( nucN )
             self.sel_nucI.append( nucI )
@@ -744,8 +746,8 @@ class setupBEExp():
         #
         Nstable, Zstable = stable_fit_Z( Zmin = Zref, Zmax = Zref )
         #
-        nucNmin = Nstable[0]
-        nucNmax = Nstable[0]
+        nucNmin = Nstable[0]+4
+        nucNmax = Nstable[0]-4
         #
         for ind,A in enumerate(self.sel_nucA):
             #