alf v2.0

Author: cconroy20

src/alf.f90

@@ -38,7 +38,7 @@ PROGRAM ALF
   !length of chain burn-in
   INTEGER, PARAMETER :: nburn=10000
   !number of walkers
-  INTEGER, PARAMETER :: nwalkers=512 !1024
+  INTEGER, PARAMETER :: nwalkers=1024
   !save the chain outputs to file
   INTEGER, PARAMETER :: print_mcmc=0
 
@@ -82,31 +82,27 @@ PROGRAM ALF
   !0=full, 1=simple, 2=super-simple.  See sfvars for details
   fit_type  = 0
   !type of IMF to fit
-  !0=single power-law, 1=double power-law, 2=power-law+cutoff, 3=2pl+ct
+  !0=1PL, 1=2PL, 2=1PL+cutoff, 3=2PL+cutoff, 4=5-pt PL
   imf_type  = 1
   !are the data in the original observed frame?
-  observed_frame = 0
+  observed_frame = 1
 
   !dont fit transmission function in cases where the input
   !spectrum has already been de-redshifted to ~0.0
   IF (observed_frame.EQ.0) THEN
      fit_trans = 0
      prhi%logtrans = -5.0
-     prhi%logsky   = -5.0
+     prhi%logsky   = -5.0 
   ELSE
      fit_trans = 1
+     !extra smoothing to the transmission spectrum
+     !if the input data has been smoothed by a gaussian
+     !in velocity space, set the parameter below to that extra smoothing
+     smooth_trans = 0.0
   ENDIF
 
-  !extra smoothing to the transmission spectrum
-  !if the input data has been smoothed by a gaussian
-  !in velocity space, set the parameter below to that extra smoothing
-  smooth_trans = 0.0
-  
-  !limit the range of [Z/H] to be very small
-  !prlo%zh   = -0.01
-  !prhi%zh   =  0.01
   !set low upper prior limits to kill off these parameters
-  !prhi%logm7g   = -5.0
+  prhi%logm7g   = -5.0
   !prhi%loghot   = -5.0
   !prhi%logtrans = -5.0
   !prhi%logfy    = -5.0
@@ -298,7 +294,6 @@ PROGRAM ALF
         write(*,*) msto
         CALL GETMODEL(tpos,mspecmw,mw=1)     !get spectrum for MW IMF
         CALL GETM2L(msto,lam,mspecmw,tpos,m2lmw,mw=1) !compute M/L_MW
-        !CALL GETM2L(msto,lam,10**sspgrid%logfkrpa(:,nage,nzmet-1),tpos,m2lmw,mw=1)
         write(*,'(2F7.2)') m2lmw(1:2)
         CALL GETMODEL(tpos,mspec)
         CALL GETM2L(msto,lam,mspec,tpos,m2l) ! compute M/L

src/alf_vars.f90

@@ -201,7 +201,8 @@ MODULE ALF_VARS
           logfy=-4.0,sigma2=0.0,velz2=0.0,logm7g=-4.0,hotteff=20.0,&
           loghot=-4.0,fy_logage=0.3,logtrans=-4.0,logemline_h=-4.0,&
           logemline_oiii=-4.0,logemline_sii=-4.0,logemline_ni=-4.0,&
-          logemline_nii=-4.0,jitter=1.0,imf3=2.0,logsky=-4.0
+          logemline_nii=-4.0,jitter=1.0,imf3=2.0,logsky=-4.0,imf4=0.0,&
+          imf5=0.0
      REAL(DP) :: chi2=huge_number
   END TYPE PARAMS
 

src/set_pinit_priors.f90

@@ -5,16 +5,23 @@ SUBROUTINE SET_PINIT_PRIORS(pos,prlo,prhi,velz)
   !that if the user defines a prior limit that is **different from
   !the default parameter set**, then that value overrides the defaults below
 
-  USE alf_vars; USE alf_utils, ONLY : myran
+  USE alf_vars; USE alf_utils, ONLY : myran,str2arr
   IMPLICIT NONE
 
   TYPE(PARAMS), INTENT(inout) :: pos,prlo,prhi
-  TYPE(PARAMS) :: test
+  TYPE(PARAMS) :: test,tprlo,tprhi
+  INTEGER :: i
   REAL(DP), OPTIONAL :: velz
-  
+  REAL(DP), DIMENSION(npar) :: prloarr1=0.,prhiarr1=0.,tprloarr1=0.
+  REAL(DP), DIMENSION(npar) :: testarr1=0.,posarr1=0.,tprhiarr1=0.
+
   !---------------------------------------------------------------!
   !---------------------------------------------------------------!
 
+  tprlo = prlo
+  tprhi = prhi
+  
+
   !setup the first position
   pos%logage    = myran()*0.4+0.6
   pos%zh        = myran()*1.0-1.0
@@ -164,12 +171,12 @@ SUBROUTINE SET_PINIT_PRIORS(pos,prlo,prhi,velz)
   IF (prhi%teff.EQ.test%teff) prhi%teff       = 50.0
   IF (prhi%imf1.EQ.test%imf1) prhi%imf1       = 3.5
   IF (imf_type.EQ.0.OR.imf_type.EQ.1.OR.imf_type.EQ.3) THEN
-     IF (prhi%imf2.EQ.test%imf2) prhi%imf2       = 3.5
+     IF (prhi%imf2.EQ.test%imf2) prhi%imf2    = 3.5
   ELSE IF (imf_type.EQ.2) THEN
-     IF (prhi%imf2.EQ.test%imf2) prhi%imf2       = 0.5
+     IF (prhi%imf2.EQ.test%imf2) prhi%imf2    = 0.5
   ENDIF
-  IF (prhi%imf3.EQ.test%imf3) prhi%imf3       = 0.4
-  IF (prhi%logfy.EQ.test%logfy) prhi%logfy    = -0.7
+  IF (prhi%imf3.EQ.test%imf3) prhi%imf3         = 0.4
+  IF (prhi%logfy.EQ.test%logfy) prhi%logfy      = -0.7
   IF (prhi%fy_logage.EQ.test%fy_logage) prhi%fy_logage = LOG10(3.0)
   IF (prhi%logm7g.EQ.test%logm7g) prhi%logm7g   = -1.0
   IF (prhi%hotteff.EQ.test%hotteff) prhi%hotteff= 30.0
@@ -188,33 +195,33 @@ SUBROUTINE SET_PINIT_PRIORS(pos,prlo,prhi,velz)
   IF (prhi%logsky.EQ.test%logsky) prhi%logsky    = 2.0
 
 
-  !reset the initial parameters if the priors have been altered
-  !this should be done for every parameter to ensure that the altered parameters
-  !do not fall outside of the prior range.  In practice only these params are 
-  !frequently altered.
-  IF (prhi%logtrans.NE.test%logtrans.OR.prlo%logtrans.NE.test%logtrans) &
-       pos%logtrans = myran()*(prhi%logtrans-prlo%logtrans)+prlo%logtrans
-  IF (prhi%logsky.NE.test%logsky.OR.prlo%logsky.NE.test%logsky) &
-       pos%logsky = myran()*(prhi%logsky-prlo%logsky)+prlo%logsky
-  IF (prhi%logfy.NE.test%logfy.OR.prlo%logfy.NE.test%logfy) &
-       pos%logfy = myran()*(prhi%logfy-prlo%logfy)+prlo%logfy
-  IF (prhi%loghot.NE.test%loghot.OR.prlo%loghot.NE.test%loghot) &
-       pos%loghot = myran()*(prhi%loghot-prlo%loghot)+prlo%loghot
-  IF (prhi%logm7g.NE.test%logm7g.OR.prlo%logm7g.NE.test%logm7g) &
-       pos%logm7g = myran()*(prhi%logm7g-prlo%logm7g)+prlo%logm7g
-  IF (prhi%logemline_h.NE.test%logemline_h.OR.prlo%logemline_h.NE.test%logemline_h) &
-       pos%logemline_h = myran()*(prhi%logemline_h-prlo%logemline_h)+prlo%logemline_h
-  IF (prhi%logemline_oiii.NE.test%logemline_oiii.OR.prlo%logemline_oiii.NE.test%logemline_oiii) &
-       pos%logemline_oiii = myran()*(prhi%logemline_oiii-prlo%logemline_oiii)+prlo%logemline_oiii
-  IF (prhi%logemline_sii.NE.test%logemline_sii.OR.prlo%logemline_sii.NE.test%logemline_sii) &
-       pos%logemline_sii = myran()*(prhi%logemline_sii-prlo%logemline_sii)+prlo%logemline_sii
-  IF (prhi%logemline_ni.NE.test%logemline_ni.OR.prlo%logemline_ni.NE.test%logemline_ni) &
-       pos%logemline_ni = myran()*(prhi%logemline_ni-prlo%logemline_ni)+prlo%logemline_ni
-  IF (prhi%logemline_nii.NE.test%logemline_nii.OR.prlo%logemline_nii.NE.test%logemline_nii) &
-       pos%logemline_nii = myran()*(prhi%logemline_nii-prlo%logemline_nii)+prlo%logemline_nii
-  IF (prhi%zh.NE.test%zh.OR.prlo%zh.NE.test%zh) &
-       pos%zh = myran()*(prhi%zh-prlo%zh)+prlo%zh
- IF (prhi%teff.NE.test%teff.OR.prlo%teff.NE.test%teff) &
-       pos%teff = myran()*(prhi%teff-prlo%teff)+prlo%teff
+  !--------------------------------------------------------------------------!
+  !-------reset the initial parameters if the priors have been altered-------!
+  !--------------------------------------------------------------------------!
+
+  !str->arr
+  CALL STR2ARR(1,tprlo,tprloarr1)   
+  CALL STR2ARR(1,tprhi,tprhiarr1)
+  CALL STR2ARR(1,prlo,prloarr1)   
+  CALL STR2ARR(1,prhi,prhiarr1)
+  CALL STR2ARR(1,test,testarr1)
+  CALL STR2ARR(1,pos,posarr1)
+
+  !test the priors and if the priors have been altered then 
+  !re-initialize the parameters within the prior range
+  !NB: why not simply always initialize the starting position this way?
+  DO i=3,npar
+     IF (prhiarr1(i).LE.prloarr1(i)) THEN
+        WRITE(*,*) 'SET_PINIT_PRIORS ERROR: prhi < prlo!', i
+        STOP
+     ENDIF
+     IF (tprhiarr1(i).NE.testarr1(i).OR.tprloarr1(i).NE.testarr1(i)) THEN
+        posarr1(i) = myran()*(prhiarr1(i)-prloarr1(i)) + prloarr1(i)
+     ENDIF
+  ENDDO
+
+  !arr->str
+  CALL STR2ARR(2,pos,posarr1)
+
 
 END SUBROUTINE SET_PINIT_PRIORS