Skip to content
Snippets Groups Projects
Commit aea30006 authored by Mattia Mancini's avatar Mattia Mancini
Browse files

SSB-42: fixing reading function

parent 97d0fbb9
No related branches found
No related tags found
1 merge request!44Merge back holography to master
...@@ -66,7 +66,10 @@ class HolographyDataset(): ...@@ -66,7 +66,10 @@ class HolographyDataset():
if isinstance(dict1[key], dict) and isinstance(dict2[key], dict): if isinstance(dict1[key], dict) and isinstance(dict2[key], dict):
result = result and HolographyDataset.compare_dicts(dict1[key], dict2[key]) result = result and HolographyDataset.compare_dicts(dict1[key], dict2[key])
else: else:
return dict1[key] == dict2[key] if isinstance(dict1[key], numpy.ndarray) and isinstance(dict2[key], numpy.ndarray):
return numpy.array_equal(dict1[key], dict2[key])
else:
return dict1[key] == dict2[key]
else: else:
print(key, dict1.keys(), dict2.keys()) print(key, dict1.keys(), dict2.keys())
return False return False
...@@ -335,9 +338,11 @@ class HolographyDataset(): ...@@ -335,9 +338,11 @@ class HolographyDataset():
result.ra_dec = dict() result.ra_dec = dict()
for frequency in f["RA_DEC"].keys(): for frequency in f["RA_DEC"].keys():
for beamlet in f["RA_DEC"][frequency].keys(): for beamlet in f["RA_DEC"][frequency].keys():
if frequency not in result.data:
if frequency not in result.ra_dec:
result.ra_dec[frequency] = dict() result.ra_dec[frequency] = dict()
result.ra_dec[frequency][beamlet] = f["RA_DEC"][frequency][beamlet]
result.ra_dec[frequency][beamlet] = numpy.array(f["RA_DEC"][frequency][beamlet])
beamlets = set() beamlets = set()
result.data = dict() result.data = dict()
...@@ -349,7 +354,7 @@ class HolographyDataset(): ...@@ -349,7 +354,7 @@ class HolographyDataset():
result.data[reference_station] = dict() result.data[reference_station] = dict()
if frequency not in result.data[reference_station]: if frequency not in result.data[reference_station]:
result.data[reference_station][frequency] = dict() result.data[reference_station][frequency] = dict()
result.data[reference_station][frequency][beamlet] = f["CROSSCORRELATION"][reference_station][frequency][beamlet] result.data[reference_station][frequency][beamlet] = numpy.array(f["CROSSCORRELATION"][reference_station][frequency][beamlet])
result.beamlets = list(beamlets) result.beamlets = list(beamlets)
except Exception as e: except Exception as e:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment