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

153 subbeamnod routine cannot access plnum #181

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ac7a728
Merge pull request #138 from GreenBankObservatory/release-0.2.0
mpound Dec 1, 2023
b4a9166
new core file, veldef function and test
mpound Dec 1, 2023
1f3b836
rename because pytest doesn't like files with the same name
mpound Dec 1, 2023
e90d6fe
add core
mpound Dec 1, 2023
f931368
delete old names
mpound Dec 4, 2023
f4e44a4
Merge pull request #145 from GreenBankObservatory/veldef_function
mpound Dec 4, 2023
24ece76
Fix dependencies
tchamberlin Nov 29, 2023
a2340c2
Remove GUI; will move to separate repo
tchamberlin Nov 29, 2023
2a82549
Remove autoconf/make files
tchamberlin Nov 29, 2023
4c1e46c
Fixed usage of __all__
tchamberlin Nov 29, 2023
16214ff
Remove _dysh_init.py
tchamberlin Nov 29, 2023
3326d0a
Reorganize shell code
tchamberlin Nov 29, 2023
5793e0b
Remove myst-parser dep
tchamberlin Dec 5, 2023
cc8f942
Provide default value for plnum
tchamberlin Dec 5, 2023
ab608b3
Updates to GitHub Actions/Workflows (#151)
tchamberlin Dec 5, 2023
4e52824
Update issue templates (#154)
tchamberlin Dec 5, 2023
99e826c
Fix for getspec (#147)
astrofle Dec 6, 2023
9a7e9e4
Fix Sphinx warnings (#157)
vcatlett Dec 8, 2023
bff25f8
remove stickiness of plot attributes
mpound Dec 11, 2023
5dafd32
[pre-commit.ci] pre-commit autoupdate (#162)
pre-commit-ci[bot] Dec 11, 2023
577bdfd
Change autobuild instructions to hatch (#163)
vcatlett Dec 12, 2023
45ee469
Added README for test files
astrofle Dec 12, 2023
8d59ed4
Added test files for veldef: opti-hel, radi-obs
astrofle Dec 12, 2023
b16458a
Updated README
astrofle Dec 12, 2023
6d8e101
Added GBTIDL output spectra
astrofle Dec 12, 2023
28f0537
Removed unused files
astrofle Dec 12, 2023
442f90b
Updated intro paragraph to reflect that dysh will not replace GBTIDL
astrofle Dec 14, 2023
10df845
Added anchor to installation instructions
astrofle Dec 14, 2023
313bc71
Added note to inform the reader that dysh is under development
astrofle Dec 14, 2023
67b43ab
Added notes pointing out that the azimuth and elevation columns are a…
astrofle Dec 14, 2023
5c68353
Merge branch 'main' into specplot_issue_93
vcatlett Dec 14, 2023
758dd35
Updated note for summary
astrofle Dec 14, 2023
2adcab2
Merge pull request #167 from GreenBankObservatory/update-docs
astrofle Dec 14, 2023
e6290f1
Merge branch 'main' into specplot_issue_93
vcatlett Dec 14, 2023
cfb7f20
Merge pull request #164 from GreenBankObservatory/specplot_issue_93
vcatlett Dec 14, 2023
c920a15
[pre-commit.ci] pre-commit autoupdate (#168)
pre-commit-ci[bot] Dec 21, 2023
d607e14
Add test data for checking Doppler corrections
astrofle Dec 21, 2023
016e70f
Added output spectra in velocity
astrofle Dec 22, 2023
80be8b1
Added updated output fits file
astrofle Dec 22, 2023
99e3d4c
[pre-commit.ci] pre-commit autoupdate (#173)
pre-commit-ci[bot] Jan 3, 2024
106d6d2
Merge branch 'main' into add-testdata
astrofle Jan 3, 2024
c011c7a
Merge pull request #172 from GreenBankObservatory/add-testdata
astrofle Jan 3, 2024
8b2439d
Merge pull request #179 from GreenBankObservatory/main
mpound Jan 8, 2024
9660af3
fix issue #153
mpound Jan 8, 2024
97c3ffc
add a note about the receiver dependent behavior
mpound Jan 8, 2024
dd8bd00
Revert "update in order to work on bug"
mpound Jan 8, 2024
7187813
Merge pull request #180 from GreenBankObservatory/revert-179-main
mpound Jan 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/dysh/fits/gbtfitsload.py
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,7 @@ def subbeamnod(self, scan, bintable=None, **kwargs):
kwargs_opts = {
"ifnum": 0,
"fdnum": 0,
"plnum": 1,
"timeaverage": True,
"weights": "tsys", # or None or ndarray
"calibrate": True,
Expand All @@ -781,6 +782,7 @@ def subbeamnod(self, scan, bintable=None, **kwargs):
kwargs_opts.update(kwargs)
ifnum = kwargs_opts["ifnum"]
fdnum = kwargs_opts["fdnum"]
plnum = kwargs_opts["plnum"]
docal = kwargs_opts["calibrate"]
w = kwargs_opts["weights"]
method = kwargs_opts["method"]
Expand All @@ -792,7 +794,12 @@ def subbeamnod(self, scan, bintable=None, **kwargs):
if len(rx) > 1:
raise TypeError("More than one receiver for the selected scan.")
elif rx[0] == "Rcvr26_40": # and df["DATE-OBS"][-1] < xxxx
# Switch the polarizations to match the beams.
# Switch the polarizations to match the beams
# for this receiver only because it has had its feeds
# mislabelled since $DATE.
# For the rest of the receivers the method should use
# the same polarization for the selected feeds.
# See also issue #160
if fdnum == 0:
plnum = 1
elif fdnum == 1:
Expand Down
4 changes: 3 additions & 1 deletion src/dysh/spectra/tests/test_scan.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ def test_compare_with_GBTIDL(self, data_dir):
# Generate the dysh result.
# snodka-style. Need test for method='cycle'
sdf = gbtfitsload.GBTFITSLoad(sdf_file)
sbn = sdf.subbeamnod(43, sig=None, cal=None, ifnum=0, fdnum=1, calibrate=True, weights="tsys", method="scan")
sbn = sdf.subbeamnod(
43, sig=None, cal=None, ifnum=0, fdnum=1, plnum=0, calibrate=True, weights="tsys", method="scan"
)

# Load the GBTIDL result.
hdu = fits.open(gbtidl_file)
Expand Down