Merge pull request #1143 from nipreps/fix/changing-metrics

MAINT: Refresh cached intermediate results
nipreps · Sep 13, 2023 · f360d1e · f360d1e
2 parents d61bd8d + dee8b28
commit f360d1e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -359,8 +359,9 @@ jobs:
             - data-v2-
       - restore_cache:
           keys:
-            - t1w-v5-{{ epoch }}
-            - t1w-v5-
+            - t1w-v6-{{ .Branch }}
+            - t1w-v6-master
+            - t1w-v6-
 
       - run:
           name: Remove old, cached configs
@@ -397,7 +398,7 @@ jobs:
           path: /tmp/t1w/misc
 
       - save_cache:
-          key: t1w-v5-{{ epoch }}
+          key: t1w-v6-{{ .Branch }}
           paths:
             - /tmp/t1w/work
 
@@ -519,8 +520,9 @@ jobs:
             - data-v2-
       - restore_cache:
           keys:
-            - bold-v4-{{ epoch }}
-            - bold-v4-
+            - bold-v5-{{ .Branch }}
+            - bold-v5-master
+            - bold-v5-
 
       - run:
           name: Remove old, cached configs
@@ -555,7 +557,7 @@ jobs:
           path: /tmp/bold/misc
 
       - save_cache:
-          key: bold-v4-{{ epoch }}
+          key: bold-v5-{{ .Branch }}
           paths:
             - /tmp/bold/work
 

diff --git a/mriqc/data/testdata/group_T1w.tsv b/mriqc/data/testdata/group_T1w.tsv
@@ -1,5 +1,5 @@
 bids_name	cjv	cnr	efc	fber	fwhm_avg	fwhm_x	fwhm_y	fwhm_z	icvs_csf	icvs_gm	icvs_wm	inu_med	inu_range	qi_1	qi_2	rpve_csf	rpve_gm	rpve_wm	size_x	size_y	size_z	snr_csf	snr_gm	snr_total	snr_wm	snrd_csf	snrd_gm	snrd_total	snrd_wm	spacing_x	spacing_y	spacing_z	summary_bg_k	summary_bg_mad	summary_bg_mean	summary_bg_median	summary_bg_n	summary_bg_p05	summary_bg_p95	summary_bg_stdv	summary_csf_k	summary_csf_mad	summary_csf_mean	summary_csf_median	summary_csf_n	summary_csf_p05	summary_csf_p95	summary_csf_stdv	summary_gm_k	summary_gm_mad	summary_gm_mean	summary_gm_median	summary_gm_n	summary_gm_p05	summary_gm_p95	summary_gm_stdv	summary_wm_k	summary_wm_mad	summary_wm_mean	summary_wm_median	summary_wm_n	summary_wm_p05	summary_wm_p95	summary_wm_stdv	tpm_overlap_csf	tpm_overlap_gm	tpm_overlap_wm	wm2max
-sub-50137_T1w	0.5946364030347385	1.6705988220313406	0.6960134252231684	7632.404958677686	4.202703333333333	4.04437	4.57298	3.99076	0.2607070742917811	0.38396092314479024	0.3553320025634285	0.6877774000167847	0.38117922544479355	0.0	0.002295668304182044	5.081432626162044	4.991782430776381	5.114091002400782	208	256	176	2.2951325004992604	4.936353477427729	5.434675057986866	9.07253919603361	10.199045584302324	14.572319191529168	15.232386344514095	20.925794257710795	1.0	1.0	1.0	338.4370104980457	0.0	7.295875806489531	0.0	2905640.0	0.0	43.55016700923443	29.428849400342717	1.903743377653055	147.99168233119116	442.87693678889445	458.14303178340197	468168.6393911941	108.32414958626032	741.2191173434258	199.61485552173647	-0.43557073499837085	93.58211707175519	663.6434283040721	654.591298699379	689503.5873361042	459.91496443748474	911.4427809789777	132.60614885246827	2.0117351281983806	76.12668787371726	923.2319039154182	939.9905848503113	638092.7737545212	724.9960894882679	1062.2933142632246	103.60824329073633	0.2406811374858812	0.5351042169358428	0.549711129303519	0.405317758120108
-sub-50152_T1w	0.5389448521321344	1.951832110632953	0.6407575000929345	6400.0	3.538223004967018	3.5068090149010525	3.72369	3.38417	0.24581070515371412	0.39994911569375136	0.3542401791525344	0.6055886149406433	0.29949661493301377	0.0	0.007373185025089607	5.3317928277705136	5.260562667625682	5.373010998628089	160	239	200	2.859771605234868	7.654488968704144	6.401109684774777	8.68906848038532	25.078592655941325	31.375238888142178	33.547277021352265	44.18799951997329	1.100000023841858	1.0	1.0	6.414540030448748	0.0	7.886303632707387	0.0	2096437.0	0.0	38.88384077697992	14.240638115831892	0.04184774685015302	176.6526273457668	525.277949354461	545.1310024410486	343748.8186203772	191.50386236608028	807.6631854474545	190.62019096981507	-0.5752850710339215	70.2793420517636	686.4136575956873	682.0006075128913	559300.441947877	546.0775418952107	840.110557936132	89.09804437765503	-0.3790885336436278	79.82206421534173	933.7240992117161	960.5103765055537	495379.73952520755	712.4791779369116	1076.101774647832	110.5422761029612	0.24458913017627987	0.5240078354587275	0.534175557705883	0.47523509797309954
-sub-50785_T1w	0.7462348936737846	1.3384000692729365	0.7530480076783985	-1.0	3.499472057939973	3.46213	3.7065461738199192	3.32974	0.26652116229801986	0.3772997886870599	0.35617904901492026	0.9645677804946899	0.27349820435047145	0.0	0.0009944221999575347	7.277619985914051	7.159163031906821	7.30470686003244	256	180	256	2.3315218639714548	3.6975246632030516	3.8881798392340765	5.635492990527722	6.229615920210668	8.968627139000166	9.61189448660999	13.637440400619134	1.0	0.9999875426292419	1.0	579.384989482046	0.0	2.7983003899529795	0.0	5091436.0	0.0	0.0	41.35426782549021	0.42896562817136985	119.23098496445634	386.216226576264	393.23292861506343	422567.70370231196	97.09253230690956	657.3769222311676	168.65913607823262	-0.21950911347902347	105.7205633958213	571.9650741568756	566.1279219612479	598206.5511727771	329.8122172765434	835.4616258479655	153.109850600149	0.8381371141597027	114.20244240752042	846.6359659267068	860.8380831554532	564719.74514658	578.6322632431984	1077.089632384479	152.75279774464403	0.24122428647139732	0.5360100491712251	0.5573704873348334	0.34931847577355485
-sub-51187_T1w	0.7051518353945694	1.215726053025216	0.6068733970705135	4668.127902703064	3.5394978356516567	4.25443345257453	2.965211919410108	3.398848134970332	0.2607189196731251	0.3850319288883145	0.35424915143856045	0.8645452558994293	0.659174335002899	0.0	0.002621822353053779	6.231531509930732	6.101578640123206	6.23860156813424	256	132	256	1.9068147296421873	3.490092089821521	3.4894459153244077	5.071430926509515	5.401224044545881	7.612318350917183	8.178972191748775	11.523374179783266	0.8593999743461609	1.5000007152557373	0.8593999743461609	643.420315158402	0.0	12.502871617173104	0.0	2453296.0	0.0	63.80114300921559	49.546339902331766	17.383575114497404	203.01221375156962	394.8127140206175	408.4811688065529	352493.0222813282	37.886436089873314	722.4866435565054	214.2214359050029	19.093366757493296	103.00303682268894	585.9201437803881	575.7007433250546	520564.7079959175	332.4198212251067	879.8980544172227	164.95272203442693	10.128701373968426	105.56920244595317	841.1839217378181	871.4841885343194	478946.2697518447	541.1317743547261	1057.166188761592	171.84169347257236	0.23964798460924375	0.5492138840500247	0.5613043528545612	0.3146424394881272
+sub-50137_T1w	0.5954143604542232	1.6638579105552882	0.696013425223169	7632.404958677687	4.202703333333333	4.04437	4.57298	3.99076	0.26024785652744636	0.38408797703315845	0.35566416643939525	0.6877774000167847	0.38117922544479355	0.0	0.002295668304182044	5.081276724413724	4.990756260234296	5.113134802367116	208	256	176	2.2937107725306363	4.917917779273032	5.414127031616626	9.030752543046212	10.197292417890393	14.569689441911478	15.229464400494718	20.921411341682283	1.0	1.0	1.0	338.43701049804054	0.0	7.293577983070605	0.0	2905640.0	0.0	43.53645095974207	29.419580835323824	1.8447784153324047	148.1785165093192	442.67347918309935	457.92001267150044	467343.9921919382	108.17194144427776	741.1431271880865	199.64135332045623	-0.35434565463924894	93.55264354645082	663.4221231418237	654.2670446671546	689731.7462465676	459.0615651831031	912.2579122893512	133.037313704897	2.017341484779524	76.27779483169759	922.4739051832804	939.4977170489728	638689.2620031061	723.2325619198382	1061.9193829484284	104.03307776196522	0.24142527697392707	0.5351267249526063	0.5492788818473785	0.4052328641526733
+sub-50152_T1w	0.539219705574777	1.9474863519286423	0.6407575000929341	6400.0	3.538223004967018	3.5068090149010525	3.72369	3.38417	0.24603987215843207	0.3997439898531474	0.3542161379884206	0.6055886149406433	0.29949661493301377	0.0	0.007373185025089607	5.331492928503499	5.259937594008643	5.372550867202498	160	239	200	2.8606218342450362	7.6336456345923995	6.389366594664442	8.673832315155893	25.101236197040226	31.375238888160823	33.55424426478266	44.186257709146936	1.100000023841858	1.0	1.0	6.414540030448752	0.0	7.885408184004529	0.0	2096437.0	0.0	38.87942571938038	14.239021165535616	0.04906040355413355	177.41835136541522	525.5333175241614	545.5612502843142	344069.29238630924	191.59568993747234	808.0636241286993	190.7139388176008	-0.5716823144664929	70.32748948461413	686.3957146724873	681.9231698960066	559013.587992302	545.7505366802216	840.583026945591	89.3311783915161	-0.37782611205030214	79.81300083569138	933.452586370995	960.363458275795	495346.1196362858	711.8304204493761	1075.9795888960361	110.71951289754341	0.24415403242557018	0.5240272610492305	0.5342199967075586	0.4752163650668765
+sub-50785_T1w	0.7461341169008633	1.3397828655659076	0.7530480076783983	-1.0	3.499472057939973	3.46213	3.7065461738199192	3.32974	0.2670508857178007	0.3771657734932426	0.35578334078895674	0.9645677804946899	0.27349820435047145	0.0	0.0008989212653515643	7.277978198643724	7.159746223301595	7.305039410577692	256	180	256	2.3324453804558374	3.7071785736699265	3.8942598735683753	5.643155666579362	6.224456192836066	8.970749163248403	9.610299796084766	13.63569403216983	1.0	0.9999875426292419	1.0	579.4582204165845	0.0	2.7989928403802895	0.0	5080237.0	0.0	0.0	41.37895519541185	0.4214879703475489	118.70755566859489	386.1200298164586	393.141785312444	423407.57698828075	97.19213696569204	657.170887414366	168.55328075295242	-0.22318958644717712	105.67941658296553	572.463234916038	566.5999136902392	597994.0708619782	330.8538051880896	835.5335811562836	152.83845347074578	0.8425022802147404	114.1628559875614	847.082864043662	861.2416779398918	564092.3521048883	579.310912258923	1077.3695249855518	152.6168983168376	0.24019729935470005	0.5355084318272595	0.5571234404197298	0.3494179683613571
+sub-51187_T1w	0.6999440574229334	1.229109740105771	0.6068733970705132	4668.127902703063	3.5394978356516567	4.25443345257453	2.965211919410108	3.398848134970332	0.2632767380846025	0.38411410306597654	0.352609158849421	0.8645452558994293	0.659174335002899	0.0	0.002621822353053779	6.232708393405123	6.104914216952696	6.241270182398587	256	132	256	1.9045372860088077	3.542878319529499	3.517728319831832	5.105769353957191	5.3904165105611055	7.623761622201767	8.185965301979987	11.543717773177091	0.8593999743461609	1.5000007152557373	0.8593999743461609	643.4203151583965	0.0	12.526359964354464	0.0	2453296.0	0.0	63.92100214585662	49.63941944985638	19.631055549488405	198.10879423073186	395.1546922405064	408.42967384681106	355951.2030053217	38.246628262102604	723.3140679895878	214.45056661846712	18.305382974842022	102.98229317978202	587.9801981000472	577.6493276059628	519323.80381326505	337.8612728342414	879.2389240153134	163.04504963273772	10.92217792214386	104.91053306594992	844.5959841770807	874.6628160998225	476728.99321174936	544.9421983994544	1059.6339149996638	171.30854100624651	0.23533804206716807	0.5463730577598676	0.5594191519575634	0.31519791549296117