Merge e9c7112 into d4ce933

RadioAstronomySoftwareGroup · Apr 19, 2018 · 9977cfb · 9977cfb
2 parents d4ce933 + e9c7112
commit 9977cfb
Show file tree

Hide file tree

Showing 91 changed files with 68 additions and 2 deletions.
diff --git a/pyuvdata/data/1102865728_small.ms/ANTENNA/table.dat b/pyuvdata/data/1102865728_small.ms/ANTENNA/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/ANTENNA/table.f0 b/pyuvdata/data/1102865728_small.ms/ANTENNA/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/ANTENNA/table.f0i b/pyuvdata/data/1102865728_small.ms/ANTENNA/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/ANTENNA/table.info b/pyuvdata/data/1102865728_small.ms/ANTENNA/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/ANTENNA/table.lock b/pyuvdata/data/1102865728_small.ms/ANTENNA/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.dat b/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.f0 b/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.info b/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.lock b/pyuvdata/data/1102865728_small.ms/DATA_DESCRIPTION/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/FEED/table.dat b/pyuvdata/data/1102865728_small.ms/FEED/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/FEED/table.f0 b/pyuvdata/data/1102865728_small.ms/FEED/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/FEED/table.f0i b/pyuvdata/data/1102865728_small.ms/FEED/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/FEED/table.info b/pyuvdata/data/1102865728_small.ms/FEED/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/FEED/table.lock b/pyuvdata/data/1102865728_small.ms/FEED/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/FIELD/table.dat b/pyuvdata/data/1102865728_small.ms/FIELD/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/FIELD/table.f0 b/pyuvdata/data/1102865728_small.ms/FIELD/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/FIELD/table.f0i b/pyuvdata/data/1102865728_small.ms/FIELD/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/FIELD/table.info b/pyuvdata/data/1102865728_small.ms/FIELD/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/FIELD/table.lock b/pyuvdata/data/1102865728_small.ms/FIELD/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.dat b/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.f0 b/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.info b/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.lock b/pyuvdata/data/1102865728_small.ms/FLAG_CMD/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/HISTORY/table.dat b/pyuvdata/data/1102865728_small.ms/HISTORY/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/HISTORY/table.f0 b/pyuvdata/data/1102865728_small.ms/HISTORY/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/HISTORY/table.info b/pyuvdata/data/1102865728_small.ms/HISTORY/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/HISTORY/table.lock b/pyuvdata/data/1102865728_small.ms/HISTORY/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.dat b/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.f0 b/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.info b/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.lock b/pyuvdata/data/1102865728_small.ms/MWA_SUBBAND/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.dat b/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.f0 b/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.f0i b/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.info b/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.lock b/pyuvdata/data/1102865728_small.ms/MWA_TILE_POINTING/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.dat b/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.f0 b/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.info b/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.lock b/pyuvdata/data/1102865728_small.ms/OBSERVATION/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/POINTING/table.dat b/pyuvdata/data/1102865728_small.ms/POINTING/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/POINTING/table.f0 b/pyuvdata/data/1102865728_small.ms/POINTING/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/POINTING/table.f0i b/pyuvdata/data/1102865728_small.ms/POINTING/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/POINTING/table.f1 b/pyuvdata/data/1102865728_small.ms/POINTING/table.f1
diff --git a/pyuvdata/data/1102865728_small.ms/POINTING/table.info b/pyuvdata/data/1102865728_small.ms/POINTING/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/POINTING/table.lock b/pyuvdata/data/1102865728_small.ms/POINTING/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.dat b/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.f0 b/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.f0i b/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.info b/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.lock b/pyuvdata/data/1102865728_small.ms/POLARIZATION/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.dat b/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.f0 b/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.info b/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.lock b/pyuvdata/data/1102865728_small.ms/PROCESSOR/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.dat b/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.f0 b/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.info b/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.lock b/pyuvdata/data/1102865728_small.ms/QUALITY_BASELINE_STATISTIC/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.dat b/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.f0 b/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.info b/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.lock b/pyuvdata/data/1102865728_small.ms/QUALITY_FREQUENCY_STATISTIC/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.dat b/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.f0 b/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.info b/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.lock b/pyuvdata/data/1102865728_small.ms/QUALITY_KIND_NAME/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.dat b/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.f0 b/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.info b/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.lock b/pyuvdata/data/1102865728_small.ms/QUALITY_TIME_STATISTIC/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/SOURCE/table.dat b/pyuvdata/data/1102865728_small.ms/SOURCE/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/SOURCE/table.f0 b/pyuvdata/data/1102865728_small.ms/SOURCE/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/SOURCE/table.f0i b/pyuvdata/data/1102865728_small.ms/SOURCE/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/SOURCE/table.info b/pyuvdata/data/1102865728_small.ms/SOURCE/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/SOURCE/table.lock b/pyuvdata/data/1102865728_small.ms/SOURCE/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.dat b/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.f0 b/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.f0i b/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.info b/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.lock b/pyuvdata/data/1102865728_small.ms/SPECTRAL_WINDOW/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/STATE/table.dat b/pyuvdata/data/1102865728_small.ms/STATE/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/STATE/table.f0 b/pyuvdata/data/1102865728_small.ms/STATE/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/STATE/table.info b/pyuvdata/data/1102865728_small.ms/STATE/table.info
@@ -0,0 +1,3 @@
+Type = 
+SubType = 
+
diff --git a/pyuvdata/data/1102865728_small.ms/STATE/table.lock b/pyuvdata/data/1102865728_small.ms/STATE/table.lock
diff --git a/pyuvdata/data/1102865728_small.ms/table.dat b/pyuvdata/data/1102865728_small.ms/table.dat
diff --git a/pyuvdata/data/1102865728_small.ms/table.f0 b/pyuvdata/data/1102865728_small.ms/table.f0
diff --git a/pyuvdata/data/1102865728_small.ms/table.f0i b/pyuvdata/data/1102865728_small.ms/table.f0i
diff --git a/pyuvdata/data/1102865728_small.ms/table.info b/pyuvdata/data/1102865728_small.ms/table.info
@@ -0,0 +1,4 @@
+Type = Measurement Set
+SubType = 
+
+This is a MeasurementSet Table holding measurements from a Telescope
diff --git a/pyuvdata/data/1102865728_small.ms/table.lock b/pyuvdata/data/1102865728_small.ms/table.lock
diff --git a/pyuvdata/ms.py b/pyuvdata/ms.py
@@ -242,8 +242,13 @@ def read_ms(self, filepath, run_check=True, check_extra=True,
         elif(tbField.getcol('PHASE_DIR').shape[1] == 1):
             self.phase_type = 'phased'
             # MSv2.0 appears to assume J2000. Not sure how to specifiy otherwise
-            self.phase_center_epoch = float(
-                tb.getcolkeyword('UVW', 'MEASINFO')['Ref'][1:])
+            epoch_string = tb.getcolkeyword('UVW', 'MEASINFO')['Ref']
+            # for measurement sets made with COTTER, this keyword is ITRF instead of the epoch
+            if epoch_string == 'ITRF':
+                self.phase_center_epoch = 2000.
+            else:
+                self.phase_center_epoch = float(
+                    tb.getcolkeyword('UVW', 'MEASINFO')['Ref'][1:])
             self.phase_center_ra = float(tbField.getcol('PHASE_DIR')[0][0][0])
             self.phase_center_dec = float(tbField.getcol('PHASE_DIR')[0][0][1])
             self.set_phased()