Skip to content

Commit 588bb61

Browse files
author
Marcel Strzys
committed
<fix> addressin some comments in the MR
- changed formatting - prevented crash in case the file format is not correct but does not trigger the OSError
1 parent e1cf033 commit 588bb61

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

src/pybkgmodel/data.py

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ class DL3EventFile(EventFile):
556556
Parameters
557557
----------
558558
file_name: str
559-
Name of the DL3 file to use.
559+
Name of the DL3 file to use.
560560
"""
561561
def __init__(self, file_name):
562562
super().__init__(file_name)
@@ -582,6 +582,8 @@ def is_compatible(cls, file_name):
582582

583583
ext = Path(file_name)
584584

585+
compatible = False
586+
585587
try:
586588
with fits.open(ext) as file:
587589
pass
@@ -672,43 +674,40 @@ def load_events(cls, file_name):
672674

673675
# TODO: current observatory location only La Palma, no mandatory header keyword
674676
obs_loc = EarthLocation(lat=28.761758*u.deg,
675-
lon=-17.890659*u.deg,
676-
height=2200*u.m)
677+
lon=-17.890659*u.deg,
678+
height=2200*u.m)
677679

678680
if evt_head['OBS_MODE'] in ('POINTING', 'WOBBLE'):
679681

680682
alt_az_frame = AltAz(obstime=evt_time,
681-
location=obs_loc)
683+
location=obs_loc)
682684

683685
coords = SkyCoord(evt_head['RA_PNT'] *u.deg,
684-
evt_head['DEC_PNT'] *u.deg,
685-
frame='icrs')
686+
evt_head['DEC_PNT'] *u.deg,
687+
frame='icrs')
686688

687689
altaz_pointing = coords.transform_to(alt_az_frame)
688690

689691
event_data['pointing_zd'] = 90 * u.deg - altaz_pointing.alt
690692
event_data['pointing_az'] = altaz_pointing.az.to(u.deg)
691693

692694

693-
event_data['pointing_ra'] = np.array(
694-
[evt_head['RA_PNT']] \
695-
* len(event_data['pointing_zd'])
696-
) * u.deg
697-
event_data['pointing_dec'] = np.array(
698-
[evt_head['DEC_PNT']] \
699-
* len(event_data['pointing_zd'])
700-
) * u.deg
695+
event_data['pointing_ra'] = np.array([evt_head['RA_PNT']]
696+
* len(event_data['pointing_zd'])) * u.deg
697+
event_data['pointing_dec'] = np.array([evt_head['DEC_PNT']]
698+
* len(event_data['pointing_zd'])) * u.deg
701699

702700
elif evt_head['OBS_MODE'] == 'DRIFT':
703701

704-
coords = SkyCoord(alt = evt_head['ALT_PNT'] *u.deg \
705-
* np.ones_like(event_data['mjd'].value),
706-
az = evt_head['AZ_PNT'] *u.deg \
707-
* np.ones_like(event_data['mjd'].value),
708-
obstime=astropy.time.Time(event_data['mjd'], format='mjd'),
709-
location=obs_loc,
710-
frame='altaz'
711-
)
702+
coords = SkyCoord(
703+
alt = evt_head['ALT_PNT'] *u.deg \
704+
* np.ones_like(event_data['mjd'].value),
705+
az = evt_head['AZ_PNT'] *u.deg \
706+
* np.ones_like(event_data['mjd'].value),
707+
obstime=astropy.time.Time(event_data['mjd'], format='mjd'),
708+
location=obs_loc,
709+
frame='altaz'
710+
)
712711

713712
radec_pointing = coords.transform_to('icrs')
714713

0 commit comments

Comments
 (0)