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

nucleardatapy/matter/setup_micro.py

@@ -30,8 +30,8 @@ def micro_mbs():
     if nuda.env.verb:
         print("\nEnter micro_mbs()")
     #
-    mbs = ["VAR", "AFDMC", "BHF2", "BHF23", "QMC", "MBPT", "NLEFT"]
-    mbs_lower = [item.lower() for item in mbs]
+    mbs = [ "VAR", "AFDMC", "BHF2", "BHF23", "QMC", "MBPT", "NLEFT", "SCGF", "CC" ]
+    mbs_lower = [ item.lower() for item in mbs ]
     #
     if nuda.env.verb:
         print("Exit micro_mbs()")
@@ -73,9 +73,15 @@ def micro_models_mb(mb):
     '2014-AFQMC-NM', '2016-QMC-NM', \
     '2018-QMC-NM', '2024-QMC-NM', \
     If `mb` == 'MBPT': \
-    '2013-MBPT-NM', '2010-MBPT-NM', '2020-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69'
+    '2013-MBPT-NM', '2010-MBPT-NM', '2020-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69',\
+    "2024-MBPT-AM-DN2LO-450", "2024-MBPT-AM-DN2LO-500", "2024-MBPT-AM-DN2LOgo-394", "2024-MBPT-AM-DN2LOgo-450", "2024-MBPT-AM-N2LOsat",\
+    If `mb` == 'SCGF': \
+    "2020-SCGF-AM-N3LO-414", "2020-SCGF-AM-N3LO-450", "2020-SCGF-AM-N3LO-500", "2024-SCGF-AM-DN2LO-450",\
+    "2024-SCGF-AM-DN2LO-500", "2024-SCGF-AM-DN2LOgo-394", "2024-SCGF-AM-DN2LOgo-450", "2024-SCGF-AM-N2LOsat",\
     If `mb` == 'NLEFT': \
     '2024-NLEFT-AM', \
+    If `mb` == 'CC': \
+    "2024-CC-AM-DN2LO-450", "2024-CC-AM-DN2LO-500", "2024-CC-AM-DN2LOgo-394", "2024-CC-AM-DN2LOgo-450", "2024-CC-AM-N2LOsat",\
     """
     #
     if nuda.env.verb:
@@ -150,10 +156,34 @@ def micro_models_mb(mb):
             "2019-MBPT-AM-L59",
             "2019-MBPT-AM-L69",
             "2020-MBPT-AM",
+            "2024-MBPT-AM-DN2LO-450",
+            "2024-MBPT-AM-DN2LO-500",
+            "2024-MBPT-AM-DN2LOgo-394",
+            "2024-MBPT-AM-DN2LOgo-450",
+            "2024-MBPT-AM-N2LOsat",
+        ]
+    elif mb.lower() == "scgf":
+        models = [
+            "2020-SCGF-AM-N3LO-414",
+            "2020-SCGF-AM-N3LO-450",
+            "2020-SCGF-AM-N3LO-500",
+            "2024-SCGF-AM-DN2LO-450",
+            "2024-SCGF-AM-DN2LO-500",
+            "2024-SCGF-AM-DN2LOgo-394",
+            "2024-SCGF-AM-DN2LOgo-450",
+            "2024-SCGF-AM-N2LOsat",
         ]
     # '2010-MBPT-NM' is removed because they do not provide e2a, only pressure
     elif mb.lower() == "nleft":
         models = ["2024-NLEFT-AM"]
+    elif mb.lower() == "cc":
+        models = [
+            "2024-CC-AM-DN2LO-450",
+            "2024-CC-AM-DN2LO-500",
+            "2024-CC-AM-DN2LOgo-394",
+            "2024-CC-AM-DN2LOgo-450",
+            "2024-CC-AM-N2LOsat",
+        ]
     #
     if nuda.env.verb:
         print("models available in the toolkit:", models)
@@ -1333,6 +1363,84 @@ class setupMicro:
             self.nm_eps = self.nm_e2a * self.nm_den
             self.nm_eps_err = self.nm_e2a_err * self.nm_den
             #
+        elif "2020-scgf-am" in model.lower():
+            #
+            self.flag_nm = True
+            self.flag_sm = True
+            self.flag_kf = False
+            self.flag_den = True
+            self.model = model
+            #
+            if model.lower() == "2020-scgf-am-n3lo-414":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2020-SCGF-SM-N3LO-414-TD.dat"
+                )
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2020-SCGF-NM-N3LO-414-TD.dat"
+                )
+            elif model.lower() == "2020-scgf-am-n3lo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2020-SCGF-SM-N3LO-450-TD.dat"
+                )
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2020-SCGF-NM-N3LO-450-TD.dat"
+                )
+            elif model.lower() == "2020-scgf-am-n3lo-500":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2020-SCGF-SM-N3LO-500-TD.dat"
+                )
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2020-SCGF-NM-N3LO-500-TD.dat"
+                )
+            if nuda.env.verb:
+                print("Reads file1:", file_in1)
+            if nuda.env.verb:
+                print("Reads file2:", file_in2)
+            self.ref = "A. Rios, Front. Phys. 8 387 (2020)"
+            self.note = ""
+            self.label = "SCGF-2020"
+            self.marker = "+"
+            self.linestyle = "solid"
+            self.every = 1
+            self.e_err = False
+            self.p_err = False
+            self.cs2_err = False
+            (
+                self.sm_den,
+                self.sm_chempot_n3lo,
+                self.sm_e2a_n3lo,
+                self.sm_pre_n3lo,
+            ) = np.loadtxt(
+                file_in1,
+                usecols=(0, 2, 3, 6),
+                comments="#",
+                unpack=True,
+            )
+            self.sm_e2a_int = self.sm_e2a_n3lo
+            (
+                self.nm_den,
+                self.nm_chempot_n3lo,
+                self.nm_e2a_n3lo,
+                self.nm_pre_n3lo,
+            ) = np.loadtxt(
+                file_in2,
+                usecols=(0, 2, 3, 6),
+                comments="#",
+                unpack=True,
+            )
+            self.nm_e2a_int = self.nm_e2a_n3lo
+            #
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_eps = self.nm_e2a * self.nm_den
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_kfn = nuda.kf_n( self.nm_den )
+            self.sm_kfn = nuda.kf_n( nuda.cst.half * self.sm_den )
+            self.nm_e2a_err = np.abs( uncertainty_stat(self.nm_den, err="MBPT") * self.nm_e2a_int )
+            self.sm_e2a_err = np.abs( uncertainty_stat(self.sm_den, err="MBPT") * self.sm_e2a_int )
+            self.nm_eps_err = self.nm_e2a_err * self.nm_den
+            self.sm_eps_err = self.sm_e2a_err * self.sm_den
+            #
         elif model.lower() == "2022-afdmc-nm":
             #
             self.flag_nm = True
@@ -1941,6 +2049,302 @@ class setupMicro:
             )
             self.nm_eps = self.nm_e2a * self.nm_den
             self.nm_eps_err = self.nm_e2a_err * self.nm_den
+            #
+        elif "2024-mbpt-am" in model.lower():
+            #
+            self.flag_nm = True
+            self.flag_sm = True
+            self.flag_kf = False
+            self.flag_den = True
+            #
+            if model.lower() == "2024-mbpt-am-dn2lo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLO450.dat"
+                )
+                cols_sm=(0,3)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLO450.dat"
+                )
+                cols_nm=(0,2)
+            elif model.lower() == "2024-mbpt-am-dn2lo-500":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLO500.dat"
+                )
+                cols_sm=(0,3)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLO500.dat"
+                )
+                cols_nm=(0,2)
+            elif model.lower() == "2024-mbpt-am-dn2logo-394":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLOgo394.dat"
+                )
+                cols_sm=(0,3)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLOgo394.dat"
+                )
+                cols_nm=(0,2)
+            elif model.lower() == "2024-mbpt-am-dn2logo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLOgo450.dat"
+                )
+                cols_sm=(0,3)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLOgo450.dat"
+                )
+                cols_nm=(0,3)
+            elif model.lower() == "2024-mbpt-am-n2losat":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-NNLOsat.dat"
+                )
+                cols_sm=(0,3)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-NNLOsat.dat"
+                )
+                cols_nm=(0,3)
+            if nuda.env.verb:
+                print("Reads file1:", file_in1)
+            if nuda.env.verb:
+                print("Reads file2:", file_in2)
+            self.ref = "F. Marino, W.G. Jiang, and S.J. Novario, Phys. Rev. C 110, 054322 (2024)."
+            self.note = "We consider MBPT(3) when possible, otherwise MBPT(2)."
+            self.label = "MBPT-2024"
+            self.model = model
+            self.marker = "x"
+            self.linestyle = "solid"
+            self.every = 1
+            self.e_err = False
+            self.p_err = False
+            self.cs2_err = False
+            (
+                self.sm_den,
+                self.sm_e2a_n2lo,
+            ) = np.loadtxt(
+                file_in1,
+                usecols=cols_sm,
+                comments="#",
+                unpack=True,
+            )
+            self.sm_e2a_int = self.sm_e2a_n2lo
+            (
+                self.nm_den,
+                self.nm_e2a_n2lo,
+            ) = np.loadtxt(
+                file_in2,
+                usecols=cols_nm,
+                comments="#",
+                unpack=True,
+            )
+            self.nm_e2a_int = self.nm_e2a_n2lo
+            #
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_eps = self.nm_e2a * self.nm_den
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_kfn = nuda.kf_n( self.nm_den )
+            self.sm_kfn = nuda.kf_n( nuda.cst.half * self.sm_den )
+            self.nm_e2a_err = np.abs( uncertainty_stat(self.nm_den, err="MBPT") * self.nm_e2a_int )
+            self.sm_e2a_err = np.abs( uncertainty_stat(self.sm_den, err="MBPT") * self.sm_e2a_int )
+            self.nm_eps_err = self.nm_e2a_err * self.nm_den
+            self.sm_eps_err = self.sm_e2a_err * self.sm_den
+            #
+        elif "2024-scgf-am" in model.lower():
+            #
+            self.flag_nm = True
+            self.flag_sm = True
+            self.flag_kf = False
+            self.flag_den = True
+            #
+            if model.lower() == "2024-scgf-am-dn2lo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLO450.dat"
+                )
+                cols_sm=(0,7)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLO450.dat"
+                )
+                cols_nm=(0,5)
+            elif model.lower() == "2024-scgf-am-dn2lo-500":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLO500.dat"
+                )
+                cols_sm=(0,7)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLO500.dat"
+                )
+                cols_nm=(0,5)
+            elif model.lower() == "2024-scgf-am-dn2logo-394":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLOgo394.dat"
+                )
+                cols_sm=(0,7)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLOgo394.dat"
+                )
+                cols_nm=(0,5)
+            elif model.lower() == "2024-scgf-am-dn2logo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLOgo450.dat"
+                )
+                cols_sm=(0,7)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLOgo450.dat"
+                )
+                cols_nm=(0,7)
+            elif model.lower() == "2024-scgf-am-n2losat":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-NNLOsat.dat"
+                )
+                cols_sm=(0,7)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-NNLOsat.dat"
+                )
+                cols_nm=(0,7)
+            if nuda.env.verb:
+                print("Reads file1:", file_in1)
+            if nuda.env.verb:
+                print("Reads file2:", file_in2)
+            self.ref = "F. Marino, W.G. Jiang, and S.J. Novario, Phys. Rev. C 110, 054322 (2024)."
+            self.note = "We consider ADC(3)-D when possible, otherwise ADC(3)"
+            self.label = "SCGF-2024"
+            self.marker = "x"
+            self.linestyle = "solid"
+            self.model = model
+            self.every = 1
+            self.e_err = False
+            self.p_err = False
+            self.cs2_err = False
+            (
+                self.sm_den,
+                self.sm_e2a_n2lo,
+            ) = np.loadtxt(
+                file_in1,
+                usecols=cols_sm,
+                comments="#",
+                unpack=True,
+            )
+            self.sm_e2a_int = self.sm_e2a_n2lo
+            (
+                self.nm_den,
+                self.nm_e2a_n2lo,
+            ) = np.loadtxt(
+                file_in2,
+                usecols=cols_nm,
+                comments="#",
+                unpack=True,
+            )
+            self.nm_e2a_int = self.nm_e2a_n2lo
+            #
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_eps = self.nm_e2a * self.nm_den
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_kfn = nuda.kf_n( self.nm_den )
+            self.sm_kfn = nuda.kf_n( nuda.cst.half * self.sm_den )
+            self.nm_e2a_err = np.abs( uncertainty_stat(self.nm_den, err="MBPT") * self.nm_e2a_int )
+            self.sm_e2a_err = np.abs( uncertainty_stat(self.sm_den, err="MBPT") * self.sm_e2a_int )
+            self.nm_eps_err = self.nm_e2a_err * self.nm_den
+            self.sm_eps_err = self.sm_e2a_err * self.sm_den
+            #
+        elif "2024-cc-am" in model.lower():
+            #
+            self.flag_nm = True
+            self.flag_sm = True
+            self.flag_kf = False
+            self.flag_den = True
+            #
+            if model.lower() == "2024-cc-am-dn2lo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLO450.dat"
+                )
+                cols_sm=(0,5)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLO450.dat"
+                )
+                cols_nm=(0,4)
+            elif model.lower() == "2024-cc-am-dn2lo-500":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLO500.dat"
+                )
+                cols_sm=(0,5)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLO500.dat"
+                )
+                cols_nm=(0,4)
+            elif model.lower() == "2024-cc-am-dn2logo-394":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLOgo394.dat"
+                )
+                cols_sm=(0,5)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLOgo394.dat"
+                )
+                cols_nm=(0,4)
+            elif model.lower() == "2024-cc-am-dn2logo-450":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-DeltaNNLOgo450.dat"
+                )
+                cols_sm=(0,5)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-DeltaNNLOgo450.dat"
+                )
+                cols_nm=(0,5)
+            elif model.lower() == "2024-cc-am-n2losat":
+                file_in1 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-SM-NNLOsat.dat"
+                )
+                cols_sm=(0,5)
+                file_in2 = os.path.join(
+                    nuda.param.path_data, "matter/micro/2024-ABI-NM-NNLOsat.dat"
+                )
+                cols_nm=(0,5)
+            if nuda.env.verb:
+                print("Reads file1:", file_in1)
+            if nuda.env.verb:
+                print("Reads file2:", file_in2)
+            self.ref = "F. Marino, W.G. Jiang, and S.J. Novario, Phys. Rev. C 110, 054322 (2024)."
+            self.note = "we consider CCD(T)"
+            self.label = "CC-2024"
+            self.marker = "x"
+            self.linestyle = "solid"
+            self.model = model
+#            self.label = model
+            self.every = 1
+            self.e_err = False
+            self.p_err = False
+            self.cs2_err = False
+            (
+                self.sm_den,
+                self.sm_e2a_n2lo,
+            ) = np.loadtxt(
+                file_in1,
+                usecols=cols_sm,
+                comments="#",
+                unpack=True,
+            )
+            self.sm_e2a_int = self.sm_e2a_n2lo
+            (
+                self.nm_den,
+                self.nm_e2a_n2lo,
+            ) = np.loadtxt(
+                file_in2,
+                usecols=cols_nm,
+                comments="#",
+                unpack=True,
+            )
+            self.nm_e2a_int = self.nm_e2a_n2lo
+            #
+            self.nm_e2a = self.nm_rmass + self.nm_e2a_int
+            self.sm_e2a = self.sm_rmass + self.sm_e2a_int
+            self.nm_eps = self.nm_e2a * self.nm_den
+            self.sm_eps = self.sm_e2a * self.sm_den
+            self.nm_kfn = nuda.kf_n( self.nm_den )
+            self.sm_kfn = nuda.kf_n( nuda.cst.half * self.sm_den )
+            self.nm_e2a_err = np.abs( uncertainty_stat(self.nm_den, err="MBPT") * self.nm_e2a_int )
+            self.sm_e2a_err = np.abs( uncertainty_stat(self.sm_den, err="MBPT") * self.sm_e2a_int )
+            self.nm_eps_err = self.nm_e2a_err * self.nm_den
+            self.sm_eps_err = self.sm_e2a_err * self.sm_den
+            #
         #
         # ==============================
         # END OF
@@ -1969,8 +2373,8 @@ class setupMicro:
                 cs_nm_e2a_err = CubicSpline(x, y_err)
                 self.nm_pre_err = np.array( nuda.cst.third * self.nm_kfn * self.nm_den * cs_nm_e2a_err(self.nm_kfn, 1) )
                 # chemical potential
-                #self.nm_chempot = ( np.array(self.nm_pre) + np.array(self.nm_eps) ) / np.array(self.nm_den)
-                #self.nm_chempot_err = ( np.array(self.nm_pre_err) + np.array(self.nm_eps_err) ) / np.array(self.nm_den)
+                self.nm_chempot = ( np.array(self.nm_pre) + np.array(self.nm_eps) ) / np.array(self.nm_den)
+                self.nm_chempot_err = ( np.array(self.nm_pre_err) + np.array(self.nm_eps_err) ) / np.array(self.nm_den)
                 #
                 # enthalpy
                 self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
@@ -1999,13 +2403,17 @@ class setupMicro:
                 y = np.insert(self.nm_e2a_int, 0, 0.0)
                 cs_nm_e2a = CubicSpline(x, y)
                 self.nm_pre = np.array(self.nm_den**2 * cs_nm_e2a(self.nm_den, 1))
+                if "2020-scgf-am" in model.lower():
+                    self.nm_pre = self.nm_pre_n3lo
                 y_err = np.insert(self.nm_e2a_err, 0, 0.0)
                 cs_nm_e2a_err = CubicSpline(x, y_err)
                 self.nm_pre_err = self.nm_den**2 * cs_nm_e2a_err(self.nm_den, 1)
                 #
                 # chemical potential
-                #self.nm_chempot = ( np.array(self.nm_pre) + np.array(self.nm_eps) ) / np.array(self.nm_den)
-                #self.nm_chempot_err = ( np.array(self.nm_pre_err) + np.array(self.nm_eps_err) ) / np.array(self.nm_den)
+                self.nm_chempot = ( np.array(self.nm_pre) + np.array(self.nm_eps) ) / np.array(self.nm_den)
+                self.nm_chempot_err = ( np.array(self.nm_pre_err) + np.array(self.nm_eps_err) ) / np.array(self.nm_den)
+                if "2020-scgf-am" in model.lower():
+                    self.nm_chempot = self.nm_chempot_n3lo
                 #
                 # enthalpy
                 self.nm_h2a = self.nm_e2a + self.nm_pre / self.nm_den
@@ -2031,8 +2439,8 @@ class setupMicro:
                 self.sm_pre_err = ( nuda.cst.third * self.sm_kfn * self.sm_den * cs_sm_e2a_err(self.sm_kfn, 1) )
                 #
                 # chemical potential
-                #self.sm_chempot = ( np.array(self.sm_pre) + np.array(self.sm_eps) ) / np.array(self.sm_den)
-                #self.sm_chempot_err = ( np.array(self.sm_pre_err) + np.array(self.sm_eps_err) ) / np.array(self.sm_den)
+                self.sm_chempot = ( np.array(self.sm_pre) + np.array(self.sm_eps) ) / np.array(self.sm_den)
+                self.sm_chempot_err = ( np.array(self.sm_pre_err) + np.array(self.sm_eps_err) ) / np.array(self.sm_den)
                 #
                 # enthalpy
                 self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
@@ -2056,13 +2464,17 @@ class setupMicro:
                 y = np.insert(self.sm_e2a_int, 0, 0.0)
                 cs_sm_e2a = CubicSpline(x, y)
                 self.sm_pre = np.array( self.sm_den**2 * cs_sm_e2a(self.sm_den, 1) )
+                if "2020-scgf-am" in model.lower():
+                    self.sm_pre = self.sm_pre_n3lo
                 y_err = np.insert(self.sm_e2a_err, 0, 0.0)
                 cs_sm_e2a_err = CubicSpline(x, y_err)
                 self.sm_pre_err = self.sm_den**2 * cs_sm_e2a_err(self.sm_den, 1)
                 #
                 # chemical potential
-                #self.sm_chempot = ( np.array(self.sm_pre) + np.array(self.sm_eps) ) / np.array(self.sm_den)
-                #self.sm_chempot_err = ( np.array(self.sm_pre_err) + np.array(self.sm_eps_err) ) / np.array(self.sm_den)
+                self.sm_chempot = ( np.array(self.sm_pre) + np.array(self.sm_eps) ) / np.array(self.sm_den)
+                self.sm_chempot_err = ( np.array(self.sm_pre_err) + np.array(self.sm_eps_err) ) / np.array(self.sm_den)
+                if "2020-scgf-am" in model.lower():
+                    self.sm_chempot = self.sm_chempot_n3lo
                 #
                 # enthalpy
                 self.sm_h2a = self.sm_e2a + self.sm_pre / self.sm_den
@@ -2081,7 +2493,7 @@ class setupMicro:
         # ==============================
         #
         self.den_unit = "fm$^{-3}$"
-        self.kf_unit = "fm$^{-1}$"
+        self.kf_unit  = "fm$^{-1}$"
         self.e2a_unit = "MeV"
         self.eps_unit = "MeV fm$^{-3}$"
         self.pre_unit = "MeV fm$^{-3}$"

nucleardatapy/matter/setup_micro_esym.py

@@ -22,7 +22,7 @@ def micro_esym_mbs():
     #
     if nuda.env.verb: print("\nEnter micro_mbs()")
     #
-    mbs = [ 'VAR', 'BHF2', 'BHF23', 'MBPT', 'NLEFT' ]
+    mbs = [ 'VAR', 'BHF2', 'BHF23', 'MBPT', 'NLEFT', 'SCGF', 'CC' ]
     mbs_lower = [ item.lower() for item in mbs ]
     #
     if nuda.env.verb: print("Exit micro_mbs()")
@@ -53,8 +53,13 @@ def micro_esym_models_mb( mb ):
     '2024-BHF-AM-23BFmicro-Av18', '2024-BHF-AM-23BFmicro-BONNB', '2024-BHF-AM-23BFmicro-NSC93',\
     If `mb` == 'MBPT': \
     '2010-MBPT-NM', '2020-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69'
+    If `mb` == 'SCGF': \
+    "2020-SCGF-AM-N3LO-414", "2020-SCGF-AM-N3LO-450", "2020-SCGF-AM-N3LO-500", "2024-SCGF-AM-DN2LO-450",\
+    "2024-SCGF-AM-DN2LO-500", "2024-SCGF-AM-DN2LOgo-394", "2024-SCGF-AM-DN2LOgo-450", "2024-SCGF-AM-N2LOsat",\
     If `mb` == 'NLEFT': \
     '2024-NLEFT-AM', \
+    If `mb` == 'CC': \
+    "2024-CC-AM-DN2LO-450", "2024-CC-AM-DN2LO-500", "2024-CC-AM-DN2LOgo-394", "2024-CC-AM-DN2LOgo-450", "2024-CC-AM-N2LOsat",\
     """
     #
     if nuda.env.verb: print("\nEnter micro_models_mb()")
@@ -77,9 +82,29 @@ def micro_esym_models_mb( mb ):
         #    '2024-BHF-AM-23BF-CDBONN', '2024-BHF-AM-23BF-NSC97a', '2024-BHF-AM-23BF-NSC97b', '2024-BHF-AM-23BF-NSC97c', \
         #    '2024-BHF-AM-23BF-NSC97d', '2024-BHF-AM-23BF-NSC97e', '2024-BHF-AM-23BF-NSC97f', '2024-BHF-AM-23BF-SSCV14' ]
     elif mb.lower() == 'mbpt':
-        models = [ '2019-MBPT-AM-L59', '2016-MBPT-AM', '2019-MBPT-AM-L69', '2020-MBPT-AM' ]
+        models = [ '2019-MBPT-AM-L59', '2016-MBPT-AM', '2019-MBPT-AM-L69', '2020-MBPT-AM', "2024-MBPT-AM-DN2LO-450",
+            "2024-MBPT-AM-DN2LO-500", "2024-MBPT-AM-DN2LOgo-394", "2024-MBPT-AM-DN2LOgo-450", "2024-MBPT-AM-N2LOsat" ]
     elif mb.lower() == 'nleft':
         models = [ '2024-NLEFT-AM' ]
+    elif mb.lower() == 'scgf':
+        models = [
+            "2020-SCGF-AM-N3LO-414",
+            "2020-SCGF-AM-N3LO-450",
+            "2020-SCGF-AM-N3LO-500",
+            "2024-SCGF-AM-DN2LO-450",
+            "2024-SCGF-AM-DN2LO-500",
+            "2024-SCGF-AM-DN2LOgo-394",
+            "2024-SCGF-AM-DN2LOgo-450",
+            "2024-SCGF-AM-N2LOsat",
+        ]
+    elif mb.lower() == 'cc':
+        models = [
+            "2024-CC-AM-DN2LO-450",
+            "2024-CC-AM-DN2LO-500",
+            "2024-CC-AM-DN2LOgo-394",
+            "2024-CC-AM-DN2LOgo-450",
+            "2024-CC-AM-N2LOsat",
+        ]
     #
     if nuda.env.verb: print('models available in the toolkit:',models)
     #
@@ -121,43 +146,6 @@ def micro_esym_models():
     #
     return models, models_lower
 
-def micro_esym_models_old():
-    """
-    Return a list with the name of the models available in this toolkit and \
-    print them all on the prompt. These models are the following ones: \
-    '1981-VAR-AM-FP', '1998-VAR-AM-APR', '1998-VAR-AM-APR-fit', '2006-BHF-AM*', \
-    2016-MBPT-AM', 2019-MBPT-AM-L59', '2019-MBPT-AM-L69', \
-    '2020-MBPT-AM', '2024-NLEFT-AM', \
-    '2024-BHF-AM-2BF-Av8p', '2024-BHF-AM-2BF-Av18', '2024-BHF-AM-2BF-BONN', '2024-BHF-AM-2BF-CDBONN', \
-    '2024-BHF-AM-2BF-NSC97a', '2024-BHF-AM-2BF-NSC97b', '2024-BHF-AM-2BF-NSC97c', '2024-BHF-AM-2BF-NSC97d', \
-    '2024-BHF-AM-2BF-NSC97e', '2024-BHF-AM-2BF-NSC97f', '2024-BHF-AM-2BF-SSCV14',\
-    '2024-BHF-AM-23BF-Av8p', '2024-BHF-AM-23BF-Av18', '2024-BHF-AM-23BF-BONN', '2024-BHF-AM-23BF-CDBONN', \
-    '2024-BHF-AM-23BF-NSC97a', '2024-BHF-AM-23BF-NSC97b', '2024-BHF-AM-23BF-NSC97c', '2024-BHF-AM-23BF-NSC97d', \
-    '2024-BHF-AM-23BF-NSC97e', '2024-BHF-AM-23BF-NSC97f', '2024-BHF-AM-23BF-SSCV14',\
-    '2024-BHF-AM-23BFmicro-Av18', '2024-BHF-AM-23BFmicro-BONNB', '2024-BHF-AM-23BFmicro-NSC93'\
-
-    :return: The list of models.
-    :rtype: list[str].
-    """
-    #
-    if nuda.env.verb: print("\nEnter micro_esym_models()")
-    #
-    models = [ '1981-VAR-AM-FP', '1998-VAR-AM-APR', '1998-VAR-AM-APR-fit', \
-               '2016-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69', \
-             '2020-MBPT-AM', '2024-NLEFT-AM', \
-            '2024-BHF-AM-2BF-Av8p', '2024-BHF-AM-2BF-Av18', '2024-BHF-AM-2BF-BONN', '2024-BHF-AM-2BF-CDBONN', \
-            '2024-BHF-AM-2BF-NSC97a', '2024-BHF-AM-2BF-NSC97b', '2024-BHF-AM-2BF-NSC97c', '2024-BHF-AM-2BF-NSC97d', \
-            '2024-BHF-AM-2BF-NSC97e', '2024-BHF-AM-2BF-NSC97f', '2024-BHF-AM-2BF-SSCV14',\
-            '2024-BHF-AM-23BF-Av8p', '2024-BHF-AM-23BF-Av18', '2024-BHF-AM-23BF-BONN', '2024-BHF-AM-23BF-CDBONN', \
-            '2024-BHF-AM-23BF-NSC97a', '2024-BHF-AM-23BF-NSC97b', '2024-BHF-AM-23BF-NSC97c', '2024-BHF-AM-23BF-NSC97d', \
-            '2024-BHF-AM-23BF-NSC97e', '2024-BHF-AM-23BF-NSC97f', '2024-BHF-AM-23BF-SSCV14' ]
-    if nuda.env.verb: print('models available in the toolkit:',models)
-    models_lower = [ item.lower() for item in models ]
-    #
-    if nuda.env.verb: print("Exit micro_esym_models()")
-    #
-    return models, models_lower
-
 class setupMicroEsym():
     """
     Instantiate the object with microscopic results choosen \
@@ -231,12 +219,28 @@ class setupMicroEsym():
         else:
             #
             mic = nuda.matter.setupMicro( model = model )
+            self.e_err = mic.e_err
+            self.p_err = mic.p_err
+            self.cs2_err = mic.cs2_err
             self.sm_den = mic.sm_den
-            self.sm_e2a_int = mic.sm_e2a_int
-            self.sm_e2a_err = mic.sm_e2a_err
             self.nm_den = mic.nm_den
+            self.sm_e2a_int = mic.sm_e2a_int
             self.nm_e2a_int = mic.nm_e2a_int
-            self.nm_e2a_err = mic.nm_e2a_err
+            self.sm_e2a_err = np.zeros(np.size(mic.sm_e2a_int))
+            self.nm_e2a_err = np.zeros(np.size(mic.nm_e2a_int))
+            self.sm_pre_err = np.zeros(np.size(mic.sm_e2a_int))
+            self.nm_pre_err = np.zeros(np.size(mic.nm_e2a_int))
+            self.sm_cs2_err = np.zeros(np.size(mic.sm_e2a_int))
+            self.nm_cs2_err = np.zeros(np.size(mic.nm_e2a_int))
+            if self.e_err:
+                self.sm_e2a_err = mic.sm_e2a_err
+                self.nm_e2a_err = mic.nm_e2a_err
+            if self.p_err:
+                self.sm_pre_err = mic.sm_pre_err
+                self.nm_pre_err = mic.nm_pre_err
+            if self.cs2_err:
+                self.sm_cs2_err = mic.sm_cs2_err
+                self.nm_cs2_err = mic.nm_cs2_err
             #mic.print_outputs( )
             #
         #

nucleardatapy/matter/setup_nep.py

@@ -18,7 +18,7 @@ def nep_models():
     #
     if nuda.env.verb: print("\nEnter pheno_models()")
     #
-    models = [ 'Skyrme', 'GSkyrme', 'ESkyrme', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF', 'xEFT' ]
+    models = [ 'Skyrme', 'ESkyrme', 'GSkyrme', 'Skyrme2', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF', 'xEFT' ]
     #models = [ 'Skyrme', 'GSkyrme', 'Skyrme2', 'ESkyrme', 'Gogny', 'Fayans', 'NLRH', 'DDRH', 'DDRHF', 'xEFT' ]
     #print('Phenomenological models available in the toolkit:',models)
     models_lower = [ item.lower() for item in models ]