cosmic-popsynth 3.4.13__tar.gz → 3.4.15__tar.gz

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/.github/workflows/build_wheels_and_publish.yml

@@ -14,12 +14,13 @@ env:
   CIBW_BUILD_VERBOSITY: "1"
 
 jobs:
-  build-wheels:
+  build-wheels-and-dist:
     name: Build ${{ matrix.python-version }} wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        python-version: [3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v3
@@ -29,52 +30,40 @@ jobs:
       name: Install Python
       with:
         python-version: "3.10"
-        
-    - name: Setup Mac
+
+    - name: link gfortran and hdf5
       if: runner.os == 'macOS'
       run: |
-        python -m pip install numpy h5py versioneer
+        sudo ln -s /opt/homebrew/bin/gfortran-12 /usr/local/bin/gfortran
+        brew reinstall hdf5
         
-    - name: Setup Linux
-      if: runner.os == 'Linux'
+    - name: Install numpy
       run: |
-        python -m pip install numpy h5py versioneer
-        
-    - name: Build wheels
+        python -m pip install --upgrade pip
+        python -m pip install numpy h5py versioneer 
+
+    - name: Install dependencies
+      run: |
+        python -m pip install cibuildwheel==2.17.0 setuptools wheel build meson-python ninja meson
+
+    - name: Build source distribution (sdist)
+      run: |
+        python -m build --sdist --outdir dist
+
+    - name: Build wheels using cibuildwheel
       run: |
-        sudo ln -s /opt/homebrew/bin/gfortran-11 /opt/homebrew/bin/gfortran || true
-        python -m pip install meson ninja build
-        meson setup build
-        meson compile -C build
-        python -m build --wheel --outdir wheelhouse 
+        python -m cibuildwheel --output-dir dist
+        
     - uses: actions/upload-artifact@v3
       with:
-        path: ./wheelhouse/*.whl
-
-  build-source-dist:
-    name: Build source dist
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v4
-        name: Install Python
-        with:
-          python-version: "3.10" 
-          
-      - name: Build dist
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel twine numpy build meson ninja
-          pip install .
-          python -m build
-      - uses: actions/upload-artifact@v3
-        with:
-          path: ./dist/*.tar.gz
+        path: ./dist/*.tar.gz
+        
+    - uses: actions/upload-artifact@v3
+      with:
+        path: ./dist/*.whl
 
   publish:
-    needs: [build-wheels, build-source-dist]
+    needs: [build-wheels-and-dist]
     name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
     runs-on: ${{ matrix.os }}
     strategy:

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/.gitignore

@@ -1,3 +1,10 @@
+# ignore files without extensions
+*
+!/**/
+!*.*
+
+.DS_Store
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -102,3 +109,9 @@ ENV/
 
 # mypy
 .mypy_cache/
+
+*.o
+binary.in
+binary.dat
+*.h5
+fort.99

cosmic_popsynth-3.4.15/.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/debug/test",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceRoot}/debug",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "preLaunchTask": "make",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "Set Disassembly Flavor to Intel",
+                    "text": "-gdb-set disassembly-flavor intel",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+    ]
+}

cosmic_popsynth-3.4.15/.vscode/tasks.json

@@ -0,0 +1,13 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "make",
+            "type": "shell",
+            "command": "make test",
+            "options": {
+                "cwd": "${workspaceFolder}/cosmic/src"
+            },
+        }
+    ]
+}

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: cosmic-popsynth
-Version: 3.4.13
+Version: 3.4.15
 Summary: a Python-interfaced binary population synthesis suite
-Author: Scott Coughlin, Michael Zevin, Carl L. Rodriguez
+Author: Scott Coughlin, Michael Zevin, Carl L. Rodriguez, Tom Wagg
 Author-Email: Katelyn Breivik <katie.breivik@gmail.com>
 License: MIT License
 Classifier: Development Status :: 5 - Production/Stable
@@ -23,21 +23,6 @@ Requires-Dist: h5py
 Requires-Dist: schwimmbad
 Requires-Dist: matplotlib
 Requires-Dist: importlib-metadata
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-xdist; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: flake8; extra == "test"
-Requires-Dist: coverage; extra == "test"
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: sphinx-bootstrap-theme; extra == "docs"
-Requires-Dist: sphinxcontrib-programoutput; extra == "docs"
-Requires-Dist: sphinx-automodapi; extra == "docs"
-Requires-Dist: ipython; extra == "docs"
-Requires-Dist: sphinx_rtd_theme; extra == "docs"
-Requires-Dist: pickleshare; extra == "docs"
-Provides-Extra: test
-Provides-Extra: docs
 Description-Content-Type: text/markdown
 
 # COSMIC

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/bin/cosmic-pop

@@ -98,6 +98,8 @@ def parse_commandline():
                         help="Number of binaries to try before checking for "
                         "convergence, it will check ever Nstep binaries until "
                         "it reach Niter binaries", type=int, default=10000)
+    parser.add_argument("--max-wall-time", type=int, default=3155760,
+                        help="Maximum wall time (seconds) for sampling binaries")
     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)
@@ -288,7 +290,7 @@ if __name__ == '__main__':
         log_file.write("You have specified both qmin and m2_min.\n")
         log_file.write("COSMIC will use qmin={} to determine the secondary masses in the initial sample.\n".format(args.qmin))
 
-    while (Nstep < args.Niter) & (np.max(match) > convergence['match']):
+    while (Nstep < args.Niter) & (np.max(match) > convergence['match']) & ((time.time() - start_time) < args.max_wall_time):
         # Set random seed such that each iteration gets a unique, determinable seed
         rand_seed = seed_int + Nstep
         np.random.seed(rand_seed)

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/changelog.md

@@ -39,3 +39,7 @@ See the discussed changes in our previous releases here: https://github.com/COSM
  - Add `teff_1` and `teff_2` as variables that can be used to set `timestep_conditions`
  - Add in `-1` option to turn off Magnetic Braking in htmb 
  - Added `central_bh` and `scale_with_central_bh` as options to the CMC sampler, in order to add central massive black holes to CMC initial conditions
+
+
+## 3.4.11
+ - Added sampling options to ``independent`` sampler to allow for custom power law distributions for ``porb`` and ``q``

cosmic_popsynth-3.4.15/debug/create_binary_in.py

@@ -0,0 +1,66 @@
+import pandas as pd
+
+BSE_settings = {'xi': 1.0, 'bhflag': 1, 'neta': 0.5, 'windflag': 3, 'wdflag': 1, 'alpha1': 1.0,
+                'pts1': 0.001, 'pts3': 0.02, 'pts2': 0.01, 'epsnov': 0.001, 'hewind': 0.5,
+                'ck': 1000, 'bwind': 0.0, 'lambdaf': 0.0, 'mxns': 3.0, 'beta': -1.0, 'tflag': 1,
+                'acc2': 1.5, 'grflag': 1, 'remnantflag': 4, 'ceflag': 0, 'eddfac': 1.0,
+                'ifflag': 0, 'bconst': 3000, 'sigma': 265.0, 'gamma': -2.0, 'pisn': 45.0,
+                'natal_kick_array': [[-100.0, -100.0, -100.0, -100.0, 0.0],
+                                     [-100.0, -100.0, -100.0, -100.0, 0.0]], 'bhsigmafrac': 1.0,
+                'polar_kick_angle': 90, 'qcrit_array': [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+                                                        0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+                'cekickflag': 2, 'cehestarflag': 0, 'cemergeflag': 0, 'ecsn': 2.25,
+                'ecsn_mlow': 1.6, 'aic': 1, 'ussn': 0, 'sigmadiv': -20.0, 'qcflag': 5,
+                'eddlimflag': 0, 'fprimc_array': [2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0,
+                                                  2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0,
+                                                  2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0,
+                                                  2.0/21.0, 2.0/21.0, 2.0/21.0, 2.0/21.0],
+                'bhspinflag': 0, 'bhspinmag': 0.0, 'rejuv_fac': 1.0, 'rejuvflag': 0, 'htpmb': 1,
+                'ST_cr': 1, 'ST_tide': 1, 'bdecayfac': 1, 'rembar_massloss': 0.5, 'kickflag': 0,
+                'zsun': 0.014, 'bhms_coll_flag': 0, 'don_lim': -1, 'acc_lim': -1, 'binfrac': 0.5,
+                'rtmsflag': 0, 'wd_mass_lim': 1, 'idum': 100}
+
+
+def create_binary_in(mass0, tphysf, tb, kstar, Z, ecc, BSE_settings):
+    """Create a binary.in file based on the given parameters
+
+    This follows the format in cosmic/src/test_bse.f and changes there would need to be reflected here.
+    """
+    with open('binary.in', 'w') as f:
+        f.write(f'{mass0[0]} {mass0[1]} {tphysf} {tb} {kstar[0]} {kstar[1]} {Z} {ecc}\n')
+
+        lines = [
+            ['neta', 'bwind', 'hewind', 'alpha1', 'lambdaf', 'windflag', 'rtmsflag'],
+            ['ceflag', 'tflag', 'ifflag', 'wdflag', 'bhflag', 'remnantflag', 'mxns', 'idum'],
+            ['pts1', 'pts2', 'pts3'],
+            ['sigma', 'beta', 'xi', 'acc2', 'epsnov', 'eddfac', 'gamma']
+        ]
+
+        for line in lines:
+            f.write(' '.join([str(BSE_settings[key]) for key in line]) + '\n')
+
+
+def convert_initC_row_to_binary_in(initC_file, bin_num):
+    """Convert a row from an initC file to a binary.in file
+
+    Parameters
+    ----------
+    initC_file : `str`
+        Path to the initC file
+    bin_num : `int`
+        The binary number to convert
+    """
+    # get binary from initC
+    initC = pd.read_hdf(initC_file, key="initC")
+    r = initC.loc[bin_num]
+
+    # update BSE settings with those in the binary
+    BSE_settings['idum'] = r['randomseed'].astype(int)
+    for key in BSE_settings:
+        if key in r:
+            BSE_settings[key] = r[key]
+
+    # create binary.in file
+    create_binary_in([r['mass_1'], r['mass_2']], r['tphysf'], r['porb'],
+                    [r['kstar_1'].astype(int), r['kstar_2'].astype(int)],
+                    r['metallicity'], r['ecc'], BSE_settings)

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/docs/inifile/index.rst

@@ -1055,6 +1055,11 @@ common envelope occurs regardless of the choices below:
                             ``-2`` : assumes material is lost from the system as
                             if it is a wind from the secondary
 
+                            ``-3`` : assumes mass is lost through the outer Lagrangian point,
+                            forming a circumbinary disk. See Zapartas+17 Eq. 9 and
+                            Artymowicz & Lubow (1994).
+
+
                             ``>0`` : assumes that the lost material takes away a
                             fraction *gamma* of the orbital angular momentum
 
@@ -1104,6 +1109,7 @@ common envelope occurs regardless of the choices below:
     eddfac = 1.0
 
     ; gamma is the angular momentum factor for mass lost during Roche-lobe overflow
+    ; gamma=-3: assumes mass is lost through the outer Lagrangian point, forming a circumbinary disk. See Zapartas+17 Eq. 9 and Artymowicz & Lubow (1994).
     ; gamma=-2: assumes material is lost from the system as if it is a wind from the secondary (for super-Eddington mass transfer rates)
     ; gamma=-1: assumes the lost material carries with is the specific angular momentum of the primary
     ; gamma>0: assumes that the lost material take away a fraction (gamma) of the orbital angular momentum

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/examples/CMC_Params.ini

@@ -534,6 +534,7 @@ bhspinmag = 0.0
 eddfac = 1.0
 
 ; gamma is the angular momentum factor for mass lost during RLO
+; gamma=-3: assumes mass is lost through the outer Lagrangian point, forming a circumbinary disk. See Zapartas+17 Eq. 9 and Artymowicz & Lubow (1994).
 ; gamma=-2: assumes material is lost from the system as if it is a wind from the secondary (for super-Eddington mass transfer rates)
 ; gamma=-1: assumes the lost material carries with is the specific angular momentum of the primary
 ; gamma>0: assumes that the lost material take away a fraction (gamma) of the orbital angular momentum

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/examples/Params.ini

@@ -416,6 +416,7 @@ grflag = 1
 eddfac = 1.0
 
 ; gamma is the angular momentum factor for mass lost during RLO
+; gamma=-3: assumes mass is lost through the outer Lagrangian point, forming a circumbinary disk. See Zapartas+17 Eq. 9 and Artymowicz & Lubow (1994).
 ; gamma=-2: assumes material is lost from the system as if it is a wind from the secondary (for super-Eddington mass transfer rates)
 ; gamma=-1: assumes the lost material carries with is the specific angular momentum of the primary
 ; gamma>0: assumes that the lost material take away a fraction (gamma) of the orbital angular momentum

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/meson.build

@@ -1,7 +1,7 @@
 project('cosmic', 
     'c',
     'fortran',
-    version : '3.4.13',
+    version : '3.4.15',
     default_options: ['warning_level=0', 'optimization=3'],
 )
 
@@ -11,23 +11,21 @@ ff = meson.get_compiler('fortran')
 f_args = ff.get_supported_arguments('-fPIC')
 add_project_arguments(f_args, language: 'fortran')
 
-py3 = import('python').find_installation()
+
+py3 = import('python').find_installation(pure: false)
 
 numpy_include_dir = run_command(py3, ['-c', 'import numpy; print(numpy.get_include())'], check: true).stdout().strip()
 f2py_include_dir = run_command(py3, ['-c', 'import numpy.f2py; print(numpy.f2py.get_include())'], check: true).stdout().strip()
 inc_np = include_directories(numpy_include_dir, f2py_include_dir)
 
-f2py_source = custom_target(
-    'evolvebin-target',
-    input : ['src/cosmic/src/evolv2.f', 'src/cosmic/src/comprad.f'],
-    output : ['_evolvebinmodule.c', '_evolvebin-f2pywrappers.f'],
-    command : [py3, '-m', 'numpy.f2py', '@INPUT@', '-m', '_evolvebin', '--lower', '@OUTDIR']
-)
+get_hash = run_command('python', './src/cosmic/get_commit_hash.py', check: true).stdout().strip()
+
 
 lib_source = [
     'src/cosmic/src/hrdiag_remnant.f',
     'src/cosmic/src/assign_remnant.f',
     'src/cosmic/src/benchmarkevolv2.f',
+    'src/cosmic/src/int64.f',
     'src/cosmic/src/corerd.f',
     'src/cosmic/src/comenv.f',
     'src/cosmic/src/dgcore.f',
@@ -53,7 +51,7 @@ lib_source = [
     'src/cosmic/src/hrdiag.f',
     'src/cosmic/src/star.f',
     'src/cosmic/src/zcnsts.f',
-    'src/cosmic/src/zfuncs.f',]
+    'src/cosmic/src/zfuncs.f']
 
 # Detect operating system and set appropriate linker flags
 host_system = host_machine.system()
@@ -64,6 +62,15 @@ else
   ldflags = []  # No special flags for other systems
 endif
 
+
+f2py_source = custom_target(
+    'evolvebin-target',
+    input : ['src/cosmic/src/evolv2.f', 'src/cosmic/src/comprad.f'],
+    output : ['_evolvebinmodule.c', '_evolvebin-f2pywrappers.f'],
+    command : [py3, '-m', 'numpy.f2py', '@INPUT@', '-m', '_evolvebin', '--lower']
+)
+
+
 evolvebin_module = py3.extension_module('_evolvebin',
   f2py_source,
   lib_source,
@@ -71,19 +78,10 @@ evolvebin_module = py3.extension_module('_evolvebin',
   include_directories: inc_np,
   link_args: ldflags,
   install : true,
-  install_dir : py3.get_install_dir() / 'cosmic'
+  subdir : 'cosmic'
 )
 
-
-module_dirs = ['src/cosmic', 'src/cosmic/bse_utils', 
-               'src/cosmic/sample', 'src/cosmic/tests']
-
-# Install modules
-foreach mod_dir: module_dirs
-    install_subdir(mod_dir,
-                  install_dir: py3.get_install_dir())
-endforeach
-
-
 python_script = 'bin/cosmic-pop'
 install_data(python_script, install_dir: get_option('bindir'))
+
+subdir('src/cosmic')

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/pyproject.toml

@@ -7,10 +7,10 @@ authors = [
     { name="Scott Coughlin" },
     { name="Michael Zevin" },
     { name="Carl L. Rodriguez" },
+    { name="Tom Wagg" },
 ]
 readme = "README.md"
-
-
+version = "3.4.15"
 requires-python = ">=3.9"
 license = { text = "MIT License" }
 classifiers = [
@@ -21,25 +21,12 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
 ]
-dynamic = ["version"]
-dependencies = ["numpy", "scipy", "astropy", "configparser", 
-                "tqdm", "pandas", "tables", "h5py", "schwimmbad", 
+dependencies = ["numpy", "scipy", "astropy", "configparser",
+                "tqdm", "pandas", "tables", "h5py", "schwimmbad",
                 "matplotlib", "importlib-metadata"]
 
 
-[project.optional-dependencies]
-test = ["pytest", "pytest-xdist", "pytest-cov", "flake8", "coverage"]
-docs = ["sphinx", "numpydoc", "sphinx-bootstrap-theme", 
-        "sphinxcontrib-programoutput", "sphinx-automodapi",
-        "ipython", "sphinx_rtd_theme", "pickleshare"]
-
-
-
 [build-system]
-requires = ["meson", "meson-python", "wheel", "numpy", "setuptools"]
 build-backend = 'mesonpy'
+requires = ['meson-python', 'numpy']
 
-
-# pyproject.toml
-[tool.setuptools]
-write_to = "src/cosmic/_version.py"

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/requirements.txt

@@ -22,3 +22,4 @@ flake8 < 5
 pytest
 pytest-cov
 wheel
+meson

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/src/cosmic/__init__.py

@@ -21,8 +21,10 @@
 """
 
 from ._version import __version__
+from ._commit_hash import COMMIT_HASH
 
 __version__ = __version__
+__commithash__ = COMMIT_HASH
 __author__ = "Katie Breivik <katie.breivik@gmail.com>"
 __credits__ = [
     "Scott Coughlin <scott.coughlin@ligo.org>",

cosmic_popsynth-3.4.15/src/cosmic/_version.py

@@ -0,0 +1 @@
+__version__ = "3.4.15"

cosmic_popsynth-3.4.15/src/cosmic/bse_utils/meson.build

@@ -0,0 +1,10 @@
+python_sources = [
+  '__init__.py',
+  'zcnsts.py',
+  'zdata.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/bse_utils'
+)

cosmic_popsynth-3.4.15/src/cosmic/get_commit_hash.py

@@ -0,0 +1,15 @@
+import subprocess
+
+def get_commit_hash():
+    # Run git command to get the latest commit hash
+    result = subprocess.run(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    commit_hash = result.stdout.decode('utf-8').strip()
+    return commit_hash
+
+def write_commit_hash_to_file(commit_hash):
+    with open('./src/cosmic/_commit_hash.py', 'w') as f:
+        f.write(f'COMMIT_HASH = "{commit_hash}"\n')
+
+if __name__ == "__main__":
+    commit_hash = get_commit_hash()
+    write_commit_hash_to_file(commit_hash)

cosmic_popsynth-3.4.15/src/cosmic/meson.build

@@ -0,0 +1,21 @@
+python_sources = [
+  '__init__.py',
+  '_commit_hash.py',
+  '_version.py',
+  'checkstate.py',
+  'evolve.py',
+  'filter.py',
+  'get_commit_hash.py',
+  'Match.py',
+  'plotting.py',
+  'utils.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic'
+)
+
+subdir('bse_utils')
+subdir('sample')
+subdir('tests')

cosmic_popsynth-3.4.15/src/cosmic/sample/cmc/meson.build

@@ -0,0 +1,10 @@
+python_sources = [
+  '__init__.py',
+  'elson.py',
+  'king.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/sample/cmc'
+)

cosmic_popsynth-3.4.15/src/cosmic/sample/meson.build

@@ -0,0 +1,13 @@
+python_sources = [
+  '__init__.py',
+  'initialbinarytable.py',
+  'initialcmctable.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/sample'
+)
+
+subdir('cmc')
+subdir('sampler')

{cosmic_popsynth-3.4.13 → cosmic_popsynth-3.4.15}/src/cosmic/sample/sampler/independent.py

@@ -49,6 +49,7 @@ def get_independent_sampler(
     total_mass=np.inf,
     sampling_target="size",
     trim_extra_samples=False,
+    q_power_law=0,
     **kwargs
 ):
     """Generates an initial binary sample according to user specified models
@@ -73,8 +74,10 @@ def get_independent_sampler(
     ecc_model : `str`
         Model to sample eccentricity; choices include: thermal, uniform, sana12
 
-    porb_model : `str`
+    porb_model : `str` or `dict`
         Model to sample orbital period; choices include: log_uniform, sana12, raghavan10, moe19
+        or a custom power law distribution defined with a dictionary with keys "min", "max", and "slope"
+        (e.g. {"min": 0.15, "max": 0.55, "slope": -0.55}) would reproduce the Sana+2012 distribution
 
     qmin : `float`
         kwarg which sets the minimum mass ratio for sampling the secondary
@@ -142,6 +145,11 @@ def get_independent_sampler(
     zsun : `float`
         optional kwarg for setting effective radii, default is 0.02
 
+    q_power_law : `float`
+        Exponent for the mass ratio distribution power law, default is 0 (flat in q). Note that
+        q_power_law cannot be exactly -1, as this would result in a divergent distribution.
+
+
     Returns
     -------
     InitialBinaryTable : `pandas.DataFrame`
@@ -212,7 +220,7 @@ def get_independent_sampler(
         ) = initconditions.binary_select(mass1, binfrac_model=binfrac_model, **kwargs)
 
         # sample secondary masses for the single stars
-        mass2_binaries = initconditions.sample_secondary(mass1_binaries, **kwargs)
+        mass2_binaries = initconditions.sample_secondary(mass1_binaries, q_power_law=q_power_law, **kwargs)
 
         # check if this batch of samples will take us over our sampling target
         if not target(mass1_binary, size,
@@ -477,7 +485,7 @@ class Sample(object):
         return u, np.sum(u)
 
     # sample secondary mass
-    def sample_secondary(self, primary_mass, **kwargs):
+    def sample_secondary(self, primary_mass, q_power_law=0, **kwargs):
         """Sample a secondary mass using draws from a uniform mass ratio distribution motivated by
         `Mazeh et al. (1992) <http://adsabs.harvard.edu/abs/1992ApJ...401..265M>`_
         and `Goldberg & Mazeh (1994) <http://adsabs.harvard.edu/abs/1994ApJ...429..362G>`_
@@ -590,10 +598,7 @@ class Sample(object):
             qmin_vals[highmassIdx] = np.maximum(qmin_vals[highmassIdx], m2_min_msort/primary_mass[highmassIdx])
 
         # --- now, randomly sample mass ratios and get secondary masses
-        secondary_mass = np.random.uniform(qmin_vals, 1) * primary_mass
-
-
-
+        secondary_mass = utils.rndm(qmin_vals, 1, q_power_law, size=len(primary_mass)) * primary_mass
         return secondary_mass
 
     def binary_select(self, primary_mass, binfrac_model=0.5, **kwargs):
@@ -799,7 +804,7 @@ class Sample(object):
             radii of the primaries. 
         rad2 : array
             radii of the secondaries 
-        porb_model : string
+        porb_model : `str` or `dict`
             selects which model to sample orbital periods, choices include:
             log_uniform : semi-major axis flat in log space from RRLO < 0.5 up to 1e5 Rsun according to
             `Abt (1983) <http://adsabs.harvard.edu/abs/1983ARA%26A..21..343A>`_
@@ -820,6 +825,9 @@ class Sample(object):
             `Raghavan+2010 <https://ui.adsabs.harvard.edu/abs/2010ApJS..190....1R/abstract>_`
             but with different close binary fractions following 
             `Moe+2019 <https://ui.adsabs.harvard.edu/abs/2019ApJ...875...61M/abstract>_`
+            Custom power law distribution defined with a dictionary with keys "min", "max", and "slope"
+            (e.g. porb_model={"min": 0.15, "max": 0.55, "slope": -0.55}) would reproduce the
+            Sana+2012 distribution.
         met : float
             metallicity of the population
 
@@ -900,6 +908,23 @@ class Sample(object):
             porb = 10 ** utils.rndm(a=log10_porb_min, b=log10_porb_max, g=-0.55, size=size)
             aRL_over_a = a_min / utils.a_from_p(porb,mass1,mass2) 
 
+        elif isinstance(porb_model, dict):
+            # use a power law distribution for the orbital periods
+            params = {
+                "min": 0.15,
+                "max": 5.5,
+                "slope": -0.55,
+            }
+            # update the default parameters with the user-supplied ones
+            params.update(porb_model)
+
+            # same calculations as sana12 case (sample from a power law distribution but avoid RLOF)
+            log10_RL_porb = np.log10(utils.p_from_a(a_min, mass1, mass2))
+            params["min"] = np.full(len(a_min), params["min"])
+            params["min"][params["min"] < log10_RL_porb] = log10_RL_porb[params["min"] < log10_RL_porb]
+            porb = 10**utils.rndm(a=params["min"], b=params["max"], g=params["slope"], size=size)
+            aRL_over_a = a_min / utils.a_from_p(porb, mass1, mass2)
+
         elif porb_model == "renzo19":
             # Same here: if using CMC, set the maximum porb to the smaller of either the
             # hard/soft boundary or 5.5 (from Sana paper)
@@ -952,6 +977,7 @@ class Sample(object):
             from scipy.interpolate import interp1d
             from scipy.stats import norm
             from scipy.integrate import trapezoid
+
             try:
                 met = kwargs.pop('met')
             except: