diff --git a/src/SVfinder.h b/src/SVfinder.h index d5bb00c..f0845e5 100644 --- a/src/SVfinder.h +++ b/src/SVfinder.h @@ -70,7 +70,7 @@ void runWithDefinedPloidy(int ploidy, GenomeCopyNumber & sampleCopyNumber, Genom int degree,int intercept,bool logLogNorm,float minExpectedGC,float maxExpectedGC,float knownContamination,float breakPointThreshold,int breakPointType,int minCNAlength, int teloCentroFlanks, std::vector & RSS, std::vector &percentage_GenExpl,bool contaminationAdjustment,std::vector &contamination, ThreadPool * thrPool,ThreadPoolManager * thrPoolManager,std::string makePileup, float seekSubclones, - std::string outputDir,std::vector &unexplainedChromosomes, bool CompleteGenomicsData) ; + std::string myName,std::vector &unexplainedChromosomes, bool CompleteGenomicsData) ; #endif //SVFINDER_H diff --git a/src/SeekSubclones.cpp b/src/SeekSubclones.cpp index 364d21f..de87e03 100644 --- a/src/SeekSubclones.cpp +++ b/src/SeekSubclones.cpp @@ -11,19 +11,19 @@ SeekSubclones::~SeekSubclones(void) } -SeekSubclones::SeekSubclones(GenomeCopyNumber & samplecopynumber, int ploidy, std::string outputDir, float minimal_pop) { +SeekSubclones::SeekSubclones(GenomeCopyNumber & samplecopynumber, int ploidy, std::string myName, float minimal_pop) { ploidy_ = ploidy; minimal_pop_ = minimal_pop/100; - getSegmentsInfo(samplecopynumber, outputDir); + getSegmentsInfo(samplecopynumber, myName); } -void SeekSubclones::getSegmentsInfo(GenomeCopyNumber & samplecopynumber, std::string outputDir) +void SeekSubclones::getSegmentsInfo(GenomeCopyNumber & samplecopynumber, std::string myName) { string::size_type pos = 0; map::iterator it; ofstream myfile; - std::string Newfile = outputDir + "Subclones" + ".txt"; + std::string Newfile = myName + "_subclones" + ".txt"; double bonfer_correction = 0; int thresholdOnChrLengthForSubcloneDetection=20; int numberOfChromosomes = samplecopynumber.getNumberOfChromosomes(); diff --git a/src/SeekSubclones.h b/src/SeekSubclones.h index 40bbc1a..f60024e 100644 --- a/src/SeekSubclones.h +++ b/src/SeekSubclones.h @@ -17,10 +17,10 @@ class SeekSubclones { public: - SeekSubclones(GenomeCopyNumber & samplecopynumber, int ploidy, std::string outputDir, float minimal_pop); + SeekSubclones(GenomeCopyNumber & samplecopynumber, int ploidy, std::string myName, float minimal_pop); SeekSubclones(); ~SeekSubclones(void); - void getSegmentsInfo(GenomeCopyNumber & samplecopynumber, std::string outputDir); + void getSegmentsInfo(GenomeCopyNumber & samplecopynumber, std::string myName); bool SignTest(std::vector & data, float& threshold, int bonfer_correction); void EstimateSubclonalPopulation(std::vector data, float threshold, int ploidy_); bool PercentageTest(std::vector & data, float& threshold); diff --git a/src/freec b/src/freec index eec4a6f..78551f1 100644 Binary files a/src/freec and b/src/freec differ diff --git a/src/main.cpp b/src/main.cpp index 5aabdd9..8ccc2d9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -835,7 +835,17 @@ int main(int argc, char *argv[]) //If GC profile for exome is needed //sampleCopyNumber.fillCGprofile(dirWithFastaSeq); - //GCprofileFile = outputDir+"GC_profile.cnp"; + + if (!has_GCprofile || GCprofileFile=="") { + if (sampleCopyNumber.getWindowSize()==0) + GCprofileFile = outputDir+"GC_profile.targetedRegions.cnp"; + else { + stringstream ss; + ss << outputDir <<"GC_profile." < & RSS, vector &percentage_GenExpl,bool contaminationAdjustment,vector &contamination, ThreadPool * thrPool, - ThreadPoolManager * thrPoolManager, string makePileup, float seekSubclones, std::string outputDir, vector &unexplainedChromosomes, bool CompleteGenomicsData) { + ThreadPoolManager * thrPoolManager, string makePileup, float seekSubclones, std::string myName, vector &unexplainedChromosomes, bool CompleteGenomicsData) { //NORMALIZE READ COUNT: sampleCopyNumber.setPloidy(ploidy); sampleCopyNumber.setNormalContamination(knownContamination); @@ -1181,7 +1187,7 @@ void runWithDefinedPloidy(int ploidy, GenomeCopyNumber & sampleCopyNumber, Genom if (seekSubclones < 100 && seekSubclones>0) { cout << "Seeking eventual subclones..."; - SeekSubclones subc(sampleCopyNumber, ploidy, outputDir, seekSubclones); + SeekSubclones subc(sampleCopyNumber, ploidy, myName, seekSubclones); cout << "-> Done!\n"; } //Calculate RSS score diff --git a/src/version.h b/src/version.h index efffd96..81a6906 100644 --- a/src/version.h +++ b/src/version.h @@ -3,7 +3,7 @@ #define VERSION_H const double VERSION_OFFSET = 3; -const double FREEC_VERSION = 9.9; +const double FREEC_VERSION = 10.0; const double CONTROL_FREEC_VERSION = FREEC_VERSION - VERSION_OFFSET; #endif