cosmic-popsynth 3.6.0__tar.gz → 3.6.2__tar.gz

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/.github/workflows/build_wheels_and_publish.yml

@@ -6,79 +6,74 @@ on:
   workflow_dispatch:
 
 env:
-  CIBW_BUILD: "cp39-* cp310-*"
+  CIBW_BUILD: "cp310-* cp311-* cp312-* cp313-*"
   CIBW_ARCHS_LINUX: "x86_64"
   CIBW_SKIP: "*-win32 *musllinux*"
   CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
   CIBW_BEFORE_BUILD: pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
   CIBW_BUILD_VERBOSITY: "1"
+  CIBW_BEFORE_ALL_LINUX: yum install -y gcc-gfortran
+  CIBW_ENVIRONMENT_LINUX: "FC=gfortran F77=gfortran"
+  CIBW_ENVIRONMENT_MACOS: "FC=gfortran F77=gfortran MACOSX_DEPLOYMENT_TARGET=14.0"
 
 jobs:
   build-wheels-and-dist:
-    name: Build ${{ matrix.python-version }} wheels on ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        python-version: [3.9, "3.10"]
+        os: [ubuntu-latest, macos-14]
 
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+
+    # this step only uses a single python version since cibuildwheel
+    # builds multiple versions in one go on linux
     - uses: actions/setup-python@v5
       name: Install Python
       with:
-        python-version: "3.10"
+        python-version: "3.12"
 
-    - name: link gfortran and hdf5
+    - name: Install hdf5 (macOS)
       if: runner.os == 'macOS'
       run: |
-        sudo ln -s /opt/homebrew/bin/gfortran-12 /usr/local/bin/gfortran
-        brew reinstall hdf5
+        brew install hdf5
         
     - name: Install numpy
       run: |
         python -m pip install --upgrade pip
-        python -m pip install numpy h5py versioneer 
+        python -m pip install numpy h5py versioneer
 
     - name: Install dependencies
       run: |
         python -m pip install setuptools wheel build meson-python ninja meson pytest cibuildwheel
 
-    - name: Build source and wheels distribution on MacOS
+    - name: Set up Fortran (macOS)
       if: runner.os == 'macOS'
-      run: |
-        python -m build --outdir dist
-        find ./dist/*.whl | xargs pip install
-        pytest src/cosmic
+      uses: fortran-lang/setup-fortran@v1
+      with:
+        compiler: gcc
+        version: '13'
         
     - name: Build source and wheels distribution on Linux
-      if: runner.os == 'Linux'
       run: |
         python -m build --sdist --outdir dist
         python -m cibuildwheel --output-dir dist
         
     - uses: actions/upload-artifact@v4
       with:
-        name: dist-${{ matrix.os }}-${{ matrix.python-version }}
+        name: dist-${{ matrix.os }}
         path: ./dist/*
 
   publish:
     needs: [build-wheels-and-dist]
-    name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.10"]
+    name: Publish Python 🐍 distributions 📦 to PyPI
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
 
     - name: Download artifacts
       uses: actions/download-artifact@v4

cosmic_popsynth-3.6.2/.github/workflows/cmc-review.yml

@@ -0,0 +1,76 @@
+name: Flag CMC review for cosmic changes
+
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+    paths:
+      - 'src/cosmic/utils.py'
+      - 'src/cosmic/evolve.py'
+      - 'docs/cosmic-settings.json'
+
+permissions:
+  pull-requests: write
+  contents: read
+
+jobs:
+  flag-cmc-review:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: add "needs-cmc-review" label
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const labelName = 'needs-cmc-review';
+
+            // ensure the label exists, or create it
+            try {
+              await github.rest.issues.getLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: labelName,
+              });
+            } catch (error) {
+              if (error.status === 404) {
+                await github.rest.issues.createLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  name: labelName,
+                  color: 'fbca04',
+                  description: 'PR touches cosmic core settings and needs CMC review',
+                });
+              } else {
+                throw error;
+              }
+            }
+
+            // add the label to the PR
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: [labelName],
+            });
+
+      - name: comment to request CMC review
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const body = `
+            🚨 **CMC review requested**
+
+            This pull request modifies one or more of the following files:
+
+            - \`src/cosmic/utils.py\`
+            - \`docs/cosmic-settings.json\`
+            - \`src/cosmic/evolve.py\`
+
+            A CMC developer should review this PR to ensure corresponding changes are propagated upstream as needed.
+            `;
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body,
+            });

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/.github/workflows/python-package.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
@@ -32,19 +32,16 @@ jobs:
           ${{ runner.os }}-
     - name: Install dependencies and package
       run: |
+        # upgrade apt-get and install system dependencies
         sudo apt-get update
         sudo apt-get install gfortran swig libhdf5-serial-dev meson python3-dev
+
+        # upgrade pip and install dependencies
+        python -m pip install -U pip setuptools wheel packaging flake8
         pip install numpy ninja pytest
         pip install -r requirements.txt
         python -m pip install .
         
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude docs
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude docs,versioneer.py,cosmic/_version.py,cosmic/tests,cosmic/*/__init__.py
-
     - name: Test with pytest
       run: |
         bash ci/compile_benchmark.sh

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/.gitignore

@@ -115,3 +115,4 @@ binary.in
 binary.dat
 *.h5
 fort.99
+savefig/

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cosmic-popsynth
-Version: 3.6.0
+Version: 3.6.2
 Summary: a Python-interfaced binary population synthesis suite
 Author: Scott Coughlin, Michael Zevin, Carl L. Rodriguez, Tom Wagg
 Author-Email: Katelyn Breivik <katie.breivik@gmail.com>
@@ -11,7 +11,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: astropy
@@ -22,7 +22,6 @@ Requires-Dist: tables
 Requires-Dist: h5py
 Requires-Dist: schwimmbad
 Requires-Dist: matplotlib
-Requires-Dist: importlib-metadata
 Description-Content-Type: text/markdown
 
 # COSMIC

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/bin/cosmic-pop

@@ -11,29 +11,26 @@
 ##############################################################################
 #  IMPORT ALL NECESSARY PYTHON PACKAGES
 ##############################################################################
-from collections import OrderedDict
-import warnings
 import argparse
 import schwimmbad
 
-import math
-import random
 import time
 from time import sleep
-import string
-import os.path
 import json
 
 import numpy as np
-import scipy.special as ss
 import pandas as pd
+from pandas.errors import PerformanceWarning
 import warnings
+import h5py as h5
 
 from cosmic.sample.initialbinarytable import InitialBinaryTable
 from cosmic import Match, utils
 from cosmic.evolve import Evolve
+from cosmic._version import __version__
 
-from schwimmbad import MultiPool, MPIPool
+from schwimmbad import MPIPool
+from os import sys
 
 def str2bool(v):
     if isinstance(v, bool):
@@ -110,9 +107,9 @@ def parse_commandline():
     parser.add_argument("--binary_state", nargs='+', type=int)
     parser.add_argument("--sampling_method")
     parser.add_argument("--primary_model", help="Chooses the initial primary mass function from: salpeter55, kroupa93, kroupa01", type=str)
-    parser.add_argument("--binfrac_model", help="Chooses the binary fraction model from: a float between [0,1], vanHaaften, and offner22", type=binfrac_type)
+    parser.add_argument("--binfrac_model", help="Chooses the binary fraction model from: a float between [0,1], vanHaaften, and offner23", type=binfrac_type)
     parser.add_argument("--ecc_model", help="Chooses the initial eccentricity distribution model from: thermal, uniform, and sana12", type=str)
-    parser.add_argument("--porb_model", help="Chooses the initial orbital period distribution model from: log_uniform and sana12", type=str)
+    parser.add_argument("--porb_model", help="Chooses the initial orbital period distribution model from: log_uniform, sana12, renzo19, raghavan10, moe19, and martinez26", type=str)
     parser.add_argument("--SF_start", help="Sets the time in the past when star formation initiates in Myr", type=float)
     parser.add_argument("--SF_duration", help="Sets the duration of constant star formation in Myr", type=float)
     parser.add_argument("--metallicity", type=float)
@@ -243,10 +240,12 @@ if __name__ == '__main__':
         kstar2_range = args.final_kstar2
         kstar2_range_string = str(int(args.final_kstar2[0]))
 
+    dat_store_fname = 'dat_kstar1_{0}_kstar2_{1}_SFstart_{2}_SFduration_{3}_metallicity_{4}.h5'.format(kstar1_range_string, kstar2_range_string, sampling['SF_start'], sampling['SF_duration'], sampling['metallicity'])
     # Open the hdf5 file to store the fixed population data
     try:
-        dat_store = pd.HDFStore('dat_kstar1_{0}_kstar2_{1}_SFstart_{2}_SFduration_{3}_metallicity_{4}.h5'.format(kstar1_range_string, kstar2_range_string, sampling['SF_start'], sampling['SF_duration'], sampling['metallicity']),complib=args.complib,complevel=args.complevel)
-        conv_save = pd.read_hdf(dat_store, 'conv')
+        with pd.HDFStore(dat_store_fname,complib=args.complib,complevel=args.complevel) as dat_store:
+            # If the file exists, we will read it and continue from where we left off
+            conv_save = pd.read_hdf(dat_store, 'conv')
         log_file = open('log_kstar1_{0}_kstar2_{1}_SFstart_{2}_SFduration_{3}_metallicity_{4}.txt'.format(kstar1_range_string, kstar2_range_string, sampling['SF_start'], sampling['SF_duration'], sampling['metallicity']), 'a')
         log_file.write('There are already: '+str(conv_save.shape[0])+' '+kstar1_range_string+'_'+kstar2_range_string+' binaries evolved\n')
         log_file.write('\n')
@@ -258,8 +257,8 @@ if __name__ == '__main__':
         total_n_stars = np.max(pd.read_hdf(dat_store, 'n_stars'))[0]
         idx = int(np.max(pd.read_hdf(dat_store, 'idx'))[0])
     except:
+        #dat_store = pd.HDFStore('dat_kstar1_{0}_kstar2_{1}_SFstart_{2}_SFduration_{3}_metallicity_{4}.h5'.format(kstar1_range_string, kstar2_range_string, sampling['SF_start'], sampling['SF_duration'], sampling['metallicity']),complib=args.complib,complevel=args.complevel)
         conv_save = pd.DataFrame()
-        dat_store = pd.HDFStore('dat_kstar1_{0}_kstar2_{1}_SFstart_{2}_SFduration_{3}_metallicity_{4}.h5'.format(kstar1_range_string, kstar2_range_string, sampling['SF_start'], sampling['SF_duration'], sampling['metallicity']),complib=args.complib,complevel=args.complevel)
         total_mass_singles = 0  
         total_mass_binaries = 0
         total_mass_stars = 0
@@ -269,14 +268,11 @@ if __name__ == '__main__':
         idx = 0
         log_file = open('log_kstar1_{0}_kstar2_{1}_SFstart_{2}_SFduration_{3}_metallicity_{4}.txt'.format(kstar1_range_string, kstar2_range_string, sampling['SF_start'], sampling['SF_duration'], sampling['metallicity']), 'w')
 
-    # save configuration settings to output file
-    configuration_settings = {'BSEDict' : BSEDict, 'filters' : filters,
-                              'convergence' : convergence, 'sampling' : sampling}
-
-    for k, v in configuration_settings.items():
-        for k1, v1 in v.items():
-            dat_store.put('config/{0}/{1}/'.format(k, k1), pd.Series(v1))
-    dat_store.put('config/rand_seed/', pd.Series(seed_int))
+    # save configuration settings and COSMIC version to output file
+    with h5.File(dat_store_fname, 'a') as f:
+        f["config"] = json.dumps({'BSEDict' : BSEDict, 'filters' : filters, 'convergence' : convergence,
+                                  'sampling' : sampling, 'rand_seed': seed_int})
+        f.attrs['COSMIC_version'] = __version__
 
     # Initialize the step counter and convergence array/list
     Nstep = idx - np.mod(idx, args.Nstep)
@@ -304,6 +300,9 @@ if __name__ == '__main__':
 
         # Select the initial binary sample method from user input
         if sampling['sampling_method'] == 'independent':
+            if hasattr(args,'qmin') and hasattr(args,'m2_min'):
+                raise ValueError("You cannot specify both qmin and m2_min in the inifile if you are using the independent sampler. Please choose one or the other.")
+            # If qmin is specified, use it to sample the initial binary table
             if hasattr(args,'qmin'):
                 init_samp_list = InitialBinaryTable.sampler(format_ = sampling['sampling_method'],
                                                             final_kstar1 = kstar1_range,
@@ -319,6 +318,7 @@ if __name__ == '__main__':
                                                             size = args.Nstep,
                                                             qmin = args.qmin,
                                                             params = args.inifile)
+            # if m2_min is specified, use it to sample the initial binary table
             elif hasattr(args,'m2_min'):
                 init_samp_list = InitialBinaryTable.sampler(format_ = sampling['sampling_method'],
                                                             final_kstar1 = kstar1_range,
@@ -343,14 +343,15 @@ if __name__ == '__main__':
             init_samp_list = InitialBinaryTable.sampler(format_ = sampling['sampling_method'],
                                                         final_kstar1 = kstar1_range,
                                                         final_kstar2 = kstar2_range,
-                                                        keep_singles = args.keep_singles,
                                                         rand_seed = rand_seed,
                                                         nproc = args.nproc,
                                                         SF_start = sampling['SF_start'],
                                                         SF_duration = sampling['SF_duration'],
                                                         met = sampling['metallicity'],
                                                         size = args.Nstep,
-                                                        pool=pool)
+                                                        pool=pool,
+                                                        keep_singles = args.keep_singles
+                                                        )
             IBT, mass_singles, mass_binaries, n_singles, n_binaries = init_samp_list
 
         # Log the total sampled mass from the initial binary sample
@@ -387,17 +388,33 @@ if __name__ == '__main__':
                                                       dtp=dtp,
                                                       timestep_conditions=filters['timestep_conditions'])
 
+        # extract single stars
+
+        if (args.keep_singles==True):
+            singles_bin_num = initCond.loc[initCond.kstar_2 == 15].bin_num.unique()
+            # get the singles from the bcm and bpp arrays
+            bcm_singles = bcm.loc[bcm.bin_num.isin(singles_bin_num)]
+            bpp_singles = bpp.loc[bpp.bin_num.isin(singles_bin_num)]
+            initCond_singles = initCond.loc[initCond.bin_num.isin(singles_bin_num)]
+            kick_info_singles = kick_info.loc[kick_info.bin_num.isin(singles_bin_num)]
+
+            bpp = bpp.loc[~bpp.bin_num.isin(singles_bin_num)]
+            bcm = bcm.loc[~bcm.bin_num.isin(singles_bin_num)]
+            initCond = initCond.loc[~initCond.bin_num.isin(singles_bin_num)]
+            kick_info = kick_info.loc[~kick_info.bin_num.isin(singles_bin_num)]
         # get any nans and pull them out for now
         nans = np.isnan(bpp.sep)
         if nans.any():
             nan_bin_nums = np.unique(bpp[nans]["bin_num"].values)
             initCond_nan = initCond.loc[initCond.bin_num.isin(nan_bin_nums)]
-            if pd.__version__<="2.0.0":
-                dat_store.append("nan_initC", initCond_nan)
-            else:
-                dat_store["nan_initC"] = initCond_nan
-            log_file.write(f"There are {len(nan_bin_nums)} NaNs stored in the datfile with key: 'nan_initC'")
-            log_file.write(f"These NaNs likely arise because you have pts1 = 0.001, try running with pts1 = 0.01")
+            with pd.HDFStore(dat_store_fname,complib=args.complib,complevel=args.complevel) as dat_store:
+                if pd.__version__<="2.0.0":
+                    dat_store.append("nan_initC", initCond_nan)
+                else:
+                    dat_store["nan_initC"] = initCond_nan
+            log_file.write(f"There are {len(nan_bin_nums)} NaNs stored in the datfile with key: 'nan_initC'\n")
+            log_file.write(f"You might want to check them out carefully to see if there is something that impacts your results\n")
+            #log_file.write(f"These NaNs likely arise because you have pts1 = 0.001, try running with pts1 = 0.01")
 
             bcm = bcm.loc[~bcm.bin_num.isin(nan_bin_nums)]
             bpp = bpp.loc[~bpp.bin_num.isin(nan_bin_nums)]
@@ -410,6 +427,8 @@ if __name__ == '__main__':
         # If dtp is not set, filter out first timestep in bcm
         if np.all(dtp == IBT['tphysf'].values):
             bcm = bcm.loc[bcm['tphys'].isin(dtp)]
+            if (args.keep_singles==True):
+                bcm_singles = bcm_singles.loc[bcm_singles['tphys'].isin(dtp)]
 
         # Now get the converging population and bin_nums for conv systems whic
         # satisfy the convergence_limits
@@ -417,6 +436,9 @@ if __name__ == '__main__':
                                                            kstar1_range, kstar2_range,
                                                            convergence['pop_select'],
                                                            convergence['convergence_limits'])
+        if (args.keep_singles==True):
+            conv_singles_filter = utils.conv_select_singles(bcm_singles, bpp_singles, kstar1_range)
+        
         if conv_filter.empty:
             warnings.warn("After filtering for desired convegence systems there were no systems matching your request. It is possible you are suggesting incompatible bin_state choices and pop_select, e.g. bin_state=[0,1], pop_select='disruption'")
             log_file.write("After filtering for desired convegence systems there were no systems matching your request. It is possible you are suggesting incompatible bin_state choices and pop_select, e.g. bin_state=[0,1], pop_select='disruption'")
@@ -426,6 +448,12 @@ if __name__ == '__main__':
         initC_filter = initCond.loc[initCond.bin_num.isin(conv_filter.bin_num)]
         kick_info_filter = kick_info.loc[kick_info.bin_num.isin(conv_filter.bin_num)]
 
+        if (args.keep_singles==True):
+            bpp_singles_filter = bpp_singles.loc[bpp_singles.bin_num.isin(conv_singles_filter.bin_num)]
+            bcm_singles_filter = bcm_singles.loc[bcm_singles.bin_num.isin(conv_singles_filter.bin_num)]
+            initC_singles_filter = initCond_singles.loc[initCond_singles.bin_num.isin(conv_singles_filter.bin_num)]
+            kick_info_singles_filter = kick_info_singles.loc[kick_info_singles.bin_num.isin(conv_singles_filter.bin_num)]
+
         # Filter the bin_state based on user specified filters
         bcm_filter, bin_state_nums = utils.filter_bin_state(bcm_filter, bpp_filter, filters, kstar1_range, kstar2_range)
         if bcm_filter.empty:
@@ -444,19 +472,17 @@ if __name__ == '__main__':
         conv_filter = conv_filter.loc[conv_filter.bin_num.isin(conv_lims_bin_num)]
 
         # Filter the bcm and bpp arrays according to user specified filters
-        if len(bcm_filter_match) == 0:
-            bcm_filter_match = bcm_filter.copy()
-            bpp_filter_match = bpp_filter.copy()
-            initC_filter_match = initC_filter.copy()
-            conv_filter_match = conv_filter.copy()
-            kick_info_filter_match = kick_info_filter.copy()
-        else:
-            bcm_filter_match = pd.concat([bcm_filter_match,bcm_filter], ignore_index=True)
-            bpp_filter_match = pd.concat([bpp_filter_match,bpp_filter], ignore_index=True)
-            initC_filter_match = pd.concat([initC_filter_match,initC_filter], ignore_index=True)
-            kick_info_filter_match = pd.concat([kick_info_filter_match,kick_info_filter], ignore_index=True)
-            conv_filter_match = pd.concat([conv_filter_match,conv_filter.loc[conv_filter.bin_num.isin(conv_lims_bin_num)]], ignore_index=True)
-                
+        bcm_filter_match = bcm_filter.copy()
+        bpp_filter_match = bpp_filter.copy()
+        initC_filter_match = initC_filter.copy()
+        conv_filter_match = conv_filter.copy()
+        kick_info_filter_match = kick_info_filter.copy()
+        if (args.keep_singles==True):
+            conv_singles_filter_match = conv_singles_filter.copy()
+            bpp_singles_filter_match = bpp_singles_filter.copy()
+            bcm_singles_filter_match = bcm_singles_filter.copy()
+            initC_filter_singles_match = initC_singles_filter.copy()
+            kick_info_singles_filter_match = kick_info_singles_filter.copy()          
 
         if len(conv_filter_match) >= np.min([50, args.Niter]):
             conv_save = pd.concat([conv_save, pd.DataFrame(conv_filter_match)], ignore_index=True)
@@ -478,9 +504,20 @@ if __name__ == '__main__':
             # write the data and the logs!
             mass_list = [total_mass_singles, total_mass_binaries, total_mass_stars]
             n_list = [total_n_singles, total_n_binaries, total_n_stars]
-            utils.pop_write(dat_store, log_file, mass_list, n_list, bcm_filter_match,
-                            bpp_filter_match, initC_filter_match, conv_filter_match, kick_info_filter_match,
-                            bin_state_nums, match_save, idx)
+
+            # write the data to the dat_store
+            with pd.HDFStore(dat_store_fname,complib=args.complib,complevel=args.complevel) as dat_store:
+                if (args.keep_singles==True):
+                    utils.pop_write(dat_store, log_file, mass_list, n_list, bcm_filter_match,
+                                bpp_filter_match, initC_filter_match, conv_filter_match, kick_info_filter_match,
+                                bin_state_nums, match_save, idx, 
+                                conv_singles=conv_singles_filter_match, bcm_singles=bcm_singles_filter_match, 
+                                bpp_singles=bpp_singles_filter_match, initC_singles=initC_filter_singles_match,
+                                kick_info_singles=kick_info_singles_filter_match)
+                else:
+                    utils.pop_write(dat_store, log_file, mass_list, n_list, bcm_filter_match,
+                                bpp_filter_match, initC_filter_match, conv_filter_match, kick_info_filter_match,
+                                bin_state_nums, match_save, idx)
 
             # reset the bcm_filter DataFrame
             bcm_filter_match = []
@@ -488,12 +525,20 @@ if __name__ == '__main__':
             initC_filter_match = []
             conv_filter_match = []
             kick_info_filter_match = []
+            if (args.keep_singles==True):
+                conv_singles_filter_match = []
+                bpp_singles_filter_match = []
+                bcm_singles_filter_match = []
+                initC_filter_singles_match = []
+                kick_info_singles_filter_match = []
             log_file.write('\n')
         Nstep += args.Nstep
         log_file.flush()
-    # Close the data storage file
-    dat_store.close()
-
+    
+    # close the log file and print the final message
     log_file.write('All done friend!')
     log_file.close()
 
+    pool.close()
+    pool.join()
+

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/changelog.md

@@ -49,4 +49,13 @@ See the discussed changes in our previous releases here: https://github.com/COSM
  - Bug fix: Changed `kick.f` to use the Pfahl+02 kick prescription by default instead of Kiel & Hurley 2009, this fixes ejection velocities of secondaries and also changed kick_info to have an extra column
 
 ## 3.6.0
- - Overhaul documentation and added debugging environment
+ - Overhaul documentation and added debugging environment
+ - Feature: Added Disberg+2025 kick prescription as a new choice of `kickflag` (`kickflag=5`). Applies log-normal distribution to regular CCSN, ECSN/USSN still use `sigmadiv` Maxwellian and BH fallback scaling is still applied via `bhflag` and `bhsigmafrac` as with `kickflag=1`
+
+## 3.6.1
+ - Add support for single stars in both independent and multidim sampling
+ - update documentation
+
+## 3.6.2
+ - Add functions to `cosmic.utils` for initC IO that's more efficient (`save_initC`, `load_initC`) by saving
+ identical setting columns separately with only one copy - saves ~1kb per binary

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/docs/create_params_ini.py

@@ -99,7 +99,7 @@ def construct_ini_from_json(config, include_comments=True):
 
 def main():
     # read the config file
-    with open("cosmic-settings.json") as f:
+    with open("../src/cosmic/data/cosmic-settings.json") as f:
         config = json.load(f)
 
     # convert it to an INI file, replace HTML tags and save the output

{cosmic_popsynth-3.6.0 → cosmic_popsynth-3.6.2}/docs/create_settings_html.py

@@ -46,7 +46,7 @@ settings_template = """<div class="setting">
 option_template = """<li><code class="docutils literal notranslate"><span class="pre opt-val"></span></code>: <span class="opt-desc"></span></li>"""
 
 # read the settings file
-with open("cosmic-settings.json") as f:
+with open("../src/cosmic/data/cosmic-settings.json") as f:
     settings = json.load(f)
 
 # go through each major settings group