SSB-42: implemented ra_dec to l_m conversion

CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py

-from .holography_specification import HolographySpecification
-from .holography_dataset_definitions import *
-
-from lofar.calibration.common.datacontainers.holography_observation import HolographyObservation
 import logging
-import numpy
+
 import h5py
 
+from lofar.calibration.common.datacontainers.holography_observation import HolographyObservation
+from .holography_dataset_definitions import *
+from .holography_specification import HolographySpecification
+
 logger = logging.getLogger(__name__)
 
+
 class HolographyDataset():
     def __init__(self):
         '''
@@ -79,7 +80,8 @@ class HolographyDataset():
                 if isinstance(dict1[key], dict) and isinstance(dict2[key], dict):
                     result = result and HolographyDataset.compare_dicts(dict1[key], dict2[key])
                 else:
-                    if isinstance(dict1[key], numpy.ndarray) and isinstance(dict2[key], numpy.ndarray):
+                    if isinstance(dict1[key], numpy.ndarray) and isinstance(dict2[key],
+                                                                            numpy.ndarray):
                         # Compares element by element the two arrays
                         return numpy.array_equal(dict1[key], dict2[key])
                     else:
@@ -107,10 +109,13 @@ class HolographyDataset():
                 other_value = getattr(hds, attribute_name)
                 this_equality = True
                 try:
-                    if isinstance(attribute_value, numpy.ndarray) is True and isinstance(other_value, numpy.ndarray) is True:
+                    if isinstance(attribute_value, numpy.ndarray) is True and isinstance(
+                            other_value, numpy.ndarray) is True:
                         this_equality = numpy.array_equal(attribute_value, other_value)
-                    elif isinstance(attribute_value, dict) is True and isinstance(other_value, dict) is True:
-                        this_equality = HolographyDataset.compare_dicts(attribute_value, other_value)
+                    elif isinstance(attribute_value, dict) is True and isinstance(other_value,
+                                                                                  dict) is True:
+                        this_equality = HolographyDataset.compare_dicts(attribute_value,
+                                                                        other_value)
                     elif attribute_value != other_value:
                         this_equality = False
                 except Exception as e:
@@ -141,7 +146,6 @@ class HolographyDataset():
         self.__collect_preliminary_information(station_name, list_of_hbs_ms_tuples)
         self.__read_data(station_name, list_of_hbs_ms_tuples)
 
-
     def __read_data(self, station_name, list_of_hbs_ms_tuples):
         """
 
@@ -159,9 +163,12 @@ class HolographyDataset():
                 for beamlet in self.beamlets:
                     beamlet_string = str(beamlet)
                     reference_station_names, cross_correlation = \
-                        ho.ms_for_a_given_beamlet_number[beamlet].\
-                        read_cross_correlation_time_flags_per_station_names(station_name,
-                                                                 self.reference_stations)
+                        ho.ms_for_a_given_beamlet_number[
+                            beamlet].read_cross_correlation_time_flags_lm_per_station_name(
+                            station_name,
+                            self.reference_stations,
+                            self.ra_dec[frequency_string][beamlet_string],
+                            self.rotation_matrix)
 
                     for reference_station_index, reference_station in \
                             enumerate(reference_station_names):
@@ -175,7 +182,6 @@ class HolographyDataset():
                         self.data[reference_station][frequency_string][beamlet_string] = \
                             cross_correlation[reference_station_index, :]
 
-
     def __collect_preliminary_information(self, station_name, list_of_hbs_ho_tuples):
         """
         This routines reads both the holography beam specifications files and the holography
@@ -266,7 +272,6 @@ class HolographyDataset():
                     virtual_pointing[(frequency, beamlet)],
                     dtype=coordinate_type)
 
-
         # reads the target station position and the coordinate of its axes
         # and does this only once since the coordinate will not change
         first_holography_observation = list_of_hbs_ho_tuples[0][1]
@@ -374,11 +379,14 @@ class HolographyDataset():
                             result.data[reference_station] = dict()
                         if frequency not in result.data[reference_station]:
                             result.data[reference_station][frequency] = dict()
-                        result.data[reference_station][frequency][beamlet] = numpy.array(f["CROSSCORRELATION"][reference_station][frequency][beamlet])
+                        result.data[reference_station][frequency][beamlet] = numpy.array(
+                            f["CROSSCORRELATION"][reference_station][frequency][beamlet])
 
             result.beamlets = list(beamlets)
         except Exception as e:
-            logger.exception("Cannot read the Holography Data Set data from the HDF5 file \"%s\".  This is the exception that was thrown:  %s", path, e)
+            logger.exception(
+                "Cannot read the Holography Data Set data from the HDF5 file \"%s\".  This is the exception that was thrown:  %s",
+                path, e)
             raise e
         finally:
             if f is not None:
@@ -446,10 +454,12 @@ class HolographyDataset():
                 for frequency in self.data[reference_station].keys():
                     f["CROSSCORRELATION"][reference_station].create_group(frequency)
                     for beamlet in self.data[reference_station][frequency].keys():
-                        
-                        f["CROSSCORRELATION"][reference_station][frequency][beamlet] = self.data[reference_station][frequency][beamlet]
+                        f["CROSSCORRELATION"][reference_station][frequency][beamlet] = \
+                            self.data[reference_station][frequency][beamlet]
         except Exception as e:
-            logger.exception("Cannot write the Holography Data Set data to the HDF5 file \"%s\".  This is the exception that was thrown:  %s", path, e)
+            logger.exception(
+                "Cannot write the Holography Data Set data to the HDF5 file \"%s\".  This is the exception that was thrown:  %s",
+                path, e)
             raise e
         finally:
             if f is not None: