Skip to content

Commit e573f91

Browse files
committed
Added catch for MuSCAT observation groups which do not have explicit filter parameters since these are fixed
1 parent 0d39db3 commit e573f91

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ db.sqlite3
22
*.pyc
33
__pycache__/
44
env/
5+
mop_venv/
56

67
#pycharm and emacs
78
.idea

mop/toolbox/obs_control.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ def extract_obs_request_info(result):
110110
elif 'EXPOSE' in config['type']:
111111
if 'instrument_configs' in config.keys():
112112
for inst_conf in config['instrument_configs']:
113-
obs_info['filters'].append(inst_conf['optical_elements']['filter'])
113+
if 'MUSCAT' not in obs_info['instrument_type']:
114+
obs_info['filters'].append(inst_conf['optical_elements']['filter'])
115+
else:
116+
obs_info['filters'].append('griz')
114117
obs_info['exposure_times'].append(inst_conf['exposure_time'])
115118
obs_info['exposure_counts'].append(inst_conf['exposure_count'])
116119

mop/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ def get_context_data(self, *args, **kwargs):
172172

173173
# Retrieve a list of pending observations from the LCO Portal
174174
response = fetch_all_lco_requestgroups()
175+
175176
pending_obs = parse_lco_requestgroups(response, short_form=False, pending_only=False)
176177

177178
pending_obs_list = {}

0 commit comments

Comments
 (0)