small changes following review, restored variable.csv history

renamed new variable.csv

moved old variable.csv

renamed new variables.csv

recreate variables.csv

Author: BaptisteVandecrux

src/pypromice/process/get_l2.py

@@ -3,6 +3,7 @@
 from argparse import ArgumentParser
 import pypromice
 from pypromice.process.aws import AWS
+from pypromice.process.load import getVars, getMeta
 from pypromice.process.write import prepare_and_write
 
 def parse_arguments_l2():
@@ -41,14 +42,15 @@ def get_l2():
     # Perform level 1 and 2 processing
     aws.getL1()
     aws.getL2() 
-    
+    v = getVars(args.variables)
+    m = getMeta(args.metadata)
     # Write out level 2
     if args.outpath is not None:
         if not os.path.isdir(args.outpath):
             os.mkdir(args.outpath)
         if aws.L2.attrs['format'] == 'raw':
-            prepare_and_write(aws.L2, args.outpath, args.variables, args.metadata, '10min')
-        prepare_and_write(aws.L2, args.outpath, args.variables, args.metadata, '60min')
+            prepare_and_write(aws.L2, args.outpath, v, m, '10min')
+        prepare_and_write(aws.L2, args.outpath, v, m, '60min')
 
 
 if __name__ == "__main__":  

src/pypromice/process/get_l2tol3.py

@@ -4,6 +4,7 @@
 from argparse import ArgumentParser
 import pypromice
 from pypromice.process.L2toL3 import toL3
+from pypromice.process.load import getVars, getMeta
 from pypromice.process.write import prepare_and_write
 logger = logging.getLogger(__name__)
 
@@ -48,12 +49,14 @@ def get_l2tol3():
 
     # Perform Level 3 processing
     l3 = toL3(l2)
-    
+
     # Write Level 3 dataset to file if output directory given
+    v = getVars(args.variables)
+    m = getMeta(args.metadata)
     if args.outpath is not None:
-        prepare_and_write(l3, args.outpath, args.variables, args.metadata, '60min')
-        prepare_and_write(l3, args.outpath, args.variables, args.metadata, '1D')
-        prepare_and_write(l3, args.outpath, args.variables, args.metadata, 'M')
+        prepare_and_write(l3, args.outpath, v, m, '60min')
+        prepare_and_write(l3, args.outpath, v, m, '1D')
+        prepare_and_write(l3, args.outpath, v, m, 'M')
 
 if __name__ == "__main__":  
     get_l2tol3()

src/pypromice/process/utilities.py

@@ -48,7 +48,6 @@ def reformat_lon(dataset, exempt=['UWN', 'Roof_GEUS', 'Roof_PROMICE']):
 
     if id not in exempt:
         if 'gps_lon' not in dataset.keys():
-            print("?????????", id, "missing gps_lon")
             return dataset
         dataset['gps_lon'] = dataset['gps_lon'] * -1
     return dataset