change to allow non-masked time series too

da/analysis/summarize_obs.py

@@ -124,8 +124,8 @@ def SummarizeObs(DaCycle,printfmt='html'):
             date      = f.GetVariable('time')
             obs       = f.GetVariable('value')*1e6
             mdm       = f.GetVariable('modeldatamismatch')*1e6
-            simulated = f.GetVariable('modelsamplesmean')*1e6
-            simulated_std = f.GetVariable('modelsamplesstandarddeviation')*1e6
+            simulated = f.GetVariable('modelsamplesmean_forecast')*1e6
+            simulated_std = f.GetVariable('modelsamplesstandarddeviation_forecast')*1e6
 
             pydates = [dt.datetime(1970,1,1)+dt.timedelta(seconds=int(d)) for d in date]
 
@@ -148,7 +148,7 @@ def SummarizeObs(DaCycle,printfmt='html'):
                     f.lab_abbr,
                     f.site_country,
                     location,
-                    len(mdm.compressed()),
+                    len(np.ma.compressed(mdm)),
                     mdm.mean(),
                     np.sqrt((simulated_std**2).mean()),
                     diff,diffstd,
@@ -156,10 +156,6 @@ def SummarizeObs(DaCycle,printfmt='html'):
                     diffwinter,diffwinterstd)
             
             table.append(ss)
-            lons.append(f.site_longitude)
-            lats.append(f.site_latitude)
-            names.append(f.site_code)
-            nobs.append(len(mdm.compressed()))
             f.close()
 
     if printfmt == 'tex':
@@ -357,7 +353,7 @@ if __name__ == '__main__':    # started as script
 
     DaCycle.DaSystem    = DaSystem
 
-    #q=SummarizeObs(DaCycle)
+    q=SummarizeObs(DaCycle)
 
     while DaCycle['time.start'] < DaCycle['time.finish']: