Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mchirp_area codes #2951

Merged
merged 31 commits into from
Oct 8, 2019
Merged

Add mchirp_area codes #2951

merged 31 commits into from
Oct 8, 2019

Conversation

veronica-villa
Copy link
Contributor

No description provided.

@tdent
Copy link
Contributor

tdent commented Oct 1, 2019

Can you try and fix the Travis issue by editing the docstring at the beginning of the file?

@veronica-villa
Copy link
Contributor Author

@tdent Sorry I thought I had already done it. I think it is fixed now.

@tdent
Copy link
Contributor

tdent commented Oct 3, 2019

Actually I think the codeclimate complaints about 'constant name not in upper case' are due to it thinking that the plotting codes which have .py file names are modules rather than scripts.

If we want these to go away we would have to change the file names to not have .py at the end. However this is tricky or impossible to do that in the middle of a pull request via the web browser as far as I can see so we should possibly postpone that.

pycbc/mchirp_area.py Outdated Show resolved Hide resolved
Copy link
Contributor

@tdent tdent left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the one equation spacing/formatting issue I comments on I think this is OK to commit as an initial step. Then we should change the script names to not end with .py and also start to split up the area calculation into separate pieces to make it shorter and more modular.

@veronica-villa
Copy link
Contributor Author

@tdent Equation spacing issue is now fixed, as well as the renaming of the scripts.

pycbc/mchirp_area.py Outdated Show resolved Hide resolved
@veronica-villa
Copy link
Contributor Author

veronica-villa commented Oct 4, 2019

@tdent Travis is failing due to the renaming of the scripts.. I don't know if it has a cache I can remove or something similar...

[Fri Oct  4 11:13:14 UTC 2019] running /home/travis/virtualenv/python2.7.15/bin/pycbc_mchirp_plots --help
    FAILED!

@tdent
Copy link
Contributor

tdent commented Oct 4, 2019

What happens when you run the help command, i.e. pycbc_mchirp_plots --help ?

@tdent
Copy link
Contributor

tdent commented Oct 4, 2019

See the second answer here : https://stackoverflow.com/questions/19425857/env-python-r-no-such-file-or-directory
Looks like your text editor has not been doing the desired thing with linebreaks.

@veronica-villa
Copy link
Contributor Author

@tdent ok thanks, I will try to fix it!

@tdent
Copy link
Contributor

tdent commented Oct 4, 2019

Ah, mass_area_plot now has a different Travis error :

Traceback (most recent call last):
  File "/home/travis/virtualenv/python2.7.15/bin/pycbc_mass_area_plot", line 12, in <module>
    from mchirp_area import calc_areas
ImportError: No module named mchirp_area
---------------------------------------------------------

@veronica-villa
Copy link
Contributor Author

@tdent I think all Travis issues are fixed now!

@tdent
Copy link
Contributor

tdent commented Oct 7, 2019

OK to merge, we will look at rebasing, splitting up functions etc. later.

@tdent tdent merged commit 4b3ff28 into gwastro:master Oct 8, 2019
lenona pushed a commit to lenona/pycbc that referenced this pull request Sep 14, 2020
* Add mchirp_area codes

* Update mchirp_plots.py

* Update mass_area_plot.py

* Update mchirp_plots.py

* Update mass_area_plot.py

* Update mchirp_area.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mchirp_plots.py

* Update mchirp_plots.py

* Update mchirp_area.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mchirp_area.py

* Add docstring

* Add docstrings and aliasing some modules

* Solving codeclimate issues

* Solving codeclimate issue

* Rename mass_area_plot.py to mass_area_plot

* Rename mass_area_plot to pycbc_mass_area_plot 

Also aliased some modules

* Rename mchirp_plots.py as pycbc_mchirp_plots

* Change equations spacing

* Edit docstrings

* Fixing Travis issues

* Delete pycbc_mass_area_plot

* Add pycbc_mass_area_plot

* Change some imports

* Delete pycbc_mchirp_plots

* Add pycbc_mchirp_plots
OliverEdy pushed a commit to OliverEdy/pycbc that referenced this pull request Apr 3, 2023
* Add mchirp_area codes

* Update mchirp_plots.py

* Update mass_area_plot.py

* Update mchirp_plots.py

* Update mass_area_plot.py

* Update mchirp_area.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mchirp_plots.py

* Update mchirp_plots.py

* Update mchirp_area.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mass_area_plot.py

* Update mchirp_area.py

* Add docstring

* Add docstrings and aliasing some modules

* Solving codeclimate issues

* Solving codeclimate issue

* Rename mass_area_plot.py to mass_area_plot

* Rename mass_area_plot to pycbc_mass_area_plot 

Also aliased some modules

* Rename mchirp_plots.py as pycbc_mchirp_plots

* Change equations spacing

* Edit docstrings

* Fixing Travis issues

* Delete pycbc_mass_area_plot

* Add pycbc_mass_area_plot

* Change some imports

* Delete pycbc_mchirp_plots

* Add pycbc_mchirp_plots
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants