Merge pull request #25 from scarrazza/obscorr_title

fixing obscorr title with pdf label instead of name
scarrazza · May 26, 2016 · f74efb7 · f74efb7
2 parents 91f5954 + 038fee4
commit f74efb7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/smpdflib/actions.py b/src/smpdflib/actions.py
@@ -224,7 +224,7 @@ def export_obscorrs(data_table, output_dir, prefix, base_pdf=None):
 
     from smpdflib.corrutils import observable_correlations
 
-    for title, corrmat, labels in observable_correlations(data_table, base_pdf):
+    for title, corrmat, labels, filename in observable_correlations(data_table, base_pdf):
         name = prefix + "_" + normalize_name(title)
         filename = osp.join(output_dir, name + ".csv")
         pd.DataFrame(corrmat, index=labels, columns=labels).to_csv(filename, sep='\t')

diff --git a/src/smpdflib/corrutils.py b/src/smpdflib/corrutils.py
@@ -64,10 +64,12 @@ def observable_correlations(results_table, base_pdf=None):
         M = np.concatenate([result._all_vals.as_matrix() for result in results])
         #Without atleast_2d would return a scalar if M has only one element.
         corrmat = np.atleast_2d(np.corrcoef(M))
-        title = "Observables correlation\n%s" % pdf
+        title = "Observables correlation\n%s" % pdf.label
+        filename = "%s" % pdf
         if base_pdf:
             corrmat -= base_corr
-            title += "-%s" % base_pdf
+            title += "-%s" % base_pdf.label
+            filename += "-%s" % base_pdf
 
 
         def make_labels(results):
@@ -83,4 +85,4 @@ def make_labels(results):
                         yield "%s (Bin %d)" % (obslabel, b+1)
 
         labels = list(make_labels(results))
-        yield title, corrmat, labels
+        yield title, corrmat, labels, filename
diff --git a/src/smpdflib/plots.py b/src/smpdflib/plots.py
@@ -479,7 +479,7 @@ def plot_correlations(results):
 
 def plot_observable_correlations(results_table, base_pdf=None):
 
-    for title, corrmat, labels in observable_correlations(results_table, base_pdf):
+    for title, corrmat, labels, filename in observable_correlations(results_table, base_pdf):
         if base_pdf is not None:
             rlim = np.max(np.abs(corrmat))
         else:
@@ -507,4 +507,4 @@ def plot_observable_correlations(results_table, base_pdf=None):
         plt.tight_layout()
         plt.colorbar()
 
-        yield (title.split()[-1],) , fig
+        yield (filename,) , fig
diff --git a/src/smpdflib/reducedset.py b/src/smpdflib/reducedset.py
@@ -278,7 +278,7 @@ def get_smpdf_lincomb(pdf, pdf_results,
                              )
 
 def complete_smpdf_description(desc, pdf ,pdf_results, full_grid,
-                      target_error ):
+                      target_error, total_neig ):
 
     input_hash = smpdf_input_hash(pdf, pdf_results, full_grid,
                                   target_error)
@@ -289,6 +289,7 @@ def complete_smpdf_description(desc, pdf ,pdf_results, full_grid,
            'full_grid' : full_grid,
            'input_hash' : input_hash,
            'input_set' : str(pdf),
+           'total_neig': total_neig,
            }
 
     return desc
@@ -430,7 +431,8 @@ def create_smpdf(pdf, pdf_results, output_dir, name,
 
     description = complete_smpdf_description(description, pdf, pdf_results,
                                              full_grid=full_grid,
-                                             target_error=smpdf_tolerance)
+                                             target_error=smpdf_tolerance,
+                                             total_neig=lincomb.shape[1])
     #We have do do this because LHAPDF seems to not parse complex structures
     parsed_desc = {'smpdf_description':yaml.dump(description,
                                                  default_flow_style=False)}
@@ -446,4 +448,4 @@ def create_smpdf(pdf, pdf_results, output_dir, name,
 
 
     return hessian_from_lincomb(pdf, vec, folder=output_dir,
-                         set_name= name, db=db, extra_fields=parsed_desc)
+                         set_name= name, db=db, extra_fields=parsed_desc)