Tutorial 2 and load.py

updated tutorial 2 to match the changes in analysis1axis and performance.calculateResults. Updated load.read1Result to detect if the file read already contains an index. If so, it applies that index to the dataframe. This prevents the appearance of columns like "Unnamed: 0" from showing up in your result dataframe.

bifacial_radiance/load.py

@@ -172,6 +172,10 @@ def read1Result(selectfile):
 
     #resultsDict = pd.read_csv(os.path.join('results',selectfile))
     resultsDF = pd.read_csv(selectfile)
+
+    if 'Unnamed: 0' in resultsDF.columns:
+        resultsDF.index = resultsDF['Unnamed: 0'].values
+        resultsDF.drop(columns='Unnamed: 0', inplace=True)
 
     #return(np.array(temp['Wm2Front']), np.array(temp['Wm2Back']))
     return resultsDF
@@ -207,13 +211,16 @@ def cleanResult(resultsDF, matchers=None):
 
     if matchers is None:
         matchers = ['sky','pole','tube','bar','ground', '3267', '1540']
-    NaNindex = [i for i,s in enumerate(resultsDF['mattype']) if any(xs in s for xs in matchers)]
-    NaNindex2 = [i for i,s in enumerate(resultsDF['rearMat']) if any(xs in s for xs in matchers)]
-    #NaNindex += [i for i,s in enumerate(frontDict['mattype']) if any(xs in s for xs in matchers)]    
-    for i in NaNindex:
-        resultsDF.loc[i,'Wm2Front'] = np.NAN 
-    for i in NaNindex2:
-        resultsDF.loc[i,'Wm2Back'] = np.NAN
+    # NaNindex = [i for i,s in enumerate(resultsDF['mattype']) if any(xs in s for xs in matchers)]
+    # NaNindex2 = [i for i,s in enumerate(resultsDF['rearMat']) if any(xs in s for xs in matchers)]
+    # #NaNindex += [i for i,s in enumerate(frontDict['mattype']) if any(xs in s for xs in matchers)]    
+    # for i in NaNindex:
+    #     resultsDF.loc[i,'Wm2Front'] = np.NAN 
+    # for i in NaNindex2:
+    #     resultsDF.loc[i,'Wm2Back'] = np.NAN
+
+    resultsDF.loc[resultsDF.mattype.str.contains('|'.join(matchers)),'Wm2Front'] = np.NAN
+    resultsDF.loc[resultsDF.rearMat.str.contains('|'.join(matchers)),'Wm2Back'] = np.NAN
 
     return resultsDF