full reloading in GUI; ignore_rows available from analysis_defaults s…

…o easier to change from GUI

GetDist.py

@@ -147,7 +147,7 @@ def filterParList(namestring, num=None):
                 elif mc.paramNames.parWithName(name):
                     pars.append(name)
         if num is not None and len(pars) != num:
-            raise Exception('%iD plot has not wrong number of parameters: %s' % (num, pars))
+            raise Exception('%iD plot has missing parameter or wrong number of parameters: %s' % (num, pars))
         return pars
 
 

README.rst

@@ -2,7 +2,7 @@
 GetDist
 ===================
 :GetDist: MCMC sample analysis, plotting and GUI
-:Version: 0.2.5
+:Version: 0.2.6
 :Author: Antony Lewis
 :Homepage: https://github.com/cmbant/getdist
 

getdist/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'Antony Lewis'
-__version__ = "0.2.5"
+__version__ = "0.2.6"
 
 from getdist.inifile import IniFile
 from getdist.paramnames import ParamInfo, ParamNames

getdist/analysis_defaults.ini

@@ -1,3 +1,8 @@
+#For disgarding burn-in if using raw chains
+#if < 1 interpreted as a fraction of the total number of rows (0.3 ignores first 30% of lines)
+#(ignored when parameter grid or chain .properties.ini settings are explicitly set)
+ignore_rows = 0
+
 #Confidence limits for marginalized constraints.
 #Also used for 2D plots, but only number set by plot settings actually shown
 contours = 0.68 0.95 0.99
@@ -61,3 +66,4 @@ num_bins = 100
 
 #output bins for 2D plotting (not used, just scale if smooth_scale_2D>1) 
 num_bins_2D=40
+

getdist/distparam_template.ini

@@ -15,10 +15,6 @@ chain_num =
 first_chain = 
 exclude_chain = 
 
-#For disgarding burn-in if using raw chains
-#if < 1 interpreted as a fraction of the total number of rows (0.3 ignores first 30% of lines)
-ignore_rows = 0
-
 #If generated chain at higher temperature can cool for computing results
 cool = 1
 

getdist/gui/mainwindow.py

@@ -514,6 +514,8 @@ def reLoad(self):
         adir = self.getSettings().value('lastSearchDirectory')
         batchjob.resetGrid(adir)
         self.openDirectory(adir)
+        if self.plotter:
+            self.plotter.sampleAnalyser.reset(self.iniFile)
 
     def getRootname(self):
         rootname = None
@@ -634,7 +636,8 @@ def showSettings(self):
     def settingsChanged(self):
         if self.plotter:
             self.plotter.sampleAnalyser.reset(self.iniFile)
-            self.plotData()
+            if self.plotter.fig:
+                self.plotData()
 
     def showPlotSettings(self):
         """