improvements responding to comments

responding to comments in pvlib#271
- improved metadata retrieval and location setting
- added better options to output

responding to comments in pvlib#270
- moved some functions to general iotools

Author: dacoex

pvlib/io/iotools.py

@@ -15,17 +15,19 @@ def get_loc_latlon(lat, lon):
 
     return tz
 
-def localise_df(df_notz, tz_source_str='UTC', tz_target_str):
+def localise_df(df_notz, tz_source_str='UTC', tz_target_str=None):
     """
     localises a pandas.DataFrame (df) to the target time zone of the pvlib-Location    
     
     Assumes that the input df does not have a timezone
     
     """
 
-    tz_source_str = pytz.timezone(tz_source_str)
+    tz_source = pytz.timezone(tz_source_str)
     tz_target = pytz.timezone(tz_target_str)
 
-    df_tz_target = df_notz.tz_convert(tz_source)
+    df_tz_source = df_notz.tz_localize(tz_source)
+    df_tz_target = df_tz_source.tz_convert(tz_target)
+    
 
     return df_tz_target

pvlib/io/maccrad.py

@@ -34,6 +34,9 @@ def read_maccrad_metadata(file_csv, name='maccrad'):
     ## if file is on local drive
     f = open(file_csv)
     for line in f:
+        if "Title" in line:
+            title = line.split(':')[1].split('(')[0].strip()
+            name = title
         if "Latitude" in line:
     #    print (line)
     #    if line.startswith( "# Latitude"):
@@ -66,20 +69,26 @@ def read_maccrad_metadata(file_csv, name='maccrad'):
                            tz=tz_loc)
 
     return tz_raw, location
-    
+
+
 def maccrad_df_to_pvlib(df_raw, tz_raw, loc, localise=True):
     """Change some properties of the dataframe to be more compliant with pvlib
     
     * localisation
     * column renaming
+    * setting dataframe name description according to datasource
     
     """
 
     if localise:
         # timezone localisations
-        df_pvlib = localise_df(df_raw, tz_source_str=tz_raw, loc.tz)
+        df_pvlib = localise_df(df_raw, tz_source_str=tz_raw, 
+                               tz_target_str=loc.tz)
     # column renaming
     df_pvlib.index.name = 'datetime'
+    
+    # name the dataframe according to data source 
+    df_pvlib.df_name = loc.name
 
     return df_pvlib
 
@@ -118,13 +127,15 @@ def read_maccrad(file_csv, loc_name=None, skiprows=40, output='all'):
 #TODO: add loc_name
 #TODO: add reformat needs loc!
 #TODO: add simplify output options raw or all
+    print (output)
     if output == 'df_raw':
         res = df_raw
-    if output == 'test':
-        res = df_pvlib
-    else:
+    if output == 'all':
         tz_raw, loc = read_maccrad_metadata(file_csv)
+        loc.name = (loc.name + ' @ ' + 'lat (deg. N), lon (deg. E): ' + 
+                    str(loc.latitude) + ', ' + str(loc.longitude))
         df_pvlib = maccrad_df_to_pvlib(df_raw, tz_raw, loc, localise=True)
+#        res = df_pvlib
         res = (df_raw, df_pvlib, loc)
 #    if output == 'loc':
 #        

pvlib/test/test_io_maccrad.py

@@ -13,10 +13,12 @@
 maccrad_csv_path = os.path.join(maccrad_csv_dir, maccrad_csv)
 
 data_maccrad = read_maccrad(maccrad_csv_path, output='all')
-data_maccrad = read_maccrad(maccrad_csv_path, output='test')
+#data_maccrad = read_maccrad(maccrad_csv_path, output='test')
+
+maccrad_raw = data_maccrad[0]
+maccrad_pvlib = data_maccrad[1]
+maccrad_loc = data_maccrad[2]
 
-maccrad_loc = data_maccrad[0]
-maccrad_df = data_maccrad[1]
 
 def test_location_coord():
     assert (44.0830, 5.0590, 97.00) == (maccrad_loc.latitude, 
@@ -27,12 +29,14 @@ def test_location_coord():
 def test_location_tz():
     assert 'Europe/Paris' == maccrad_loc.tz
 
+def test_tz_convert():
+    assert maccrad_pvlib.index.tzinfo.zone == maccrad_loc.tz
 
 def test_maccrad_recolumn():
-    assert 'Clear sky GHI' in maccrad_df.columns
+    assert 'Clear sky GHI' in maccrad_pvlib.columns
 
 def test_maccrad_norecolumn():
-    assert 'Clear sky GHI' in maccrad_df.columns
+    assert 'Clear sky GHI' in maccrad_pvlib.columns
 
 def test_maccrad_coerce_year():
     coerce_year = 2010