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

Gbo #15

Merged
merged 7 commits into from
Apr 28, 2021
Merged

Gbo #15

merged 7 commits into from
Apr 28, 2021

Conversation

leungcalvin
Copy link

@leungcalvin leungcalvin commented Mar 12, 2021

Refactored ephemeris, added best known CHIME phase center position, and included some modifications for GBO/TONE outrigger. Currently the TONEAntenna objects are hard coded. The fix is entangled with the long term solution to chimedb_config and get_correlator_inputs, but if we're hard coding the array coordinates I see no problem with hard coding the small number of manageable TONEAntennas while we figure out that problem.

@leungcalvin leungcalvin requested a review from jrs65 March 12, 2021 01:34
Copy link
Contributor

@jrs65 jrs65 left a comment

Choose a reason for hiding this comment

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

Hi @leungcalvin

This is looking good, and I don't think it needs a huge amount more work before it's ready to merge. Here are some initial comments:

  • Please rebase this into a set of logical commits with messages following our dev guidelines (https://github.com/chime-experiment/Pipeline/blob/master/CONTRIBUTING.md#rules). I'll leave you to figure out exactly what to do, but you need at least these changes in separate commits: changing the default location for CHIME; adding support for changing the observatory to the delay/fringestop routines; and adding support for TONE.
  • I'm a bit averse to having a dump of all the antennas in directly, just because it dumps in a lot of redundant info. Can you wrap it up into something which programmatically generates them?
  • There's a lot of commented out lines (e.g. old params, print statements, etc). Please tidy those up.
  • Please fix up the merge conflicts, I think the CI won't run until you have.

ch_util/tools.py Outdated Show resolved Hide resolved
@leungcalvin
Copy link
Author

Hi @leungcalvin

This is looking good, and I don't think it needs a huge amount more work before it's ready to merge. Here are some initial comments:

  • Please rebase this into a set of logical commits with messages following our dev guidelines (https://github.com/chime-experiment/Pipeline/blob/master/CONTRIBUTING.md#rules). I'll leave you to figure out exactly what to do, but you need at least these changes in separate commits: changing the default location for CHIME; adding support for changing the observatory to the delay/fringestop routines; and adding support for TONE.
  • I'm a bit averse to having a dump of all the antennas in directly, just because it dumps in a lot of redundant info. Can you wrap it up into something which programmatically generates them?
  • There's a lot of commented out lines (e.g. old params, print statements, etc). Please tidy those up.
  • Please fix up the merge conflicts, I think the CI won't run until you have.

Hi Richard,

I've addressed these comments in a series of logically-chunked commits.

Copy link
Contributor

@jrs65 jrs65 left a comment

Choose a reason for hiding this comment

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

Hi Calvin, there's two minor changes suggested, and then I think we're done.

ch_util/ephemeris.py Show resolved Hide resolved
ch_util/tools.py Outdated
Comment on lines 2227 to 2239
# print("ha", ha)

latitude = np.radians(ephemeris.CHIMELATITUDE)
latitude = np.radians(obs.latitude)

# Get feed positions / c
feedpos = get_feed_positions(feeds, get_zpos=wterm) / scipy.constants.c
feed_delays = np.array([f.delay for f in feeds])
# print("feed_delays", feed_delays)
# print("feed_pos", *feedpos.T[..., np.newaxis])

# Calculate the geometric delay between the feed and the reference position
delay_ref = -projected_distance(ha, latitude, src_dec, *feedpos.T[..., np.newaxis])
# print("delay_ref", delay_ref)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove all of these commented out print lines.

@jrs65
Copy link
Contributor

jrs65 commented Apr 26, 2021

Oh also @leungcalvin when you're done, please rebase this such that only the actual relevant commits are left. I think that should be the three feat(...) ones and the test one.

@jrs65 jrs65 self-requested a review April 26, 2021 21:09
jrs65
jrs65 previously approved these changes Apr 26, 2021
@jrs65 jrs65 self-requested a review April 28, 2021 17:56
@jrs65 jrs65 merged commit 2b46683 into master Apr 28, 2021
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