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

nucleardatapy/fig/nuc_setupRchTheo_fig.py

@@ -28,28 +28,13 @@ def nuc_setupRchTheo_fig( pname, tables, table_exp ):
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
     fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.9, wspace=0.35, hspace=0.3)
     #
-    axs.set_ylabel(r'$R_{ch}$')
-    axs.set_xlabel(r'N')
+    axs.set_ylabel(r'$R_{ch}$ (fm)',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_xlim([10, 160])
     axs.set_ylim([3.0, 6.5])
     #
     Zrefs = [ 20, 28, 40, 50, 60, 70, 82, 90 ]
     #
-    for indZ,Zref in enumerate(Zrefs):
-        rchExpIsot = nuda.nuc.setupRchExpIsotopes( rch_exp, Zref = Zref )
-        if indZ == 0:
-            axs.errorbar( rchExpIsot.N, rchExpIsot.Rch, yerr=rchExpIsot.Rch_err, color='k', fmt='s', markersize=3, label=table_exp )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, 'classic' ), linestyle='dashed', color='k', label='empirical(classic)' )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '1994-NPP' ), linestyle='dashed', color='red', label='empirical(NPP-1994)' )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-1' ), linestyle='dotted', color='k', label='empirical(BAKS-1-2013)' )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-3' ), linestyle='dotted', color='red', label='empirical(BAKS-3-2013)' )
-        else:
-            axs.errorbar( rchExpIsot.N, rchExpIsot.Rch, yerr=rchExpIsot.Rch_err, color='k', fmt='s', markersize=3 )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, 'classic' ), linestyle='dashed', color='k' )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '1994-NPP' ), linestyle='dashed', color='red' )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-1' ), linestyle='dotted', color='k' )
-            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-3' ), linestyle='dotted', color='red' )
-    #
     for indT,table in enumerate(tables):
         #
         rch = nuda.nuc.setupRchTheo( table = table )
@@ -66,7 +51,23 @@ def nuc_setupRchTheo_fig( pname, tables, table_exp ):
             #else:
             #    axs.plot( rchIsot.N, nuda.nuc.rch_emp( rchIsot.A, rchIsot.Z, 'classic' ), linestyle='dashed', color='k' )
             #
-    axs.legend(loc='upper left',fontsize='7',frameon=False)
+    #
+    for indZ,Zref in enumerate(Zrefs):
+        rchExpIsot = nuda.nuc.setupRchExpIsotopes( rch_exp, Zref = Zref )
+        if indZ == 0:
+            axs.errorbar( rchExpIsot.N, rchExpIsot.Rch, yerr=rchExpIsot.Rch_err, color='k', fmt='s', markersize=3, label=table_exp )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, 'classic' ), linestyle='dashed', color='k', label='empirical(classic)' )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '1994-NPP' ), linestyle='dashed', color='red', label='empirical(NPP-1994)' )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-1' ), linestyle='dotted', color='k', label='empirical(BAKS-1-2013)' )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-3' ), linestyle='dotted', color='red', label='empirical(BAKS-3-2013)' )
+        else:
+            axs.errorbar( rchExpIsot.N, rchExpIsot.Rch, yerr=rchExpIsot.Rch_err, color='k', fmt='s', markersize=3 )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, 'classic' ), linestyle='dashed', color='k' )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '1994-NPP' ), linestyle='dashed', color='red' )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-1' ), linestyle='dotted', color='k' )
+            axs.plot( rchExpIsot.N, nuda.nuc.rch_emp( rchExpIsot.A, rchExpIsot.Z, '2013-BAKS-3' ), linestyle='dotted', color='red' )
+    #
+    axs.legend(loc='lower right',fontsize='10',ncol=2,frameon=False)
     #
     axs.text( 50,3.7,'Ca')
     axs.text( 70,4.2,'Ni')
@@ -108,8 +109,8 @@ def nuc_setupRchTheo_3Zref_fig( pname, tables, table_exp ):
     fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.9, wspace=0.35, hspace=0.3)
     #
     axs[0].set_title(r'Zr')
-    axs[0].set_ylabel(r'$R_{ch}$')
-    axs[0].set_xlabel(r'A')
+    axs[0].set_ylabel(r'$R_{ch}$ (fm)',fontsize='14')
+    axs[0].set_xlabel(r'A',fontsize='14')
     axs[0].set_xlim([88, 98])
     axs[0].set_ylim([4.25, 4.45])
     #

nucleardatapy/fig/nuc_setupRnpExp_fig.py

@@ -1,120 +1,88 @@
+import os
 import numpy as np
 import matplotlib.pyplot as plt
-from matplotlib.ticker import AutoMinorLocator  # Import para minor ticks
+from matplotlib.ticker import AutoMinorLocator
 
 import nucleardatapy as nuda
 
-# Dictionary to map sources to LaTeX names
 SOURCE_LABELS_LATEX = {
     "48Ca": r"$^{48}\mathrm{Ca}$",
     "208Pb": r"$^{208}\mathrm{Pb}$"
 }
 
-def nuc_setupRnpExp_fig( pname ):
-    """
-    Generates neutron skin (R_skin) plots for each nucleus using data from the `SetupNeutronSkinExp` class.
-    """
-
-    print(f'Plot name: {pname}')
-    #
-    # Retrieve available sources (e.g., '48Ca', '208Pb')
-    sources, _ = nuda.nskin_exp()
-
-# Labels for the subplots
-    subplot_labels = ["(a)", "(b)"]  # Adjust this list based on the number of sources
-
-    # Iterate over each source to create individual plots
-    for idx, source in enumerate(sources):
-        # Lists to store data for the plot
-        labels = []  # Labels for references (e.g., 'Brissaud 1972')
-        rskin_values = []  # R_skin values
-        error_lower = []  # Lower errors
-        error_upper = []  # Upper errors
-        markers = []  # Marker types to customize the points
-
-        # Retrieve available calculations for the source
-        cals = nuda.nuc.rnp_exp_source(source)
-        
-        for cal in cals:
-            # Instantiate the object for the specific calculation
-            neutron_skin_calc = nuda.nuc.setupRnpExp(source=source, cal=cal)
-            
-            # Store data only if R_skin is available
-            if neutron_skin_calc.nskin is not None:
-                labels.append(neutron_skin_calc.label)  # Use `self.label` as label
-                rskin_values.append(neutron_skin_calc.nskin)
-                
-                # Replace `None` error values with 0.0
-                err_down = neutron_skin_calc.nskin_sig_do if neutron_skin_calc.nskin_sig_do is not None else 0.0
-                err_up = neutron_skin_calc.nskin_sig_up if neutron_skin_calc.nskin_sig_up is not None else 0.0
-                error_lower.append(err_down)
-                error_upper.append(err_up)
-                
-                # Ensure the marker is valid
-                marker = neutron_skin_calc.marker if neutron_skin_calc.marker else 'o'
-                markers.append(marker)
-
-        # Check if there is data to plot
-        if not rskin_values:
-            print(f"No data available for {source}.")
-            continue
-
-        # Plot configuration
-        fig, ax = plt.subplots(figsize=(10, 8))
-        x_positions = range(len(labels)+1)   # X-axis positions
-
-        # Add each point to the plot with vertical error bars
-        for i, (x, y, err_down, err_up, marker) in enumerate(zip(x_positions, rskin_values, error_lower, error_upper, markers)):
-            # Handle large errors (>= 1000) by limiting the bar to 0.1
-            adjusted_err_down = min(err_down, 0.2)
-            adjusted_err_up = min(err_up, 0.2)
-
-            # Add adjusted error bars
-            ax.errorbar(x, y, yerr=[[adjusted_err_down], [adjusted_err_up]], fmt=marker, markersize=8, capsize=0, label=labels[i])
-            
-            # Add arrow as cap for err_down >= 1000
-            if err_down >= 1000:
-                ax.plot([x], [y - adjusted_err_down], marker="v", color="grey", markersize=8)
-
-            # Add arrow as cap for err_up >= 1000
-            if err_up >= 1000:
-                ax.plot([x], [y + adjusted_err_up], marker="^", color="grey", markersize=8)
-
-        nsav = nuda.nuc.setupRnpAverage(source=source)
-        # print('label:', nsav.label)
-        if nsav.nskin_cen is not None:
-            ax.errorbar(len(labels), nsav.nskin_cen, yerr=nsav.sig_std, label=nsav.label, 
-                       color='red', marker='o', markersize=10, linestyle='solid', linewidth=3)        
+def nuc_setupRnpExp_fig(pname=None, source=None):
+    print(f"Using source: {source}")
+    
+    # subplot_label = "(a)"
+    subplot_label = " "
+
+    if source is None:
+        print("Erro: nenhum source fornecido.")
+        return
+
+    labels = []
+    rskin_values = []
+    error_lower = []
+    error_upper = []
+    markers = []
+
+    cals = nuda.nuc.rnp_exp_source(source)
+
+    for cal in cals:
+        neutron_skin_calc = nuda.nuc.setupRnpExp(source=source, cal=cal)
+
+        if neutron_skin_calc.rnp is not None:
+            labels.append(neutron_skin_calc.label)
+            rskin_values.append(neutron_skin_calc.rnp)
+
+            err_down = neutron_skin_calc.rnp_sig_lo if neutron_skin_calc.rnp_sig_lo is not None else 0.0
+            err_up = neutron_skin_calc.rnp_sig_up if neutron_skin_calc.rnp_sig_up is not None else 0.0
+            error_lower.append(err_down)
+            error_upper.append(err_up)
+
+            marker = getattr(neutron_skin_calc, "marker", 'o')
+            markers.append(marker)
+
+    if not rskin_values:
+        print(f"Nenhum dado disponível para {source}.")
+        return
+
+    fig, ax = plt.subplots(figsize=(10, 8))
+    x_positions = range(len(labels) + 1)
+
+    for i, (x, y, err_down, err_up, marker) in enumerate(zip(x_positions, rskin_values, error_lower, error_upper, markers)):
+        adjusted_err_down = min(err_down, 0.2)
+        adjusted_err_up = min(err_up, 0.2)
+
+        ax.errorbar(x, y, yerr=[[adjusted_err_down], [adjusted_err_up]], fmt=marker, markersize=8, capsize=0, label=labels[i])
+
+        if err_down >= 1000:
+            ax.plot([x], [y - adjusted_err_down], marker="v", color="grey", markersize=8)
+        if err_up >= 1000:
+            ax.plot([x], [y + adjusted_err_up], marker="^", color="grey", markersize=8)
+
+    nsav = nuda.nuc.setupRnpAverage(source=source)
+    if nsav.rnp_cen is not None:
+        ax.errorbar(len(labels), nsav.rnp_cen, yerr=nsav.sig_std, label=nsav.label,
+                    color='red', marker='o', markersize=10, linestyle='solid', linewidth=3)
         labels.append(nsav.label)
-        # Fixed y-axis configuration
-        ax.set_ylim([0, 0.5])  # Fixed scale from 0 to 0.5 on the y-axis
-
-        # X-axis configuration
-        ax.set_xticks(x_positions)
-        ax.set_xticklabels(labels, rotation=45, ha="right", fontsize=15)
-
-        # Y-axis configuration and layout
-        # Increase font size for y-axis numbers
-        ax.tick_params(axis='y', labelsize=15)  # Adjust the font size as desired
-        ax.set_ylabel(rf"$R_{{\rm{{skin}}}}$ {SOURCE_LABELS_LATEX[source]} (fm)", fontsize=15)
-        # ax.set_xlabel(f"References for {SOURCE_LABELS_LATEX[source]}", fontsize=14)
-        # ax.grid(True, linestyle="--", alpha=0.5)
-
-        # Adjust the legend (only if there are valid labels)
-        # ax.legend(loc="upper left", bbox_to_anchor=(1, 1), fontsize=10)
-
-        # Add subplot label (e.g., "(a)", "(b)") in the top right corner
-        ax.text(0.95, 0.95, subplot_labels[idx], transform=ax.transAxes, fontsize=15,
-                verticalalignment='top', horizontalalignment='right')
-
-        # Add minor ticks on y-axis
-        ax.yaxis.set_minor_locator(AutoMinorLocator())
-        ax.tick_params(axis='y', which='minor', length=4, color='gray')  # Style for minor ticks
-
-        # Final adjustments and save the plot
-        #plt.tight_layout()
-        if pname is not None:
-        	plt.savefig(pname, dpi=200)
-        	plt.close()
-        
-        print(f"Plot saved: {pname}")
+
+    ax.set_ylim([0, 0.5])
+    ax.set_xticks(x_positions)
+    ax.set_xticklabels(labels, rotation=45, ha="right", fontsize=15)
+    ax.tick_params(axis='y', labelsize=15)
+    ax.set_ylabel(rf"$R_{{\rm{{skin}}}}$ {SOURCE_LABELS_LATEX[source]} (fm)", fontsize=15)
+    ax.text(0.95, 0.95, subplot_label, transform=ax.transAxes, fontsize=15,
+            verticalalignment='top', horizontalalignment='right')
+    ax.yaxis.set_minor_locator(AutoMinorLocator())
+    ax.tick_params(axis='y', which='minor', length=4, color='gray')
+
+    if pname is None:
+        output_dir = os.path.abspath("figs/")
+        os.makedirs(output_dir, exist_ok=True)
+        pname = os.path.join(output_dir, f"plot_nuc_setupRnp_Exp_{source.replace(' ', '_')}.png")
+
+    plt.tight_layout()
+    plt.savefig(pname, dpi=200)
+    plt.close()
+    print(f"Plot saved: {pname}")

nucleardatapy/fig/nuc_setupRnpTheo_fig.py

@@ -1,6 +1,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.ticker import AutoMinorLocator  # Import para minor ticks
+import os
 
 import nucleardatapy as nuda
 
@@ -11,7 +12,7 @@ SOURCE_LABELS_LATEX = {
 }
 
 # Directory containing the model data tables
-MODEL_TABLES_DIR = nuda.param.path_data + '/NeutronSkin/'
+MODEL_TABLES_DIR = nuda.param.path_data + '/rnp/'
 
 # Define markers and colors for each model
 MODEL_STYLES = {
@@ -24,7 +25,7 @@ def read_model_data(directory, source):
     model_data = {}
     for filename in os.listdir(directory):
         if filename.endswith(".dat") and source in filename:
-            model_name = filename.split("Nskin")[0].lower()
+            model_name = filename.split("rnp")[0].lower()
             filepath = os.path.join(directory, filename)
             data = []
             with open(filepath, 'r') as file:
@@ -40,95 +41,93 @@ def read_model_data(directory, source):
                 print(f"Loaded model data for {model_name}: {model_data[model_name]}")
     return model_data
 
-def nuc_setupRnpExp_fig( pname ):
-
+def nuc_setupRnpTheo_fig(pname, source):
     print(f'Plot name: {pname}')
-
-    sources, _ = nuda.nuc.rnp_exp()
-    subplot_labels = ["(a)", "(b)"]
-
-    for idx, source in enumerate(sources):
-        labels = []
-        rskin_values = []
-        error_lower = []
-        error_upper = []
-        xexp = []
-
-        cals = nuda.nuc.rnp_exp_source(source)
-        for i, cal in enumerate(cals):
-            neutron_skin_calc = nuda.nuc.setupRnpExp(source=source, cal=cal)
-            if neutron_skin_calc.nskin is not None:
-                labels.append(neutron_skin_calc.label)
-                rskin_values.append(neutron_skin_calc.nskin)
-                xexp.append(i)
-                err_down = neutron_skin_calc.nskin_sig_do if neutron_skin_calc.nskin_sig_do is not None else 0.0
-                err_up = neutron_skin_calc.nskin_sig_up if neutron_skin_calc.nskin_sig_up is not None else 0.0
-                error_lower.append(err_down)
-                error_upper.append(err_up)
-
-        model_data = read_model_data(MODEL_TABLES_DIR, source)
-        combined_rskin = []
-        combined_errors = []
-        combined_markers = []
-        combined_colors = []
-        xtheo = []
-
-        for model_name, data in model_data.items():
-            for j, (_, _, _, rskin) in enumerate(data):
-                x_position = xexp[j % len(xexp)] + 0.5  # Cycle through xexp and offset by 0.5
-                xtheo.append(x_position)
-                combined_rskin.append(rskin)
-                combined_errors.append((0.0, 0.0))
-                combined_markers.append(MODEL_STYLES[model_name]["marker"])
-                combined_colors.append(MODEL_STYLES[model_name]["color"])
-
-        if nuda.env.verb:
-            print(f"Experimental positions for {source}: {xexp}")
-            print(f"Theoretical positions for {source}: {xtheo}")
-
-        fig, ax = plt.subplots(figsize=(10, 8))
-        for i, (x, y, err_down, err_up) in enumerate(zip(xexp, rskin_values, error_lower, error_upper)):
-            adjusted_err_down = min(err_down, 0.2)
-            adjusted_err_up = min(err_up, 0.2)
-            ax.errorbar(x, y, yerr=[[adjusted_err_down], [adjusted_err_up]], fmt='o', markersize=8, capsize=0, color='black', markerfacecolor='none')
-            if err_down >= 1000:
-                ax.plot([x], [y - adjusted_err_down], marker="v", color="black", markersize=8)
-            if err_up >= 1000:
-                ax.plot([x], [y + adjusted_err_up], marker="^", color="black", markersize=8)
-
-        nsav = nuda.nuc.setupRnpAverage(source=source)
-        if nsav.nskin_cen is not None:
-            ax.errorbar(len(labels), nsav.nskin_cen, yerr=nsav.sig_std, label=nsav.label, 
-                       color='k', marker='o', markersize=10, linestyle='solid', linewidth=3)           
-        # labels.append(nsav.label)
-
-        for i, (x, y, marker, color) in enumerate(zip(xtheo, combined_rskin, combined_markers, combined_colors)):
-            ax.plot(x, y, marker=marker, markersize=8, color=color)
-
-        # Add legend for experimental points
-        ax.scatter([], [], color='black', marker='o', facecolors='none', label='Experimental/Analysis')
-
-        # Add legend for theoretical models
-        for model_name, style in MODEL_STYLES.items():
-            ax.scatter([], [], color=style["color"], marker=style["marker"], label=style["label"])
-
-        ax.set_ylim([0, 0.5])
-        ax.set_xticks(xexp)
-        ax.set_xticklabels(labels, rotation=45, ha="right", fontsize=15)
-        ax.set_ylabel(rf"$R_{{\rm{{skin}}}}$ {SOURCE_LABELS_LATEX[source]} (fm)", fontsize=15)
-        ax.text(0.95, 0.95, subplot_labels[idx], transform=ax.transAxes, fontsize=15, verticalalignment='top', horizontalalignment='right')
-        
-        # Add minor ticks on y-axis
-        ax.yaxis.set_minor_locator(AutoMinorLocator())
-        ax.tick_params(axis='y', which='minor', length=4, color='gray')  # Style for minor ticks
-
-        ax.legend(loc="upper right", bbox_to_anchor=(0.5, 1), fontsize=12)
-
-        output_dir = "figs/"
-        os.makedirs(output_dir, exist_ok=True)
-        fig_name = f"{output_dir}plot_nuc_setup_nskin_theo-{source.replace(' ', '_')}.png"
-        plt.tight_layout()
-        plt.savefig(fig_name, dpi=200)
-        plt.close()
-
-        print(f"Plot saved: {fig_name}")
+    print(f'Using source: {source}')
+
+    # subplot_label = "(a)"  # remove this if you don't want any labels
+    subplot_label = " "
+
+    labels = []
+    rskin_values = []
+    error_lower = []
+    error_upper = []
+    xexp = []
+
+    cals = nuda.nuc.rnp_exp_source(source)
+    for i, cal in enumerate(cals):
+        neutron_skin_calc = nuda.nuc.setupRnpExp(source=source, cal=cal)
+        if neutron_skin_calc.rnp is not None:
+            labels.append(neutron_skin_calc.label)
+            rskin_values.append(neutron_skin_calc.rnp)
+            xexp.append(i)
+            err_down = neutron_skin_calc.rnp_sig_lo if neutron_skin_calc.rnp_sig_lo is not None else 0.0
+            err_up = neutron_skin_calc.rnp_sig_up if neutron_skin_calc.rnp_sig_up is not None else 0.0
+            error_lower.append(err_down)
+            error_upper.append(err_up)
+
+    model_data = read_model_data(MODEL_TABLES_DIR, source)
+    combined_rskin = []
+    combined_errors = []
+    combined_markers = []
+    combined_colors = []
+    xtheo = []
+
+    for model_name, data in model_data.items():
+        for j, (_, _, _, rskin) in enumerate(data):
+            x_position = xexp[j % len(xexp)] + 0.5  # Cycle through xexp and offset by 0.5
+            xtheo.append(x_position)
+            combined_rskin.append(rskin)
+            combined_errors.append((0.0, 0.0))
+            combined_markers.append(MODEL_STYLES[model_name]["marker"])
+            combined_colors.append(MODEL_STYLES[model_name]["color"])
+
+    if nuda.env.verb:
+        print(f"Experimental positions for {source}: {xexp}")
+        print(f"Theoretical positions for {source}: {xtheo}")
+
+    fig, ax = plt.subplots(figsize=(10, 8))
+    for i, (x, y, err_down, err_up) in enumerate(zip(xexp, rskin_values, error_lower, error_upper)):
+        adjusted_err_down = min(err_down, 0.2)
+        adjusted_err_up = min(err_up, 0.2)
+        ax.errorbar(x, y, yerr=[[adjusted_err_down], [adjusted_err_up]], fmt='o', markersize=8, capsize=0, color='black', markerfacecolor='none')
+        if err_down >= 1000:
+            ax.plot([x], [y - adjusted_err_down], marker="v", color="black", markersize=8)
+        if err_up >= 1000:
+            ax.plot([x], [y + adjusted_err_up], marker="^", color="black", markersize=8)
+
+    nsav = nuda.nuc.setupRnpAverage(source=source)
+    if nsav.rnp_cen is not None:
+        ax.errorbar(len(labels), nsav.rnp_cen, yerr=nsav.sig_std, label=nsav.label, 
+                   color='k', marker='o', markersize=10, linestyle='solid', linewidth=3)           
+
+    for i, (x, y, marker, color) in enumerate(zip(xtheo, combined_rskin, combined_markers, combined_colors)):
+        ax.plot(x, y, marker=marker, markersize=8, color=color)
+
+    # Add legend for experimental points
+    ax.scatter([], [], color='black', marker='o', facecolors='none', label='Experimental/Analysis')
+
+    # Add legend for theoretical models
+    for model_name, style in MODEL_STYLES.items():
+        ax.scatter([], [], color=style["color"], marker=style["marker"], label=style["label"])
+
+    ax.set_ylim([0, 0.5])
+    ax.set_xticks(xexp)
+    ax.set_xticklabels(labels, rotation=45, ha="right", fontsize=15)
+    ax.set_ylabel(rf"$R_{{\rm{{skin}}}}$ {SOURCE_LABELS_LATEX[source]} (fm)", fontsize=15)
+    ax.text(0.95, 0.95, subplot_label, transform=ax.transAxes, fontsize=15, verticalalignment='top', horizontalalignment='right')
+
+    # Add minor ticks on y-axis
+    ax.yaxis.set_minor_locator(AutoMinorLocator())
+    ax.tick_params(axis='y', which='minor', length=4, color='gray')
+
+    ax.legend(loc="upper right", bbox_to_anchor=(0.5, 1), fontsize=12)
+
+    output_dir = "figs/"
+    os.makedirs(output_dir, exist_ok=True)
+    fig_name = os.path.join(output_dir, f"plot_nuc_setupRnpTheo_source{source.replace(' ', '_')}.png")    
+    plt.tight_layout()
+    plt.savefig(fig_name, dpi=200)
+    plt.close()
+
+    print(f"Plot saved: {fig_name}")

nucleardatapy/hello.py

@@ -0,0 +1,6 @@
+
+def hello():
+	print('hello world!')
+
+if __name__ == "__main__":
+    hello()

nucleardatapy/hnuc/setup_re1L_exp.py

@@ -150,16 +150,16 @@ class setupRE1LExp():
       #: Attribute A (mass of the nucleus).
       self.A = self.Z + self.N + np.ones(len(self.N),dtype=int)
       #: charge of the hypernuclei (=Z, since Lamnda is charged 0)
-      self.ch = self.Z
+      self.Q = self.Z
       #: Strangness number
-      self.S = -2*np.ones(len(self.N),dtype=int)
+      self.S = -1*np.ones(len(self.N),dtype=int)
       #: symbol representing the nucleus
       self.symb = nucSymb
-      #: Attribute the angular momentum of the state.
+      #: Attribute the s.p. state.
       self.sps = nucsps
       #: Attribute the angular momentum of the state.
       self.ell = np.array( nucell, dtype = int )
-      #: Attribute 1L binding energy in MeV.
+      #: Attribute 1L removal energy in MeV.
       self.lre = np.array( nuclre, dtype = float )
       #: Attribute 1L binding energy error in MeV.
       self.lre_err = np.array( nuclre_err, dtype = float )
@@ -204,7 +204,7 @@ class setupRE1LExp():
       if any(self.Z): print(f"   Z: {self.Z}")
       if any(self.N): print(f"   N: {self.N}")
       if any(self.S): print(f"   S: {self.S}")
-      if any(self.ch): print(f"  ch: {self.ch}")
+      if any(self.Q): print(f"   Q: {self.Q}")
       if any(self.symb): print(f" symb: {self.symb}")
       if any(self.ell): print(f" ell: {self.ell}")
       if any(self.lre): print(f"  re: {self.lre}")
@@ -225,7 +225,7 @@ class setupRE1LExp():
          print(rf" index & Z & N & S & ch & symb & $RE$  & Ref. \\\\")
          print(rf"       &   &   &   &    &      & (MeV) &      \\\\")
          for ind,A in enumerate(self.A):
-            print(rf" {ind} & {self.Z[ind]} & {self.N[ind]} & {self.S[ind]} & {self.ch[ind]} & {self.symb[ind]} & ${self.lre[ind]:.3f}\pm {self.lre_err[ind]:.3f}$ & \cite{{"+self.keyref+"} \\\\")
+            print(rf" {ind} & {self.Z[ind]} & {self.N[ind]} & {self.S[ind]} & {self.Q[ind]} & {self.symb[ind]} & ${self.lre[ind]:.3f}\pm {self.lre_err[ind]:.3f}$ & \cite{{"+self.keyref+"} \\\\")
       else:
          print(f"- No  table for source {self.table} (average). To get table, write 'verb_latex = True' in env.py.")
       #

nucleardatapy/hnuc/setup_re1Xi_exp.py

@@ -117,12 +117,12 @@ class setupRE1XiExp():
       #: Strangness number (to be checked)
       self.S = -2*np.ones(len(self.N),dtype=int)
       #: charge of the hypernuclei (=Z-1, since Xi is charged -1)
-      self.ch = self.Z - np.ones(len(self.N),dtype=int)
+      self.Q = self.Z - np.ones(len(self.N),dtype=int)
       #: symbol representing the nucleus
       self.symb = nucSymb
-      #: Attribute 1L binding energy in MeV.
+      #: Attribute 1Xi removal energy in MeV.
       self.xire = np.array( nucxire, dtype = float )
-      #: Attribute 1L binding energy error in MeV.
+      #: Attribute 1Xi removal energy error in MeV.
       self.xire_err = np.array( nucxire_err, dtype = float )
       #: Attribute the probe.
       self.probe = probe
@@ -162,7 +162,7 @@ class setupRE1XiExp():
       if any(self.Z): print(f"   Z: {self.Z}")
       if any(self.N): print(f"   N: {self.N}")
       if any(self.S): print(f"   S: {self.S}")
-      if any(self.ch): print(f"  ch: {self.ch}")
+      if any(self.Q): print(f"   Q: {self.Q}")
       if any(self.symb): print(f" symb: {self.symb}")
       if any(self.xire): print(f" xibe: {self.xire}")
       if any(self.xire_err): print(f" xibe_err: {self.xire_err}")
@@ -183,7 +183,7 @@ class setupRE1XiExp():
          print(rf" index & Z & N & S & ch & symb & RE    & & Ref. \\\\")
          print(rf"       &   &   &   &    &      & (MeV) & & \\\\")
          for ind,A in enumerate(self.A):
-            print(rf" {ind} & {self.Z[ind]} & {self.N[ind]} & {self.S[ind]} & {self.ch[ind]} & {self.symb[ind]} & ${self.xire[ind]:.3f}\pm {self.xire_err[ind]:.3f}$ & & \\cite{{"+self.keyref+"} \\\\")
+            print(rf" {ind} & {self.Z[ind]} & {self.N[ind]} & {self.S[ind]} & {self.Q[ind]} & {self.symb[ind]} & ${self.xire[ind]:.3f}\pm {self.xire_err[ind]:.3f}$ & & \\cite{{"+self.keyref+"} \\\\")
       else:
          print(f"- No  table for source {self.table} (average). To get table, write 'verb_latex = True' in env.py.")
       #

nucleardatapy/hnuc/setup_re2L_exp.py

@@ -119,14 +119,14 @@ class setupRE2LExp():
       #: Attribute A (mass of the nucleus).
       self.A = self.Z + self.N + 2*np.ones(len(self.N),dtype=int)
       #: charge of the hypernuclei (=Z, since Lamnda is charged 0)
-      self.ch = self.Z
+      self.Q = self.Z
       #: Strangness number
-      self.S = -2*2*np.ones(len(self.N),dtype=int)
+      self.S = -2*np.ones(len(self.N),dtype=int)
       #: symbol representing the nucleus
       self.symb = nucSymb
-      #: Attribute 2L binding energy in MeV.
+      #: Attribute 2L removal energy in MeV.
       self.llre = np.array( nuclre, dtype = float )
-      #: Attribute 2L binding energy error in MeV.
+      #: Attribute 2L removal energy error in MeV.
       self.llre_err = np.array( nuclre_err, dtype = float )
       #: Attribute 2L bond energy in MeV.
       self.lldre = np.array( nucldre, dtype = float )
@@ -171,7 +171,7 @@ class setupRE2LExp():
       if any(self.Z): print(f"   Z: {self.Z}")
       if any(self.N): print(f"   N: {self.N}")
       if any(self.S): print(f"   S: {self.S}")
-      if any(self.ch): print(f"  ch: {self.ch}")
+      if any(self.Q): print(f"   Q: {self.Q}")
       if any(self.symb): print(f" symb: {self.symb}")
       if any(self.llre): print(f" be: {self.llre}")
       if any(self.llre_err): print(f" be_err: {self.llre_err}")
@@ -193,7 +193,7 @@ class setupRE2LExp():
          print(rf" index & Z & N & S & ch & symb & $RE$  & $\Delta RE$ & Ref. \\\\")
          print(rf"       &   &   &   &    &      & (MeV) & (MeV)       & \\\\")
          for ind,A in enumerate(self.A):
-            print(rf" {ind} & {self.Z[ind]} & {self.N[ind]} & {self.S[ind]} & {self.ch[ind]} & {self.symb[ind]} & ${self.llre[ind]:.3f}\pm {self.llre_err[ind]:.3f}$ & ${self.lldre[ind]:.3f}\pm {self.lldre_err[ind]:.3f}$ & \\cite{{"+self.keyref+"}  \\\\")
+            print(rf" {ind} & {self.Z[ind]} & {self.N[ind]} & {self.S[ind]} & {self.Q[ind]} & {self.symb[ind]} & ${self.llre[ind]:.3f}\pm {self.llre_err[ind]:.3f}$ & ${self.lldre[ind]:.3f}\pm {self.lldre_err[ind]:.3f}$ & \\cite{{"+self.keyref+"}  \\\\")
       else:
          print(f"- No  table for source {self.table} (average). To get table, write 'verb_latex = True' in env.py.")
       #

nucleardatapy/matter/__init__.py

@@ -2,17 +2,17 @@
 This module provides microscopic, phenomenological and experimental data constraints.
 """
 #
-from nucleardatapy.matter.setup_ffg            import *
-from nucleardatapy.matter.setup_micro          import *
-from nucleardatapy.matter.setup_micro_effmass  import *
-from nucleardatapy.matter.setup_micro_gap      import *
-from nucleardatapy.matter.setup_micro_band     import *
-from nucleardatapy.matter.setup_micro_esym     import *
-from nucleardatapy.matter.setup_micro_lp       import *
-from nucleardatapy.matter.setup_pheno          import *
-from nucleardatapy.matter.setup_pheno_esym     import *
-from nucleardatapy.matter.setup_hic            import *
-from nucleardatapy.matter.setup_nep            import *
-from nucleardatapy.matter.setup_nep_dist       import *
-from nucleardatapy.matter.setup_nep_model_dist import *
-from nucleardatapy.matter.setup_check          import *
+from nucleardatapy.matter.setup_ffg             import *
+from nucleardatapy.matter.setup_micro           import *
+from nucleardatapy.matter.setup_micro_effmass   import *
+from nucleardatapy.matter.setup_micro_gap       import *
+from nucleardatapy.matter.setup_micro_band      import *
+from nucleardatapy.matter.setup_micro_esym      import *
+from nucleardatapy.matter.setup_micro_lp        import *
+from nucleardatapy.matter.setup_pheno           import *
+from nucleardatapy.matter.setup_pheno_esym      import *
+from nucleardatapy.matter.setup_hic             import *
+from nucleardatapy.matter.setup_nep             import *
+from nucleardatapy.matter.setup_nep_stat_model  import *
+from nucleardatapy.matter.setup_nep_stat_models import *
+from nucleardatapy.matter.setup_check           import *