added include_fixed_parameter_priors option

Author: cmbant

batch2/common.ini

@@ -9,6 +9,9 @@ data_dir = %LOCALDIR%data/
 INCLUDE(likelihood.ini)
 INCLUDE(params_CMB_defaults.ini)
 
+#whether to include prior on a parameter if it has non-varying value
+include_fixed_parameter_priors = F
+
 #Feedback level ( 2=lots,1=chatty,0=none)
 feedback = 1
 

docs/readme.html

@@ -572,7 +572,8 @@ <H3>Running the GetDist program</H3>
 <LI>CAMB updated to May 2016 version (including HMCode Halofit support)
 <LI>Added DR12 BAO (in batch3/, thanks Tom Charnock)
 <LI>Added batch3/HST_Riess2016.ini
-<LI>Latest getdist version and small fixes
+<LI>Added <b>include_fixed_parameter_priors</b> input option (default false, as before)
+<LI>Latest <A HREF="https://pypi.python.org/pypi/GetDist/">GetDist</A> version and small fixes
 </UL>
 
 <LI><B>July 2015</B><BR>

source/BaseParameters.f90

@@ -27,6 +27,7 @@ module BaseParameters
         logical :: use_fast_slow = .false.
         integer :: num_fast, num_slow
         integer :: num_semi_fast, num_semi_slow
+        logical :: include_fixed_parameter_priors = .false.
         real(mcp), allocatable :: PMin(:), PMax(:), StartWidth(:), PWidth(:), center(:)
         logical(mcp), allocatable :: varying(:)
         logical :: block_semi_fast = .true.
@@ -166,11 +167,12 @@ subroutine TBaseParameters_ReadPriors(this,Ini)
     Type(TSettingIni) :: Combs
     integer params(num_params), num_lin
 
+    call Ini%Read('include_fixed_parameter_priors',this%include_fixed_parameter_priors)
     allocate(this%GaussPriors%std(num_params))
     allocate(this%GaussPriors%mean(num_params))
     this%GaussPriors%std=0 !no priors by default
     do i=1,num_params
-        if (this%varying(i)) then
+        if (this%varying(i) .or. this%include_fixed_parameter_priors) then
             InLine =  this%NameMapping%ReadIniForParam(Ini,'prior',i)
             if (InLine/='') then
                 read(InLine, *, iostat=status) this%GaussPriors%mean(i), this%GaussPriors%std(i)

source/calclike.f90

@@ -116,8 +116,9 @@ function GetLogPriors(this, P) result(logLike)
 
     logLike=0
     do i=1,num_params
-        if (BaseParams%varying(i) .and. BaseParams%GaussPriors%std(i)/=0) then
-            logLike = logLike + ((P(i)-BaseParams%GaussPriors%mean(i))/BaseParams%GaussPriors%std(i))**2
+        if ((BaseParams%varying(i) .or. BaseParams%include_fixed_parameter_priors) &
+            .and. BaseParams%GaussPriors%std(i)/=0) then
+        logLike = logLike + ((P(i)-BaseParams%GaussPriors%mean(i))/BaseParams%GaussPriors%std(i))**2
         end if
     end do
 

test_planck.ini

@@ -9,5 +9,8 @@ DEFAULT(batch2/lowTEB.ini)
 #Other settings same as test.ini
 DEFAULT(test.ini)
 
+#Uncomment if you want to include priors even when parameters fixed
+#include_fixed_parameter_priors = T
+
 #expected result for -(log like)
 test_check_compare = 5859.141