From 0b51fc948e27200a21af1aa4c9cc14d20c74406e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Fri, 28 Sep 2018 14:05:33 +0000
Subject: [PATCH] Task SSB-42:  Adjusted the HDS definition after we iterated
 the code several times

---
 .../doc/Holography_Data_Set.md                | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/CAL/CalibrationCommon/doc/Holography_Data_Set.md b/CAL/CalibrationCommon/doc/Holography_Data_Set.md
index ff119b71c1e..bb1fc898fa8 100644
--- a/CAL/CalibrationCommon/doc/Holography_Data_Set.md
+++ b/CAL/CalibrationCommon/doc/Holography_Data_Set.md
@@ -94,29 +94,42 @@ The way how data is accessed may look awkward and that is in fact true.  But at
 
 ## Layout of the HDS in HDF5 files
 ```
-/root
+# Root
+/
+    # Attributes
     /ATTRS
-        /Version (double), holography file format version
-        /RCU list (vararray[int]), entries are RCU#s used in all observations
-        /mode (int), RCU mode used during all observations
-        /SAS id (vararray[string]), contains all SAS ids of all observations
-        /Target station name (string), name of the target station
-        /Target station position (double[3]), position of the centre of the station in cartesian coordinates
-        /Source name (string), name of the observed source in the sky
-        /Source position (double[2]), RA, DEC of the source in the sky
-        /Observation time (double[2]), Start and end time stamps of the entire holography observation
-        /Rotation matrix (2-d array, double[3][3]), translation matrix for (RA, DEC) <-> (l, m) conversion
         /Antenna field position (1-d array, double[3]), cartesian coordinates of the centres of each antenna field
-        /Specified reference station (1-d array, string), entries are reference station names
-        /Specified frequency (1-d array, double), entries are the frequencies of all observations that were specified
-        /Specified RA DEC (2-d array, compound[double, double]), indices are frequency index, beamlet#
-
-    /Reference station (1-d array, string), entries are reference station names
-    /frequency (1-d array, double), entries are the frequencies of all observations
-    /RA DEC (2-d array, compound[double, double]), indices are frequency index, beamlet#
-    /data (3-d array, vararray[compound[compound[4][double, double], double[3], boolean]], indices are Reference station index, frequency index, beamlet#;
+        /HDS_version (double), holography file format version
+        /Mode (int), RCU mode used during all observations
+        /Observation_time (double[2]), Start and end time stamps of the entire holography observation
+        /RCU_list (vararray[int]), entries are RCU#s used in all observations
+        /Rotation_matrix (2-d array, double[3][3]), translation matrix for (RA, DEC) <-> (l, m) conversion
+        /SAS_ids (vararray[string]), contains all SAS ids of all observations
+        /Source_name (string), name of the observed source in the sky
+        /Source_position (compound(double, double, string), RA, DEC and Epoch of the source in the sky
+        /Target_station_name (string), name of the target station
+        /Target_station_position (double[3]), position of the centre of the station in cartesian coordinates
+
+        /Specified_reference_station (1-d array, string), entries are reference station names
+        /Specified_frequency (1-d array, double), entries are the frequencies of all observations that were specified
+        /Specified_RA_DEC (2-d array, compound[double, double, string[10]]), indices are frequency index, beamlet#
+
+    # Groups
+    /Reference_station (1-d array, string[8]), entries are reference station names
+    /Frequency (1-d array, double), entries are the frequencies of all observations
+    /RA_DEC
+        /[One entry for each of the frequencies]  The int(frequency) is the index.
+             /[One entry for each of the beamlets]  The beamlet number is the index.
+                /(1-d array, compound[double, double, string[10]]), entries contain a struct of {RA, DEC, Epoch}
+
+    /CROSSCORRELATION
+        /[One entry for each of the reference stations]  The name of the reference station is the index.
+            /[One entry for each of the frequencies]  The int(frequency in Hz) is the index.
+                /[One entry for each of the beamlets]  The beamlet number is the index.
+                    /data (1-d array, vararray[compound[compound[4][double, double], double[3], boolean]], entries contain a struct of {XX, XY, YX, YY, l, m, t, flag}. 
 ```
 
+
 ## Example data for tests
 Test data for two frequencies can be found on LOFAR's CEP3 in the directories
 /data014/scratch/veen/holography/20180718/obs3/L661022 and
-- 
GitLab