PycWB 0.22.0__tar.gz → 0.22.2__tar.gz

{PycWB-0.22.0 → pycwb-0.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PycWB
-Version: 0.22.0
+Version: 0.22.2
 Summary: A Python package for coherent gravitational wave burst analysis
 Home-page: https://git.ligo.org/yumeng.xu/pycwb
 Author-email: The PycWB team <yumeng.xu@ligo.org>
@@ -30,6 +30,7 @@ Requires-Dist: prefect
 Requires-Dist: prefect-dask
 Requires-Dist: dask
 Requires-Dist: dask_jobqueue
+Requires-Dist: htcondor
 
 # PycWB
 

{PycWB-0.22.0 → pycwb-0.22.2}/PycWB.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PycWB
-Version: 0.22.0
+Version: 0.22.2
 Summary: A Python package for coherent gravitational wave burst analysis
 Home-page: https://git.ligo.org/yumeng.xu/pycwb
 Author-email: The PycWB team <yumeng.xu@ligo.org>
@@ -30,6 +30,7 @@ Requires-Dist: prefect
 Requires-Dist: prefect-dask
 Requires-Dist: dask
 Requires-Dist: dask_jobqueue
+Requires-Dist: htcondor
 
 # PycWB
 

{PycWB-0.22.0 → pycwb-0.22.2}/PycWB.egg-info/SOURCES.txt

@@ -317,6 +317,9 @@ pycwb/modules/sparse_series/module.yaml
 pycwb/modules/sparse_series/sparse_table.py
 pycwb/modules/statistics/__init__.py
 pycwb/modules/statistics/eff.py
+pycwb/modules/statistics/eff_plot.py
+pycwb/modules/statistics/merge.py
+pycwb/modules/statistics/sigmoid_fit.py
 pycwb/modules/super_cluster/__init__.py
 pycwb/modules/super_cluster/module.yaml
 pycwb/modules/super_cluster/sub_net_cut.py
@@ -333,6 +336,7 @@ pycwb/modules/workflow_utils/job_setup.py
 pycwb/modules/xtalk/__init__.py
 pycwb/modules/xtalk/monster.py
 pycwb/modules/xtalk/monster_old.py
+pycwb/modules/xtalk/xtalk_data.py
 pycwb/prefect_flow/__init__.py
 pycwb/prefect_flow/pycwb_flow.py
 pycwb/prefect_flow/tasks/__init__.py

{PycWB-0.22.0 → pycwb-0.22.2}/PycWB.egg-info/requires.txt

@@ -20,3 +20,4 @@ prefect
 prefect-dask
 dask
 dask_jobqueue
+htcondor

{PycWB-0.22.0 → pycwb-0.22.2}/pycwb/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.22.0'
-__version_tuple__ = version_tuple = (0, 22, 0)
+__version__ = version = '0.22.2'
+__version_tuple__ = version_tuple = (0, 22, 2)

pycwb-0.22.2/pycwb/cli/run.py

@@ -0,0 +1,87 @@
+import os
+
+
+def init_parser(parser):
+    # Add the arguments
+    parser.add_argument('user_parameter_file',
+                        metavar='file_path',
+                        type=str,
+                        help='the path to the user parameter file')
+
+    # working dir
+    parser.add_argument('--work-dir',
+                        '-d',
+                        metavar='work_dir',
+                        type=str,
+                        default='.',
+                        help='the working directory')
+
+    # force overwrite
+    parser.add_argument('--force-overwrite',
+                        '-f',
+                        action='store_true',
+                        default=False,
+                        help='overwrite the existing results')
+
+    # threads
+    parser.add_argument('--n-proc',
+                        '-n',
+                        metavar='n_proc',
+                        type=int,
+                        default=0,
+                        help='the number of cpu to use, if it set to 0, '
+                             'it will use the value from the user parameter file.')
+
+    # generate plot
+    parser.add_argument('--plot',
+                        action='store_true',
+                        default=False,
+                        help='generate the plot, by default False')
+
+    # compress json
+    parser.add_argument('--compress_json',
+                        action='store_true',
+                        default=False,
+                        help='compress the json files, by default False')
+
+    # serve name
+    parser.add_argument('--name',
+                        metavar='name',
+                        type=str,
+                        default='pycwb',
+                        help='the name of the serve')
+
+    # list number of jobs
+    parser.add_argument('--list-n-jobs',
+                        action='store_true',
+                        default=False,
+                        help='list number of the jobs in the flow')
+
+    # list jobs
+    parser.add_argument('--list-jobs',
+                        action='store_true',
+                        default=False,
+                        help='list all jobs in the flow')
+
+
+def command(args):
+    from pycwb.workflow.batch import search
+
+    if args.list_n_jobs or args.list_jobs:
+        jobs = search(args.user_parameter_file, working_dir=args.work_dir, n_proc=1, dry_run=True)
+
+        print(f"Number of jobs: {len(jobs)}")
+
+        if args.list_n_jobs:
+            print(f"To list all jobs, use --list-jobs option.")
+
+        # list all jobs
+        if args.list_jobs:
+            for job in jobs:
+                print(job)
+
+        return 0
+
+    # Run the search function with the specified user parameter file
+    search(args.user_parameter_file, working_dir=args.work_dir, n_proc=args.n_proc, submit=args.submit,
+           overwrite=args.force_overwrite, plot=args.plot, compress_json=args.compress_json)

{PycWB-0.22.0 → pycwb-0.22.2}/pycwb/cli/xtalk.py

@@ -14,6 +14,7 @@ def init_parser(parser):
                         '-o',
                         metavar='output_dir',
                         type=str,
+                        default='.',
                         help='the output directory')
 
 

{PycWB-0.22.0 → pycwb-0.22.2}/pycwb/config/config.py

@@ -5,7 +5,9 @@ pycwb.constants.user_parameters_schema.
 """
 import os.path
 import logging
+import pathlib
 
+from ..modules.xtalk.xtalk_data import check_and_download_xtalk_data
 from ..types.wdm_xtalk import WDMXTalkCatalog
 from ..types.data_quality_file import DQFile
 from ..utils.network import max_delay
@@ -67,9 +69,8 @@ class Config:
             setattr(self, key, params[key])
 
         self.add_derived_key()
-        self.check_file(self.MRAcatalog)
-        if self.MRAcatalog:
-            self.check_MRA_catalog()
+        self.check_xtalk_file(self.MRAcatalog)
+        self.check_MRA_catalog()
         self.check_lagStep()
 
     def add_derived_key(self):
@@ -90,7 +91,10 @@ class Config:
 
         # load WAT filter directory and set MRAcatalog
         if not self.filter_dir:
-            self.filter_dir = os.environ['HOME_WAT_FILTERS']
+            if os.environ.get('HOME_WAT_FILTERS') is None:
+                self.filter_dir = os.path.abspath(".")
+            else:
+                self.filter_dir = os.environ['HOME_WAT_FILTERS']
 
         self.MRAcatalog = f"{self.filter_dir}/{self.wdmXTalk}"
 
@@ -142,6 +146,33 @@ class Config:
         if not os.path.isfile(file_name):
             raise FileNotFoundError(f"File {file_name} does not exist")
 
+    @staticmethod
+    def check_xtalk_file(file_name: str) -> bool:
+        """
+        Helper function to check if xtalk file exists and download it if it does not exist
+
+        Parameters
+        ----------
+        file_name : str
+            Path to the xtalk file
+
+        Returns
+        -------
+        bool
+            True if the file exists or has been downloaded successfully, False otherwise
+
+        Raises
+        ------
+        FileNotFoundError
+            If the file does not exist and cannot be downloaded
+        """
+        if not os.path.isfile(file_name):
+            if check_and_download_xtalk_data(str(pathlib.Path(file_name).name), str(pathlib.Path(file_name).parent)):
+                return True
+            else:
+                raise FileNotFoundError(f"File {file_name} does not exist")
+        return True
+
     def check_lagStep(self):
         """
         Check if lagStep compatible with WDM parity

pycwb-0.22.2/pycwb/constants/project_constants.py

@@ -0,0 +1,3 @@
+ROUNDED_DIGITS = 50
+XTALK_FILE_LIST_URL = "https://raw.githubusercontent.com/PycWB/xtalk-data/main/file_list.txt"
+XTALK_DATA_URL = "https://github.com/PycWB/xtalk-data/raw/main"

{PycWB-0.22.0 → pycwb-0.22.2}/pycwb/constants/user_parameters_schema.py

@@ -21,6 +21,54 @@ schema = {
             "default": "log",
             "cwb": False
         },
+        "catalog_dir": {
+            "type": "string",
+            "description": "catalog directory",
+            "default": "catalog",
+            "cwb": False
+        },
+        "trigger_dir": {
+            "type": "string",
+            "description": "trigger directory",
+            "default": "trigger",
+            "cwb": False
+        },
+        "plot_trigger": {
+            "type": "boolean",
+            "description": "plot triggers",
+            "default": False,
+            "cwb": False
+        },
+        "save_waveform": {
+            "type": "boolean",
+            "description": "save waveform from triggers",
+            "default": False,
+            "cwb": False
+        },
+        "plot_waveform": {
+            "type": "boolean",
+            "description": "plot waveform from triggers",
+            "default": False,
+            "cwb": False
+        },
+        "save_sky_map": {
+            "type": "boolean",
+            "description": "save sky maps to json",
+            "default": False,
+            "cwb": False
+        },
+        "plot_sky_map": {
+            "type": "boolean",
+            "description": "plot sky maps",
+            "default": False,
+            "cwb": False
+        },
+        "compress_output_json": {
+            "type": "boolean",
+            "description": "compress output json",
+            "default": False,
+            "cwb": False
+        },
         "nproc": {
             "type": "integer",
             "description": "number of processes",

{PycWB-0.22.0 → pycwb-0.22.2}/pycwb/modules/job_segment/job_segment.py

@@ -1,4 +1,7 @@
 import logging
+
+import orjson
+
 from .super_lag import get_slag_job_list, get_slag_list
 from .dq_segment import read_seg_list, get_seg_list, get_job_list
 from .frame import get_frame_meta, select_frame_list
@@ -170,3 +173,27 @@ def create_job_segment_from_injection(ifo, simulation_mode, injection):
 
     return job_segments
 
+
+def save_job_segments_to_json(job_segments, output_file) -> None:
+    """Save the job segments to a JSON file.
+
+    :param job_segments: The job segments.
+    :type job_segments: list[WaveSegment]
+    :param output_file: The output file.
+    :type output_file: str
+    """
+    with open(output_file, 'wb') as f:
+        f.write(orjson.dumps(job_segments))
+
+
+def load_job_segments_from_json(input_file: str) -> list[WaveSegment]:
+    """Load the job segments from a JSON file.
+
+    :param input_file: The input file.
+    :type input_file: str
+    :return: The job segments.
+    :rtype: list[WaveSegment]
+    """
+    with open(input_file, 'rb') as f:
+        data = orjson.loads(f.read())
+    return data

{PycWB-0.22.0 → pycwb-0.22.2}/pycwb/modules/statistics/eff.py

@@ -1,6 +1,12 @@
 import numpy as np
 from scipy.special import erfc
 from scipy.optimize import root_scalar
+import warnings
+
+# this function is deprecated, please consider using sigmoid_fit.py to fit the data instead
+# of reading from the fit_parameters file
+warnings.warn("This function is deprecated, please consider using sigmoid_fit.py to fit the data instead"
+              " of reading from the fit_parameters file", DeprecationWarning)
 
 
 def read_inj_type(file_name):
@@ -191,17 +197,25 @@ def plot_hrss_from_mdc(run_dirs, tags, output_dir='.'):
     plt.savefig(f'{output_dir}/hrss50.png')
 
 
-def barplot_hrss_from_mdc(run_dirs, tags, output_dir='.'):
+def sort_key(s):
+    import re
+    parts = re.match(r"([a-zA-Z]+)(\d+)Q(\d+)", s)
+    num_before_q = int(parts.group(2))
+    num_after_q = int(parts.group(3))
+    return (num_after_q, num_before_q)
+
+def barplot_hrss_from_mdc(run_dirs, tags, output_dir='.', filename='hrss50_comparison.png', wf_names_selection=None):
     import matplotlib.pyplot as plt
     import seaborn as sns
     import numpy as np
 
-    color = sns.color_palette("Paired")
+    color = sns.color_palette('Paired')
     bar_width = 0.8 / len(run_dirs)
     opacity = 0.8
 
     data_sets = []
     for i, (run_dir, tag) in enumerate(zip(run_dirs, tags)):
+        print(f"Reading: {tag}")
         injections = read_inj_type(run_dir + 'injectionList.txt')
         imdc_set_hrss10, imdc_set_hrss50, imdc_set_hrss90, imdc_set_hrss50_err = read_hrss_for_mdc(run_dir)
         wf_names_all = []
@@ -210,8 +224,11 @@ def barplot_hrss_from_mdc(run_dirs, tags, output_dir='.'):
         hrss50_errs_all = []
         for j, inj_set_name in enumerate(imdc_set_hrss50.keys()):
             wf_names = list(imdc_set_hrss50[inj_set_name].keys())
-            hrss50s = [imdc_set_hrss50[inj_set_name][wf_name] for wf_name in wf_names]
-            hrss50_errs = np.array([imdc_set_hrss50_err[inj_set_name][wf_name] for wf_name in wf_names]) - hrss50s
+            # filter out the wf_names containing 5000
+            wf_names = [wf_name for wf_name in wf_names if '5000' not in wf_name and '849' not in wf_name]
+            hrss50s = [imdc_set_hrss50[inj_set_name][wf_name] for wf_name in wf_names if wf_name in imdc_set_hrss50[inj_set_name]]
+            # print(f"inj_set_name: {inj_set_name}, wf_names: {wf_names}, hrss50s: {hrss50s}, hrss50_errs: {[imdc_set_hrss50_err[inj_set_name][wf_name] for wf_name in wf_names]}")
+            hrss50_errs = np.array([imdc_set_hrss50_err[inj_set_name][wf_name] for wf_name in wf_names if wf_name in imdc_set_hrss50_err[inj_set_name]]) - hrss50s
 
             wf_names_all += wf_names
             hrss50s_all += list(hrss50s)
@@ -224,26 +241,47 @@ def barplot_hrss_from_mdc(run_dirs, tags, output_dir='.'):
         # hrss50_errs_all = np.array(hrss50_errs_all)[sorted_indices]
         # wf_names_sorted = np.array(wf_names_all)[sorted_indices]
 
-        data_sets.append((wf_names_all, hrss50s_all, hrss50_errs_all, tag))
-
+        data_set = {}
+        for i, wf_name in enumerate(wf_names_all):
+            data_set[wf_name] = [hrss50s_all[i], hrss50_errs_all[i]]
+        # data_sets.append((wf_names_all, hrss50s_all, hrss50_errs_all, tag))
+        data_sets.append((data_set, tag))
+
+    if wf_names_selection:
+        wf_names_plot = wf_names_selection
+    else:
+        wf_names_plot = set([k for d in data_sets for k in d[0].keys() ])
+        wf_names_plot = sorted(wf_names_plot, key=sort_key)
     # Plot the data
     # figure size (10, 5)
 
-    fig, ax = plt.subplots(figsize=(12, 5))
+    fig, ax = plt.subplots(figsize=(14, 3.5))
     len_data_sets = len(data_sets)
-    for i, (wf_names, hrss50s, hrss50_errs, label) in enumerate(data_sets):
-        index = np.arange(len(wf_names))
-        bars = ax.bar(index + i*bar_width, hrss50s, bar_width, alpha=opacity, color=color[i], yerr=hrss50_errs, label=label,
+    for i, (data_set, label) in enumerate(data_sets):
+        indexes = []
+        hrss50s = []
+        hrss50_errs = []
+        for wf_name in data_set.keys():
+            if wf_name not in wf_names_plot:
+                continue
+            indexes.append(wf_names_plot.index(wf_name))
+            hrss50s.append(data_set[wf_name][0])
+            hrss50_errs.append(data_set[wf_name][1])
+        bars = ax.bar(np.array(indexes) + i*bar_width, hrss50s, bar_width, alpha=opacity, color=color[i], yerr=hrss50_errs, label=label,
                       error_kw=dict(lw=1, capsize=1.5, capthick=1, alpha=0.7))
-    wf_names = data_sets[0][0]
-    index = np.arange(len(wf_names))
+    # wf_names = data_sets[0][0]
+    index = np.arange(len(wf_names_plot))
     ax.set_yscale('log')
-    ax.set_xlabel('Waveform Names')
+    # ax.set_xlabel('Waveform Names')
     ax.set_ylabel('hrss50 values')
-    ax.set_title('Comparison of hrss50 values')
+    # ax.set_title('Comparison of hrss50 values')
     ax.set_xticks(index + bar_width*(len_data_sets-1)/2)
-    ax.set_xticklabels(wf_names, rotation=45, ha='right')  # Rotate x-labels 45 degrees
-    ax.legend()
+    ax.set_xticklabels(wf_names_plot, rotation=45, ha='right')  # Rotate x-labels 45 degrees
+    ax.legend(ncol=3)
 
     plt.tight_layout()
-    plt.savefig(f'{output_dir}/hrss50_barplot.png')
+    # save the plot with transparent background
+    plt.savefig(output_dir + '/' + filename, bbox_inches='tight', transparent=True)
+    plt.show()
+
+# barplot_hrss_from_mdc([run_dir1, run4_dir], ['v20', 'run4'])

pycwb-0.22.2/pycwb/modules/statistics/eff_plot.py

@@ -0,0 +1,45 @@
+import matplotlib.pyplot as plt
+import numpy as np
+import pandas as pd
+
+
+def hrss50_bar_plot(data_sets: list[tuple[dict[str, pd.DataFrame], str]],
+                    wf_selections=None, output_dir='.', filename='hrss50_comparison.png'):
+    if wf_selections is None:
+        wf_names_plot = list(data_sets[0][0].keys())
+    else:
+        wf_names_plot = wf_selections
+
+    color = ['#a6cee3', '#1f78b4', '#b2df8a', '#33a02c', '#fb9a99', '#e31a1c',
+             '#fdbf6f', '#ff7f00', '#cab2d6', '#6a3d9a', '#ffff99', '#b15928']
+
+    bar_width = 0.8 / len(data_sets)
+    opacity = 0.8
+
+    fig, ax = plt.subplots(figsize=(14, 3.5))
+    len_data_sets = len(data_sets)
+    for i, (data_set, label) in enumerate(data_sets):
+        indexes = []
+        hrss50s = []
+        hrss50_errs = []
+        for wf_name in data_set.keys():
+            if wf_name not in wf_names_plot:
+                continue
+            indexes.append(wf_names_plot.index(wf_name))
+            hrss50s.append(data_set[wf_name][0])
+            hrss50_errs.append(data_set[wf_name][1])
+        bars = ax.bar(np.array(indexes) + i * bar_width, hrss50s, bar_width, alpha=opacity, color=color[i],
+                      yerr=hrss50_errs, label=label,
+                      error_kw=dict(lw=1, capsize=1.5, capthick=1, alpha=0.7))
+
+    index = np.arange(len(wf_names_plot))
+    ax.set_yscale('log')
+    ax.set_ylabel('hrss50')
+    ax.set_xticks(index + bar_width * (len_data_sets - 1) / 2)
+    ax.set_xticklabels(wf_names_plot, rotation=45, ha='right')  # Rotate x-labels 45 degrees
+    ax.legend(ncol=3)
+
+    plt.tight_layout()
+
+    plt.savefig(output_dir + '/' + filename, bbox_inches='tight', transparent=True)
+

pycwb-0.22.2/pycwb/modules/statistics/merge.py

@@ -0,0 +1,65 @@
+from functools import reduce
+
+import pandas as pd
+
+
+def read_data_file(file_path: str, i: int) -> pd.DataFrame:
+    """
+    Read the data from cwb eff_*.txt files and return a DataFrame
+
+    Parameters
+    ----------
+    file_path : str
+        Path to the file to read
+    i : int
+        Index of the chunk
+
+    Returns
+    -------
+    pd.DataFrame
+        DataFrame with the data read from the file
+    """
+    data = pd.read_csv(file_path, sep='\s+', header=None, names=['hrss', f'evt_{i}', f'inj_{i}', f'ratio_{i}'])
+
+    return data
+
+
+def get_evt_vs_inj(chunks: list[str], wf_selections: list[str]) -> dict[str, pd.DataFrame]:
+    """
+    Merge the data from the chunks into a single DataFrame for each waveform selected
+
+    Parameters
+    ----------
+    chunks : list[str]
+        List of paths to the chunks to merge
+    wf_selections : list[str]
+        List of waveform selections to merge
+
+    Returns
+    -------
+    dict[str, pd.DataFrame]
+        A dictionary with the waveform name as the key and the merged DataFrame as the value
+
+    Examples
+    --------
+    >>> chunks = ['chunk1', 'chunk2']
+    >>> wf_selections = ['waveform1', 'waveform2']
+    >>> get_evt_vs_inj(chunks, wf_selections)
+    {'waveform1': pd.DataFrame, 'waveform2': pd.DataFrame}
+    """
+    wf_data = {}
+    for wf in wf_selections:
+        data = []
+        for i, chunk in enumerate(chunks):
+            data.append(read_data_file(f"{chunk}/eff_{wf}.txt", i + 1))
+
+        merged_df = reduce(lambda left, right: pd.merge(left, right, on='hrss'), data)
+
+        merged_df['evt_total'] = 0
+        merged_df['inj_total'] = 0
+        for i in range(len(chunks)):
+            merged_df['evt_total'] += merged_df[f'evt_{i + 1}']
+            merged_df['inj_total'] += merged_df[f'inj_{i + 1}']
+        wf_data[wf] = merged_df
+
+    return wf_data

pycwb-0.22.2/pycwb/modules/statistics/sigmoid_fit.py

@@ -0,0 +1,81 @@
+import numpy as np
+import warnings
+from scipy.optimize import curve_fit
+from scipy.special import erfc
+
+
+def logNfit(x, par0, par1, par2, par3, par4):
+    # Vectorized computation of y based on par0 and par4
+    y = x - par0
+    y = np.where(par4, -y, y)
+
+    # Vectorized computation of s based on y and parameters par1, par2, par3
+    s = np.where(y < 0, par1 * np.exp(y * par2), par1 * np.exp(y * par3))
+
+    # Adjust s when y > 0 and par3 > 1. / y
+    mask = (y > 0) & (par3 > 1. / y)
+    s = np.where(mask, par1 * par3 * np.exp(1.), s)
+    y = np.where(mask, 1, y)
+
+    # Compute output based on s and y
+    ny = np.where(y != 0, np.where(s > 0, np.abs(y / s), 100), y)
+
+    result = np.where(y > 0, 1 - erfc(ny) / 2, erfc(ny) / 2)
+    result = np.where(y == 0, 0.5, result)  # Handle the case y == 0
+
+    return result
+
+
+def fit(xdata, ydata, debug=False):
+    # find the ydata that close to 0.5 and the corresponding xdata
+    xdata = np.array(xdata)
+    ydata = np.array(ydata)
+    idx = np.argmin(np.abs(ydata - 0.5))
+
+    # Initial parameters
+    initial_guesses = [
+        [xdata[idx], 0.3, 1, 1, 0],
+        [xdata[idx], 0.7, 1, 1, 0],
+        [xdata[idx], 0.3, 2, 0.5, 0],
+        [xdata[idx], 0.7, 2, 0.5, 0],
+        [xdata[idx], 0.3, 3, 1, 0],
+        [xdata[idx], 0.7, 3, 1, 0],
+    ]
+
+    best_fit = None
+    best_chi2 = 1
+    for initial_params in initial_guesses:
+        if debug:
+            print(initial_params)
+
+        params_bounds = ([-25, 0, 0, 0, 0], [-19, np.inf, np.inf, 2.5, np.inf])
+
+        params, covariance = curve_fit(logNfit, xdata, ydata, method='dogbox',
+                                       p0=initial_params, bounds=params_bounds,
+                                       )
+        chi2 = np.sum(((logNfit(xdata, *params) - ydata) / ydata.std()) ** 2)
+        if debug:
+            print(chi2)
+        if chi2 < best_chi2:
+            best_fit = (params, covariance)
+            best_chi2 = chi2
+
+    if best_chi2 > 0.01:
+        warnings.warn(f"Best fit error is high: {best_chi2:.2E} > 0.01")
+
+    params, covariance = best_fit
+    # Calculate derived quantities and errors
+    hrss50 = 10 ** params[0]
+    hrssEr = (10 ** (params[0] + np.sqrt(np.diag(covariance)[0])) - 10 ** params[0])
+    sigma, betam, betap = params[1], params[2], params[3]
+    chi2 = np.sum(((logNfit(xdata, *params) - ydata) / ydata.std()) ** 2)
+
+    # Output results
+    if debug:
+        print(f"{chi2:.2E} {hrss50:.2E} +- {hrssEr:.2E} {sigma:.2E} {betam:.2E} {betap:.2E}")
+        import matplotlib.pyplot as plt
+        plt.plot(xdata, ydata, 'o')
+        new_xdata = np.linspace(xdata[0], xdata[-1], 1000)
+        plt.plot(new_xdata, logNfit(new_xdata, np.log10(hrss50), sigma, betam, betap, 0))
+
+    return [chi2, hrss50, hrssEr, sigma, betam, betap]