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

[FIX] Normalize PCA mixing matrix over time, not component #228

Merged
merged 8 commits into from
Mar 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ jobs:
source activate venv
cd /tmp/data/three-echo/
tedana -d three_echo_Cornell_zcat.nii.gz -e 14.5 38.5 62.5 \
--out-dir /tmp/data/three-echo/TED.three-echo/ --png
--out-dir /tmp/data/three-echo/TED.three-echo/ \
--tedpca kundu --png
- run:
name: Checking outputs
command: |
Expand Down
124 changes: 0 additions & 124 deletions .circleci/tedana_outputs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,130 +133,6 @@ comp_127.png
comp_128.png
comp_129.png
comp_130.png
comp_131.png
comp_132.png
comp_133.png
comp_134.png
comp_135.png
comp_136.png
comp_137.png
comp_138.png
comp_139.png
comp_140.png
comp_141.png
comp_142.png
comp_143.png
comp_144.png
comp_145.png
comp_146.png
comp_147.png
comp_148.png
comp_149.png
comp_150.png
comp_151.png
comp_152.png
comp_153.png
comp_154.png
comp_155.png
comp_156.png
comp_157.png
comp_158.png
comp_159.png
comp_160.png
comp_161.png
comp_162.png
comp_163.png
comp_164.png
comp_165.png
comp_166.png
comp_167.png
comp_168.png
comp_169.png
comp_170.png
comp_171.png
comp_172.png
comp_173.png
comp_174.png
comp_175.png
comp_176.png
comp_177.png
comp_178.png
comp_179.png
comp_180.png
comp_181.png
comp_182.png
comp_183.png
comp_184.png
comp_185.png
comp_186.png
comp_187.png
comp_188.png
comp_189.png
comp_190.png
comp_191.png
comp_192.png
comp_193.png
comp_194.png
comp_195.png
comp_196.png
comp_197.png
comp_198.png
comp_199.png
comp_200.png
comp_201.png
comp_202.png
comp_203.png
comp_204.png
comp_205.png
comp_206.png
comp_207.png
comp_208.png
comp_209.png
comp_210.png
comp_211.png
comp_212.png
comp_213.png
comp_214.png
comp_215.png
comp_216.png
comp_217.png
comp_218.png
comp_219.png
comp_220.png
comp_221.png
comp_222.png
comp_223.png
comp_224.png
comp_225.png
comp_226.png
comp_227.png
comp_228.png
comp_229.png
comp_230.png
comp_231.png
comp_232.png
comp_233.png
comp_234.png
comp_235.png
comp_236.png
comp_237.png
comp_238.png
comp_239.png
comp_240.png
comp_241.png
comp_242.png
comp_243.png
comp_244.png
comp_245.png
comp_246.png
comp_247.png
comp_248.png
comp_249.png
comp_250.png
comp_251.png
comp_252.png
comp_253.png
comp_254.png
comp_table_ica.txt
comp_table_pca.txt
dn_ts_OC.nii
Expand Down
4 changes: 2 additions & 2 deletions tedana/decomposition/eigendecomp.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ def tedpca(catd, OCcatd, combmode, mask, t2s, t2sG,
o[mask, ...] = eimum
eimum = np.squeeze(o).astype(bool)

vTmix = comp_ts.T
vTmixN = ((vTmix.T - vTmix.T.mean(0)) / vTmix.T.std(0)).T
# Normalize each component's time series
vTmixN = stats.zscore(comp_ts, axis=1).T
LGR.info('Making initial component selection guess from PCA results')
_, ct_df, betasv, v_T = model.fitmodels_direct(
catd, comp_ts.T, eimum, t2s, t2sG, tes, combmode, ref_img,
Expand Down