merging .txt files

Author: mssiwek

README.md

@@ -7,13 +7,6 @@
 
 *Massive Black-Hole Binary Population Synthesis for Gravitational Wave Calculations ≋●≋●≋*
 
-<<<<<<< HEAD
-This package, which is actively under development, is aimed at providing a comprehensive framework for MBH binary population synthesis.  The framework includes modules to perform pop synth using a variety of methodologies to get a handle on both statistical and systematic uncertainties.  Currently, binary populations can be synthesis based on: cosmological hydrodynamic simulations (Illustris), semi-analytic/semi-empirical models (SAMs), and observational catalogs of local galaxies and/or quasars.
-
-## Installation
-
-The `holodeck` framework is currently under substantial, active development.  It will not be available on `pypi` (`pip`) or via `conda` install until it has stabilized.  Currently `holodeck` requires `python >= 3.8`, and tests are run on versions `3.8`, `3.9`, `3.10`.
-=======
 <img src="docs/media/holodeck_logo.png" width="260" alt="holodeck logo">
 
 This package provides a comprehensive framework for MBH binary population synthesis.  The framework includes modules to perform population synthesis using a variety of methodologies from semi-analytic models, to cosmological hydrodynamic simulations, and even observationally-derived galaxy merger catalogs.
@@ -28,7 +21,6 @@ This package provides a comprehensive framework for MBH binary population synthe
 ## Installation
 
 The `holodeck` framework is currently under substantial, active development.  Stable versions are now available with `pip install holodeck-gw` (see [holodeck on pypi](https://pypi.org/project/holodeck-gw)).  However, recent versions and many development tools will not generally be available with ``pip`` or ``conda`` install.
->>>>>>> dev
 
 `holodeck` requires ``python >= 3.9`` (with support for: ``3.9, 3.10, 3.11``).  The recommended installation is:
 
@@ -92,46 +84,12 @@ For some scripts (particularly for generating libraries), an MPI implementation
 
 ## Documentation
 
-<<<<<<< HEAD
-The primary sources of documentation for `holodeck` are this `README.md` file, the notebooks included in the `notebooks/` directory, and docstrings included in the source code directly.  [`readthedocs` documentation](https://readthedocs.org/projects/holodeck-gw) are being written and improved, and a methods paper is in preparation.
-
-## Contributing
-
-This project is being led by the [NANOGrav](http://nanograv.org/) Astrophysics Working Group.
-
-Details on contributions and the mandatory code of conduct can be found in the [CONTRIBUTING.md](./CONTRIBUTING.md) file.
-
-To-do items and changes to the API should be included in the [CHANGELOG.md](./CHANGELOG.md) file.
-
-Contributions are not only welcome but encouraged, anywhere from new modules/customizations to bug-fixes to improved documentation and usage examples.  The git workflow is based around a `main` branch which is intended to be (relatively) stable and operational, and an actively developed `dev` branch.  New development should be performed in "feature" branches (made off of the `dev` branch), and then incorporated via pull-request (back into the `dev` branch).
-
-### Testing:
-
-(Unit)tests should be developed in two ways: for basic functions/behaviors, standard unit-tests can be placed in the `holodeck/tests/` directory.  More complex functionality should be tested in notebooks (in `notebooks/`) where they can also be used as demonstrations/tutorials for that behavior.  The python script `scripts/convert_notebook_tests.py` converts target notebooks into python scripts in the `holodeck/tests/` directory, which can then be run by `pytest`.  The script `scripts/tester.sh` will run the conversion script and then run `pytest`.
-
-
-### Formatting:
-
-New code should generally abide by PEP8 formatting, with [`numpy` style docstrings](https://numpydoc.readthedocs.io/en/latest/format.html).  Exceptions are:
-
-   * lines may be broken at either 100 or 120 columns
-
-### Notebooks:
-
-Please strip all notebook outputs before commiting notebook changes.  The [`nbstripout`](https://github.com/kynan/nbstripout) package is an excellent option to automatically strip all notebook output only in git commits (i.e. it doesn't change your notebooks in-place).  You can also use `nbconvert` to strip output in place: `jupyter nbconvert --clear-output --inplace <NOTEBOOK-NAME>.ipynb`.
-
-To install this package for just this repository:
-
-   * (1) install:  `pip install --upgrade nbstripout`  or  `conda install -c conda-forge nbstripout`
-   * (2) enable: `nbstripout --install --attributes .gitattributes`   (run this in the top-level `holodeck/` directory)
-=======
 Full package documentation for `holodeck` is available on [readthedocs](https://holodeck-gw.readthedocs.io/en/main/).
 
 
 ## Contributing & Development
 
 Contributions are not only welcome but encouraged, anywhere from new modules/customizations to bug-fixes to improved documentation and usage examples.  Please see [Development & Contributions](https://holodeck-gw.readthedocs.io/en/main/development.html).
->>>>>>> dev
 
 ## Copyright
 

holodeck/discrete/evolution.py

@@ -984,15 +984,14 @@ def _hardening_rate(self, step, store_debug=True):
                 # Raise error on invalid entries
                 bads = ~np.isfinite(_hard_dadt) | (_hard_dadt > 0.0)
                 if np.any(bads):
-                    print("hard = ", hard)
                     log.error(f"{step} hard={hard} : dadt = {utils.stats(_hard_dadt)}")
                     err = f"invalid `dadt` for hard={hard}  (bads: {utils.frac_str(bads)})!"
                     log.exception(err)
                     log.error(f"BAD dadt = {_hard_dadt[bads]}")
                     log.error(f"BAD sepa = {self.sepa[bads, step]}")
                     log.error(f"BAD mass = {self.sepa[bads, step]}")
                     raise ValueError(err)
-
+                
             if (self.eccen is not None):
                 if _ecc is None:
                     log.warning(f"`Evolution.eccen` is not None, but `dedt` is None!  {step} {hard}")

requirements.txt

@@ -10,16 +10,10 @@ pydoe
 psutil
 tqdm
 cython<3.0.0
-<<<<<<< HEAD
-schwimmbad
-emcee
-george
-=======
 # schwimmbad  # used in the `gps` submodule
 # emcee   # used in the `gps` submodule
 # george  # used in the `gps` submodule
 # sympy   # used in the detstats submodule
 # hasasia   # used in the detstats submodule
 # healpy   # used in the anisotropy submodule
->>>>>>> dev
 # mpi4py