@@ -62,24 +62,24 @@ if [ ! -f "${ROOT}/${C}/id_dig/pairwise_interaction_results.csv" ] \
6262 -o " ${ROOT} /${C} /id_dig" -k 100 >> " $LOGF " 2>&1 || log " STAGE-FAIL id_dig"
6363fi
6464
65- # 4. MutSig2CV (Docker, slow) + its identify -- skipped when SKIP_MUTSIG set --
65+ # 4. MutSig2CV (Octave-patched source -> PROPER per-sample lambda) + identify --
66+ # Replaces the old Docker compiled binary + scalar-f_p reconstruction. Skipped
67+ # when SKIP_MUTSIG is set. MUTSIG_ROOT holds the per-cohort lambda dumps.
68+ MUTSIG_ROOT=" ${MUTSIG_ROOT:- output/ mutsigsrc} "
6669if [ -n " ${SKIP_MUTSIG:- } " ]; then
6770 log " skip mutsig (SKIP_MUTSIG set)"
6871else
69- if [ ! -f " ${ROOT} /${C} _mutsig/results.mat" ]; then
70- log " MutSig2CV (Docker, emulated)"
71- mkdir -p " ${ROOT} /${C} _mutsig"
72- docker run --rm -v " ${PWD} :/work" -w /work/external/MutSig2CV/mutsig2cv \
73- -e LD_LIBRARY_PATH=" $LDP " -e MCR_CACHE_ROOT=" /tmp/mcr_${C} " \
74- flywheel/matlab-mcr:v81 \
75- ./MutSig2CV " /work/${MAF} " " /work/${ROOT} /${C} _mutsig" >> " $LOGF " 2>&1 \
72+ if [ ! -f " ${MUTSIG_ROOT} /${C} /persample_lambda.f32" ]; then
73+ log " MutSig2CV (Octave-patched, per-sample lambda)"
74+ bash scripts/run_mutsig_octave.sh " $C " " $MAF_DIR " " $MUTSIG_ROOT " >> " $LOGF " 2>&1 \
7675 || log " STAGE-FAIL mutsig"
77- else log " skip mutsig (done)" ; fi
76+ else log " skip mutsig (lambda done)" ; fi
7877 if [ ! -f " ${ROOT} /${C} /id_mutsig/pairwise_interaction_results.csv" ] \
79- && [ -f " ${ROOT} /${C} _mutsig/results.mat" ]; then
80- log " identify mutsig (per-sample extractor)"
81- " $PY " -m analysis.mutsig_persample_co --cohort " $C " --results-root " $ROOT " -k 100 \
82- >> " $LOGF " 2>&1 || log " STAGE-FAIL id_mutsig"
78+ && [ -f " ${MUTSIG_ROOT} /${C} /persample_lambda.f32" ]; then
79+ log " identify mutsig (proper per-sample lambda)"
80+ " $PY " -m analysis.mutsig_lambda_co --cohort " $C " --results-root " $ROOT " \
81+ --mutsig-root " $MUTSIG_ROOT " --suffix mutsig -k 100 >> " $LOGF " 2>&1 \
82+ || log " STAGE-FAIL id_mutsig"
8383 fi
8484fi
8585log " cohort pipeline DONE"
0 commit comments