Task #2095: reverting accidental checkin

MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql

@@ -203,5 +203,4 @@ INSERT INTO station VALUES ('DE605', 'Juelich');
 INSERT INTO station VALUES ('FR606', 'Nancy');
 INSERT INTO station VALUES ('SE607', 'Onsala');
 INSERT INTO station VALUES ('UK608', 'Chillbolton');
-INSERT INTO station VALUES ('FI609', 'Kaira');
 

MAC/Deployment/data/Coordinates/data/normal_vectors.dat

 #
 # station, type, normal-vector(3x float)
 #
-cs301, lba , 0.598753, 0.072099, 0.797682
-cs301, hba0, 0.598753, 0.072099, 0.797682
-cs301, hba1, 0.598753, 0.072099, 0.797682
-cs024, lba , 0.598753, 0.072099, 0.797682
-cs024, hba0, 0.598753, 0.072099, 0.797682
-cs024, hba1, 0.598753, 0.072099, 0.797682
+cs021, lba , 0.598753, 0.072099, 0.797682
+cs021, hba0, 0.598753, 0.072099, 0.797682
+cs021, hba1, 0.598753, 0.072099, 0.797682
 cs007, lba , 0.598753, 0.072099, 0.797682
 cs007, hba0, 0.598753, 0.072099, 0.797682
 cs007, hba1, 0.598753, 0.072099, 0.797682
-rs406, lba , 0.591206, 0.077240, 0.802814
-rs406, hba , 0.591206, 0.077240, 0.802814
-rs205, lba , 0.598753, 0.072099, 0.797682
-rs205, hba , 0.598753, 0.072099, 0.797682
-cs201, lba , 0.598753, 0.072099, 0.797682
-cs201, hba0, 0.598753, 0.072099, 0.797682
-cs201, hba1, 0.598753, 0.072099, 0.797682
+cs026, lba , 0.598753, 0.072099, 0.797682
+cs026, hba0, 0.598753, 0.072099, 0.797682
+cs026, hba1, 0.598753, 0.072099, 0.797682
 de604, lba , 0.601156, 0.153890, 0.784175
 de604, hba , 0.601146, 0.153897, 0.784181
-cs004, lba , 0.598753, 0.072099, 0.797682
-cs004, hba0, 0.598753, 0.072099, 0.797682
-cs004, hba1, 0.598753, 0.072099, 0.797682
-cs021, lba , 0.598753, 0.072099, 0.797682
-cs021, hba0, 0.598753, 0.072099, 0.797682
-cs021, hba1, 0.598753, 0.072099, 0.797682
-cs028, lba , 0.598753, 0.072099, 0.797682
-cs028, hba0, 0.598753, 0.072099, 0.797682
-cs028, hba1, 0.598753, 0.072099, 0.797682
+cs017, lba , 0.598753, 0.072099, 0.797682
+cs017, hba0, 0.598753, 0.072099, 0.797682
+cs017, hba1, 0.598753, 0.072099, 0.797682
+rs509, lba , 0.598753, 0.072099, 0.797682
+rs509, hba , 0.598753, 0.072099, 0.797682
+cs006, lba , 0.598753, 0.072099, 0.797682
+cs006, hba0, 0.598753, 0.072099, 0.797682
+cs006, hba1, 0.598753, 0.072099, 0.797682
+cs103, lba , 0.598753, 0.072099, 0.797682
+cs103, hba0, 0.598753, 0.072099, 0.797682
+cs103, hba1, 0.598753, 0.072099, 0.797682
+cs101, lba , 0.598753, 0.072099, 0.797682
+cs101, hba0, 0.598753, 0.072099, 0.797682
+cs101, hba1, 0.598753, 0.072099, 0.797682
+rs508, lba , 0.593792, 0.070643, 0.801512
+rs508, hba , 0.593792, 0.070643, 0.801512
 cs002, lba , 0.598753, 0.072099, 0.797682
 cs002, hba0, 0.598753, 0.072099, 0.797682
 cs002, hba1, 0.598753, 0.072099, 0.797682
+cs013, lba , 0.598753, 0.072099, 0.797682
+cs013, hba0, 0.598753, 0.072099, 0.797682
+cs013, hba1, 0.598753, 0.072099, 0.797682
+rs205, lba , 0.598753, 0.072099, 0.797682
+rs205, hba , 0.598753, 0.072099, 0.797682
 cs003, lba , 0.598753, 0.072099, 0.797682
 cs003, hba0, 0.598753, 0.072099, 0.797682
 cs003, hba1, 0.598753, 0.072099, 0.797682
+rs307, lba , 0.598753, 0.072099, 0.797682
+rs307, hba , 0.598753, 0.072099, 0.797682
+cs024, lba , 0.598753, 0.072099, 0.797682
+cs024, hba0, 0.598753, 0.072099, 0.797682
+cs024, hba1, 0.598753, 0.072099, 0.797682
+rs406, lba , 0.591206, 0.077240, 0.802814
+rs406, hba , 0.591206, 0.077240, 0.802814
+cs401, lba , 0.598753, 0.072099, 0.797682
+cs401, hba0, 0.598753, 0.072099, 0.797682
+cs401, hba1, 0.598753, 0.072099, 0.797682
+rs503, lba , 0.598753, 0.072099, 0.797682
+rs503, hba , 0.598753, 0.072099, 0.797682
+cs001, lba , 0.598753, 0.072099, 0.797682
+cs001, hba0, 0.598753, 0.072099, 0.797682
+cs001, hba1, 0.598753, 0.072099, 0.797682
+cs301, lba , 0.598753, 0.072099, 0.797682
+cs301, hba0, 0.598753, 0.072099, 0.797682
+cs301, hba1, 0.598753, 0.072099, 0.797682
+cs201, lba , 0.598753, 0.072099, 0.797682
+cs201, hba0, 0.598753, 0.072099, 0.797682
+cs201, hba1, 0.598753, 0.072099, 0.797682
+cs028, lba , 0.598753, 0.072099, 0.797682
+cs028, hba0, 0.598753, 0.072099, 0.797682
+cs028, hba1, 0.598753, 0.072099, 0.797682
+uk608, lba , 0.626845, -0.014960, 0.779000
+uk608, hba , 0.627506, -0.014332, 0.778480
+cs030, lba , 0.598753, 0.072099, 0.797682
+cs030, hba0, 0.598753, 0.072099, 0.797682
+cs030, hba1, 0.598753, 0.072099, 0.797682
+rs106, lba , 0.598753, 0.072099, 0.797682
+rs106, hba , 0.598753, 0.072099, 0.797682
+fr606, lba , 0.677163, 0.025597, 0.735388
+fr606, hba , 0.677451, 0.025924, 0.735111
 rs306, lba , 0.598753, 0.072099, 0.797682
 rs306, hba , 0.598753, 0.072099, 0.797682
 de605, lba , 0.628982, 0.049468, 0.775844
 de605, hba , 0.628965, 0.049472, 0.775858
-rs508, lba , 0.593792, 0.070643, 0.801512
-rs508, hba , 0.593792, 0.070643, 0.801512
 cs031, lba , 0.598753, 0.072099, 0.797682
 cs031, hba0, 0.598753, 0.072099, 0.797682
 cs031, hba1, 0.598753, 0.072099, 0.797682
-cs001, lba , 0.598753, 0.072099, 0.797682
-cs001, hba0, 0.598753, 0.072099, 0.797682
-cs001, hba1, 0.598753, 0.072099, 0.797682
-cs026, lba , 0.598753, 0.072099, 0.797682
-cs026, hba0, 0.598753, 0.072099, 0.797682
-cs026, hba1, 0.598753, 0.072099, 0.797682
-FI609, lba , 0.333971, 0.126638, 0.934037
-FI609, hba , 0.334119, 0.126625, 0.933987
+de601, lba , 0.631139, 0.075776, 0.771960
+de601, hba , 0.631204, 0.076214, 0.771864
+se607, lba , 0.530119, 0.108953, 0.840894
+se607, hba , 0.529311, 0.111871, 0.841020
 cs302, lba , 0.598753, 0.072099, 0.797682
 cs302, hba0, 0.598753, 0.072099, 0.797682
 cs302, hba1, 0.598753, 0.072099, 0.797682
-rs509, lba , 0.598753, 0.072099, 0.797682
-rs509, hba , 0.598753, 0.072099, 0.797682
+de603, lba , 0.601391, 0.095614, 0.793213
+de603, hba , 0.601456, 0.095645, 0.793160
+cs032, lba , 0.598753, 0.072099, 0.797682
+cs032, hba0, 0.598753, 0.072099, 0.797682
+cs032, hba1, 0.598753, 0.072099, 0.797682
+cs004, lba , 0.598753, 0.072099, 0.797682
+cs004, hba0, 0.598753, 0.072099, 0.797682
+cs004, hba1, 0.598753, 0.072099, 0.797682
 de602, lba , 0.662887, 0.109694, 0.740641
 de602, hba , 0.649782, 0.129703, 0.748973
-de601, lba , 0.631139, 0.075776, 0.771960
-de601, hba , 0.631204, 0.076214, 0.771864
-rs307, lba , 0.598753, 0.072099, 0.797682
-rs307, hba , 0.598753, 0.072099, 0.797682
-cs006, lba , 0.598753, 0.072099, 0.797682
-cs006, hba0, 0.598753, 0.072099, 0.797682
-cs006, hba1, 0.598753, 0.072099, 0.797682
+cs501, lba , 0.598753, 0.072099, 0.797682
+cs501, hba0, 0.598753, 0.072099, 0.797682
+cs501, hba1, 0.598753, 0.072099, 0.797682
 rs208, lba , 0.601735, 0.072879, 0.795364
 rs208, hba , 0.598753, 0.072099, 0.797682
 cs011, lba , 0.598753, 0.072099, 0.797682
 cs011, hba0, 0.598753, 0.072099, 0.797682
 cs011, hba1, 0.598753, 0.072099, 0.797682
-cs017, lba , 0.598753, 0.072099, 0.797682
-cs017, hba0, 0.598753, 0.072099, 0.797682
-cs017, hba1, 0.598753, 0.072099, 0.797682
-cs013, lba , 0.598753, 0.072099, 0.797682
-cs013, hba0, 0.598753, 0.072099, 0.797682
-cs013, hba1, 0.598753, 0.072099, 0.797682
-se607, lba , 0.530119, 0.108953, 0.840894
-se607, hba , 0.529311, 0.111871, 0.841020
 cs005, lba , 0.598753, 0.072099, 0.797682
 cs005, hba0, 0.598753, 0.072099, 0.797682
 cs005, hba1, 0.598753, 0.072099, 0.797682
-de603, lba , 0.601391, 0.095614, 0.793213
-de603, hba , 0.601456, 0.095645, 0.793160
-uk608, lba , 0.626845, -0.014960, 0.779000
-uk608, hba , 0.627506, -0.014332, 0.778480
-fr606, lba , 0.677163, 0.025597, 0.735388
-fr606, hba , 0.677451, 0.025924, 0.735111
-cs103, lba , 0.598753, 0.072099, 0.797682
-cs103, hba0, 0.598753, 0.072099, 0.797682
-cs103, hba1, 0.598753, 0.072099, 0.797682
-cs101, lba , 0.598753, 0.072099, 0.797682
-cs101, hba0, 0.598753, 0.072099, 0.797682
-cs101, hba1, 0.598753, 0.072099, 0.797682
-rs305, lba , 0.598460, 0.072037, 0.797907
-rs305, hba , 0.598753, 0.072099, 0.797682
-cs401, lba , 0.598753, 0.072099, 0.797682
-cs401, hba0, 0.598753, 0.072099, 0.797682
-cs401, hba1, 0.598753, 0.072099, 0.797682
-cs501, lba , 0.598753, 0.072099, 0.797682
-cs501, hba0, 0.598753, 0.072099, 0.797682
-cs501, hba1, 0.598753, 0.072099, 0.797682
-rs503, lba , 0.598753, 0.072099, 0.797682
-rs503, hba , 0.598753, 0.072099, 0.797682
-cs030, lba , 0.598753, 0.072099, 0.797682
-cs030, hba0, 0.598753, 0.072099, 0.797682
-cs030, hba1, 0.598753, 0.072099, 0.797682
-rs106, lba , 0.598753, 0.072099, 0.797682
-rs106, hba , 0.598753, 0.072099, 0.797682
-cs032, lba , 0.598753, 0.072099, 0.797682
-cs032, hba0, 0.598753, 0.072099, 0.797682
-cs032, hba1, 0.598753, 0.072099, 0.797682

MAC/Deployment/data/Coordinates/make_all_station_file.py

@@ -184,7 +184,7 @@ if __name__ == '__main__':
                     aPosH = np.concatenate((aPosH, [[even,odd]]), axis=0)
                 
         
-        if int(np.shape(aPosL)[0]) == 0 and int(np.shape(aPosH)[0]) == 0:
+        if int(np.shape(aPosL)[0]) == 0 or int(np.shape(aPosH)[0]) == 0:
             print 'ERR, no data found for %s' %(station)
             exit(1)
              

MAC/Deployment/data/Coordinates/make_conf_files.py

@@ -231,7 +231,7 @@ if __name__ == '__main__':
             elif record[1] == 'HBA' or record[1] == 'HBA0' or record[1] == 'HBA1':
                 aPosH = np.concatenate((aPosH, [[even,odd]]), axis=0)
 
-    if int(np.shape(aPosL)[0]) == 0 and int(np.shape(aPosH)[0]) == 0:
+    if int(np.shape(aPosL)[0]) == 0 or int(np.shape(aPosH)[0]) == 0:
         print 'ERR, no data found for %s' %(station)
         exit(1)
          

MAC/Deployment/data/StaticMetaData/StationInfo.dat

@@ -178,7 +178,7 @@ SE607	207    E    11.9302386   57.3990617       50.34  24    12    96    96    N
 # Chillbolton
 UK608	208    E    -1.4342539   51.1439472      137.66  24    12    96    96    No       No
 # Finland
-FI609	209    E    20.7609103   69.0714225      533.25  12    6     48    48    No       No
+FI609	209    E    20.7609103   69.0714225      533.25  12    6     0     48    No       No
 ## 210 - 255
 ##
 

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS001-iHBADeltas.conf

 #
 # HBADeltas for CS001
-# Created: 2012-10-09 13:46:20
+# Created: 2012-01-24 14:49:37
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS002-iHBADeltas.conf

 #
 # HBADeltas for CS002
-# Created: 2012-10-09 13:46:21
+# Created: 2012-01-24 14:49:37
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS003-iHBADeltas.conf

 #
 # HBADeltas for CS003
-# Created: 2012-10-09 13:46:21
+# Created: 2012-01-24 14:49:37
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS004-iHBADeltas.conf

 #
 # HBADeltas for CS004
-# Created: 2012-10-09 13:46:21
+# Created: 2012-01-24 14:49:37
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS005-iHBADeltas.conf

 #
 # HBADeltas for CS005
-# Created: 2012-10-09 13:46:21
+# Created: 2012-01-24 14:49:37
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS006-iHBADeltas.conf

 #
 # HBADeltas for CS006
-# Created: 2012-10-09 13:46:22
+# Created: 2012-01-24 14:49:37
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS007-iHBADeltas.conf

 #
 # HBADeltas for CS007
-# Created: 2012-10-09 13:46:22
+# Created: 2012-01-24 14:49:38
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS011-iHBADeltas.conf

 #
 # HBADeltas for CS011
-# Created: 2012-10-09 13:46:22
+# Created: 2012-01-24 14:49:38
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS013-iHBADeltas.conf

 #
 # HBADeltas for CS013
-# Created: 2012-10-09 13:46:22
+# Created: 2012-01-24 14:49:38
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS017-iHBADeltas.conf

 #
 # HBADeltas for CS017
-# Created: 2012-10-09 13:46:23
+# Created: 2012-01-24 14:49:38
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS021-iHBADeltas.conf

 #
 # HBADeltas for CS021
-# Created: 2012-10-09 13:46:23
+# Created: 2012-01-24 14:49:38
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS024-iHBADeltas.conf

 #
 # HBADeltas for CS024
-# Created: 2012-10-09 13:46:23
+# Created: 2012-01-24 14:49:39
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS026-iHBADeltas.conf

 #
 # HBADeltas for CS026
-# Created: 2012-10-09 13:46:23
+# Created: 2012-01-24 14:49:39
 #
 HBADeltas
 32 x 3 [

MAC/Deployment/data/StaticMetaData/iHBADeltas/CS028-iHBADeltas.conf

 #
 # HBADeltas for CS028
-# Created: 2012-10-09 13:46:24
+# Created: 2012-01-24 14:49:39
 #
 HBADeltas
 32 x 3 [