Mcmc debug #60
Merged
Mcmc debug #60
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
October 26, 2024 15:23
…DMvals now represent centre of bins. Next is debug check
…ies to 0. Will still *sometimes* happen, but very rarely
profxj
approved these changes
Oct 30, 2024
| dkzs1 = 1. - dkzs2 | ||
|
|
||
| # checks for values which are too large | ||
| toobigz = np.where(zlist > self.zvals[-1] + self.dz/2.)[0] |
There was a problem hiding this comment.
you might put this at the start of the method
| NOTE: the routine GenMCFRB does not know 'w', merely | ||
| which w bin it generates. | ||
|
|
||
| """ | ||
| # Boost? | ||
| if self.state.energy.luminosity_function in [1, 2]: | ||
| Emax_boost = 2.0 | ||
| Emax_boost = 3.0 |
There was a problem hiding this comment.
Is this variable described somewhere?
| #MCz = self.zvals[iz2] + (kz2-0.5)*dz | ||
|
|
||
| # weigts between iz1 and iz2 | ||
| if fz < 0.5: |
There was a problem hiding this comment.
this is not the prettiest code
is it at least efficient?
| Eth = self.thresholds[j, iz2, iDM2] * kDM2 | ||
| Eth *= kz2 ** 2 # assume threshold goes as Eth~z^2 in the near Universe | ||
|
|
||
| fDM = r / pDMc[iDM2] |
There was a problem hiding this comment.
this also appears rather inefficient..
but I'd have to look really carefully to see if there
were obvious speed-ups
| idms1=kdms.astype('int') | ||
| idms2=idms1+1 | ||
| dkdms=kdms-idms1 | ||
| #ddm=dmvals[1]-dmvals[0] |
| idmobs2=idmobs1+1 | ||
| dkdmobs=kdmobs-idmobs1 # applies to idms2 | ||
|
|
||
| #kdmobs=(survey.DMs - np.median(survey.DMGs + survey.DMhalos))/ddm |
| # get indices in z space. See dm comments above. This will not work for log-spaced z | ||
| #dz=zvals[1]-zvals[0] | ||
| #kzs=Zobs/dz - 0.5 | ||
| #Bin0 = np.where(kzs < 0.)[0] |
| # The thresholds have already been calculated at mean values | ||
| # of the below quantities. Hence, we use the DM relative to | ||
| # those means, not the actual DMEG for that FRB | ||
| #kdmobs=(survey.DMs - np.median(survey.DMGs + survey.DMhalos))/ddm |
| @@ -0,0 +1,244 @@ | |||
| """ | |||
There was a problem hiding this comment.
if it is only for testing, can we move it into tests/
JordanHoffmann3
approved these changes
Nov 13, 2024
| """ | ||
| # get indices in dm space | ||
| kdms=DMlist/self.ddm - 0.5 # idea: if DMobs = ddm, we are half-way between bin 0 and bin 1 | ||
| Bin0 = np.where(kdms < 0.)[0] # if DMs are in the lower half of the lowest bin, use lowest bin only |
There was a problem hiding this comment.
Not sure I follow this comment. Is this line not redundant as kdms should start at 1 so -0.5 means it will never go negative? Same for kzs below.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I have altered the definition of bins in grid.py
Checks have been done that MC FRBs get generated according to the new grid, AND that likelihoods get correctly evaluated in 1D and 2D
This change has lots of little things, but is pretty important, so I'm asking you both to check it.
I've temporarily left some commented-out code in for comparative purposes in likelihoods. But some old code in comments can easily be deleted.