Index: trunk/npstat/stat/OrthoPolyGOFTest1D.cc
===================================================================
--- trunk/npstat/stat/OrthoPolyGOFTest1D.cc	(revision 745)
+++ trunk/npstat/stat/OrthoPolyGOFTest1D.cc	(revision 746)
@@ -1,38 +1,59 @@
 #include <sstream>
 
 #include "npstat/stat/OrthoPolyGOFTest1D.hh"
 #include "npstat/stat/Distributions1D.hh"
 
 namespace npstat {
     double OrthoPolyGOFTest1D::analyticPValue(
         const double stat, unsigned long /* sz */) const
     {
         Gamma1D chisq(0.0, 2.0, nUnmasked_/2.0);
         return chisq.exceedance(stat);
     }
 
     std::string OrthoPolyGOFTest1D::shortName() const
     {
+        const unsigned twodeg = 2U*maxdeg_;
+
         std::ostringstream os;
-        os << "OP" << nUnmasked_;
+        os << "OP_" << twodeg;
+        if (twodeg != nUnmasked_)
+        {
+            // Figure out the number of the last masked eigenvector
+            unsigned lastMasked = twodeg;
+            for (unsigned i=0; i<twodeg; ++i)
+                if (mask_[i])
+                    lastMasked = i;
+            assert(lastMasked < twodeg);
+
+            // Add mask info
+            os << '_';
+            for (unsigned i=0; i<=lastMasked; ++i)
+            {
+                if (mask_[i])
+                    os << '1';
+                else
+                    os << '0';
+            }
+        }
         return os.str();
     }
 
     double OrthoPolyGOFTest1D::inverseExceedance(
         const double pvalue, const unsigned long sz,
         const double smin, const double smax) const
     {
         if (pvalue <= 0.0 || pvalue >= 1.0) throw std::invalid_argument(
             "In npstat::OrthoPolyGOFTest1D::inverseExceedance: "
             "p-value argument must be inside (0, 1) interval");
 
         if (pvalue > 1.0e-10)
         {
             Gamma1D chisq(0.0, 2.0, nUnmasked_/2.0);
             return chisq.quantile(1.0 - pvalue);
         }
         else
             return AbsUnbinnedGOFTest1D::inverseExceedance(
                 pvalue, sz, smin, smax);
     }
 }