Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JMK_COSS log likelihood for reweighting #903

Open
wants to merge 110 commits into
base: devel
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
98e1341
Compute likelihood almost finished
cossorzano Mar 21, 2024
7cea90d
Compute Likelihood wizard added
cossorzano Mar 22, 2024
2aad01b
Correct output constructed, diameter moved to radius
cossorzano Mar 22, 2024
aa3dad2
Merge branch 'jk_convert_pdb_set' into temp
jamesmkrieger Mar 26, 2024
eccdeb0
Merge branch 'devel' into temp
jamesmkrieger May 6, 2024
f2bb39f
add likelihood possible outputs
jamesmkrieger May 13, 2024
f631cfd
Merge branch 'devel' of github.com:I2PC/scipion-em-xmipp into co_ML
jamesmkrieger Jun 7, 2024
00d65cd
add var option
jamesmkrieger Jun 7, 2024
64cf23d
add square sum
jamesmkrieger Jun 10, 2024
72088f3
add 1/2
jamesmkrieger Jun 10, 2024
807171d
use var by default
jamesmkrieger Jun 10, 2024
85fccaf
fixed LL
jamesmkrieger Jun 26, 2024
e9c2e82
clean form
jamesmkrieger Jun 27, 2024
12c3df5
comment failing setValue var
jamesmkrieger Jun 27, 2024
bc705e5
add matrix npy to LL outputs
jamesmkrieger Jul 10, 2024
5c6be03
fix outputs
jamesmkrieger Sep 6, 2024
215fa2b
Merge branch 'devel' of github.com:I2PC/scipion-em-xmipp into jmk_co_ML
jamesmkrieger Sep 16, 2024
6c3af59
add noise mask
jamesmkrieger Oct 31, 2024
6148093
Merge branch 'devel' of github.com:I2PC/scipion-em-xmipp into jmk_co_ML
jamesmkrieger Oct 31, 2024
667c804
actually add noise mask
jamesmkrieger Oct 31, 2024
b41619c
add noise rad to wizard
jamesmkrieger Nov 1, 2024
901d064
revert inputRefs multi
jamesmkrieger Nov 1, 2024
f14ca6d
switch wizard
jamesmkrieger Nov 1, 2024
b2604cd
more reverting fixes
jamesmkrieger Nov 1, 2024
e996e1e
fix default noise rad and mask
jamesmkrieger Nov 26, 2024
63636bf
add LL viewer here
jamesmkrieger Nov 26, 2024
f0f6e20
fix LL viewer for 1 vol
jamesmkrieger Nov 26, 2024
358e16a
Merge branch 'devel' of github.com:I2PC/scipion-em-xmipp into jmk_co_ML
jamesmkrieger Nov 26, 2024
aa6fff5
add gpu continuous assign 2 to LL
jamesmkrieger Nov 28, 2024
b79ad45
Merge branch 'devel' of github.com:I2PC/scipion-em-xmipp into jmk_co_ML
jamesmkrieger Nov 28, 2024
54a04ee
default gpu to false
jamesmkrieger Dec 4, 2024
8bf2fb7
add normalise to LL viewer
jamesmkrieger Dec 4, 2024
7acf47c
default normalise True
jamesmkrieger Dec 4, 2024
c8cbb61
robust LL sign keeping
jamesmkrieger Jan 7, 2025
5c55a2c
safer outputs
jamesmkrieger Jan 10, 2025
85da5b4
safer outputs 2
jamesmkrieger Jan 10, 2025
6d84959
noise from resid or image option
jamesmkrieger Jan 13, 2025
44c3ff1
merge update
jamesmkrieger Jan 13, 2025
b214144
first try parallel
jamesmkrieger Jan 14, 2025
a261e14
fixed parallel
jamesmkrieger Jan 14, 2025
49af5da
add cuda vis devices
jamesmkrieger Jan 14, 2025
d860b2c
revert imed and fix var source
jamesmkrieger Jan 14, 2025
08b7a2e
print terms
jamesmkrieger Jan 14, 2025
a003fa3
free gpus again
jamesmkrieger Jan 14, 2025
f16c4ec
actually fix gpus
jamesmkrieger Jan 16, 2025
86c3b43
actually fix gpus
jamesmkrieger Jan 16, 2025
1036388
default to original image noise
jamesmkrieger Jan 16, 2025
4ad03b1
print and term1 options
jamesmkrieger Jan 16, 2025
f4d02ed
format printed items
jamesmkrieger Jan 16, 2025
d53c482
add sos option
jamesmkrieger Jan 17, 2025
82807f4
safer term1
jamesmkrieger Jan 17, 2025
5777f8c
fix simulate ctf np.numpy
jamesmkrieger Jan 17, 2025
be2df17
Merge branch 'jmk_co_ML' of github.com:I2PC/scipion-em-xmipp into jmk…
jamesmkrieger Jan 17, 2025
cb9af9a
init generator for pre and post ctf noise
jamesmkrieger Jan 21, 2025
564d8a9
print scientific numbers
jamesmkrieger Jan 21, 2025
667f19d
default sos false
jamesmkrieger Jan 29, 2025
7ebfd1e
remove other image noise var
jamesmkrieger Jan 29, 2025
ce4468b
no condition on sos for term1
jamesmkrieger Jan 29, 2025
c9ef1bf
include new program
jamesmkrieger Feb 19, 2025
dc02322
write projections
jamesmkrieger Feb 19, 2025
c921cf6
print std
jamesmkrieger Feb 19, 2025
9e3c2cd
Merge branch 'jmk_co_ML' of github.com:I2PC/scipion-em-xmipp into jmk…
jamesmkrieger Feb 19, 2025
8b9bdbe
update new program help
jamesmkrieger Feb 19, 2025
904c584
add print header row
jamesmkrieger Feb 19, 2025
98240ba
add James to authors
jamesmkrieger Feb 20, 2025
59fdd5d
fix refs help
jamesmkrieger Feb 21, 2025
cc3e586
rename step func to produceResidualsStep
jamesmkrieger Mar 3, 2025
9e003e2
add subtract to viewer
jamesmkrieger Mar 4, 2025
2e38d58
clean up load
jamesmkrieger Mar 4, 2025
22d8b54
no filter resol if new prog
jamesmkrieger Mar 5, 2025
05e83ed
Merge branch 'devel' into jmk_co_ML
jamesmkrieger Mar 10, 2025
be031df
no stk for new prog
jamesmkrieger Mar 10, 2025
22dd598
remove unused partMax
jamesmkrieger Mar 11, 2025
b578b76
simplify
jamesmkrieger Mar 11, 2025
79f8676
more specific error
jamesmkrieger Mar 11, 2025
0e500fb
simpler viewer ranges
jamesmkrieger Mar 11, 2025
5c03849
simpler viewer ranges
jamesmkrieger Mar 11, 2025
537fff1
add relative LL hist
jamesmkrieger Mar 12, 2025
7a460c0
fix relative LL hist
jamesmkrieger Mar 12, 2025
ee08258
controlled bins
jamesmkrieger Mar 12, 2025
c6cc2a5
bug fix matrix vmax
jamesmkrieger Mar 13, 2025
35421d2
add histogram axis vmin vmax
jamesmkrieger Mar 13, 2025
b40c277
add SetOfClass3D output
jamesmkrieger Mar 17, 2025
3dc0b93
clean up
jamesmkrieger Mar 17, 2025
d50fb68
fix projmatch comment
jamesmkrieger Mar 17, 2025
4bb01c1
only new prog so no gpu
jamesmkrieger Mar 17, 2025
8dd0507
clean away resol arg
jamesmkrieger Mar 17, 2025
c937a7a
fix class reps
jamesmkrieger Mar 17, 2025
a186b6b
clean away resol arg
jamesmkrieger Mar 17, 2025
8e1495f
fix class reps
jamesmkrieger Mar 17, 2025
d52514f
Merge branch 'jmk_co_ML' of github.com:I2PC/scipion-em-xmipp into jmk…
jamesmkrieger Mar 25, 2025
5096457
restore old prog
jamesmkrieger Mar 25, 2025
d9048f9
remove line break
jamesmkrieger Mar 26, 2025
1d2c03d
Merge branch 'devel' of github.com:I2PC/scipion-em-xmipp into jmk_co_ML
jamesmkrieger Mar 26, 2025
7bf7c95
fix binThreads help
jamesmkrieger Mar 11, 2025
09a6abc
clean up
jamesmkrieger Mar 17, 2025
2ebac9f
fix error propagation
jamesmkrieger Mar 24, 2025
4e5d1db
fix for single volumes
jamesmkrieger Mar 26, 2025
7291e02
fix for empty classes
jamesmkrieger Mar 27, 2025
dce8241
first start to tests
jamesmkrieger Mar 27, 2025
5b85b01
rename test
jamesmkrieger Mar 27, 2025
1a0f878
add internal normalization
jamesmkrieger Mar 27, 2025
8080169
fix class ordering
jamesmkrieger Mar 27, 2025
29555ec
default ignoreCTF false
jamesmkrieger Mar 25, 2025
f10ede4
add empty line
jamesmkrieger Mar 27, 2025
32f05d7
clean up protocol issues
jamesmkrieger Mar 27, 2025
4e590a8
fix the clean up
jamesmkrieger Mar 27, 2025
a9e8a88
complete tests
jamesmkrieger Mar 27, 2025
2b0bca9
working tests
jamesmkrieger Mar 27, 2025
280c1cc
extend tests for norm type
jamesmkrieger Mar 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add relative LL hist
jamesmkrieger committed Mar 12, 2025
commit 537fff1f7cd4f923364d7b5b2f08547eae7ba2d4
34 changes: 31 additions & 3 deletions xmipp3/viewers/viewer_LL_matrix.py
Original file line number Diff line number Diff line change
@@ -96,14 +96,19 @@ def _defineParams(self, form):
label="Plot log likelihood matrix?",
help="Matrices are shown as heatmaps.")

form.addParam('displayRelativeLL', LabelParam, default=False,
label="Plot relative log likelihood histogram?",
help="Subtracted log likelihood is shown as a histogram.")

def _getVisualizeDict(self):
return {'displayLL': self._viewLL}
return {'displayLL': self._viewLL,
'displayRelativeLL': self._viewRelativeLL}

def _viewLL(self, paramName):
""" visualization of log likelihood matrix for all the particles and ref volumes or the range of both selected. """
""" visualization of log likelihood matrix for selected particles and ref volumes."""
partNumber1 = self.partNumber1.get() if self.partNumber1.get() != -1 else 1
partNumber2 = self.partNumber2.get() if self.partNumber2.get() != -1 else len(self.particles)
self._checkNumbers(partNumber1, partNumber2, 'particle')
self._checkNumbers(partNumber1, partNumber2, 'particle')

volNumber1 = self.volNumber1.get() if self.volNumber1.get() != -1 else 1
volNumber2 = self.volNumber2.get() if self.volNumber2.get() != -1 else len(self.refs)
@@ -156,6 +161,29 @@ def _viewLL(self, paramName):

return [plotter]

def _viewRelativeLL(self, paramName):
""" visualization of relative log likelihood histogram for for selected particles and ref volumes."""
partNumber1 = self.partNumber1.get() if self.partNumber1.get() != -1 else 1
partNumber2 = self.partNumber2.get() if self.partNumber2.get() != -1 else len(self.particles)
self._checkNumbers(partNumber1, partNumber2, 'particle')

volNumber1 = self.volNumber1.get() if self.volNumber1.get() != -1 else 1
volNumber2 = self.volNumber2.get() if self.volNumber2.get() != -1 else len(self.refs)
self._checkNumbers(volNumber1, volNumber2, 'volume')

if isinstance(self.refs, Volume):
self.refs = [self.refs]

matrix = np.load(self.protocol._getExtraPath('matrix.npy'))
matrix = np.subtract(matrix[partNumber1-1:partNumber2, volNumber1-1],
matrix[partNumber1-1:partNumber2, volNumber2-1])

plotter = EmPlotter()
_ = plt.hist(matrix, bins=100)
plt.xlabel('Relative log likelihood')

return [plotter]


def _checkNumbers(self, number1, number2, string):