From: <ds...@us...> - 2010-07-26 22:41:41
|
Revision: 5079 http://sashimi.svn.sourceforge.net/sashimi/?rev=5079&view=rev Author: dshteyn Date: 2010-07-26 22:41:34 +0000 (Mon, 26 Jul 2010) Log Message: ----------- Allocate the isotopic arrays on the heap and not the stack due to size. Modified Paths: -------------- trunk/trans_proteomic_pipeline/src/Quantitation/XPress/XPressPeptideParser/XPressPeptideParser.cxx Modified: trunk/trans_proteomic_pipeline/src/Quantitation/XPress/XPressPeptideParser/XPressPeptideParser.cxx =================================================================== --- trunk/trans_proteomic_pipeline/src/Quantitation/XPress/XPressPeptideParser/XPressPeptideParser.cxx 2010-07-20 23:21:22 UTC (rev 5078) +++ trunk/trans_proteomic_pipeline/src/Quantitation/XPress/XPressPeptideParser/XPressPeptideParser.cxx 2010-07-26 22:41:34 UTC (rev 5079) @@ -1281,7 +1281,7 @@ } // continue to process now.... - this->XPRESS_ANALYSIS(light); + this->XPRESS_ANALYSIS((int)light); Tag *output = new Tag("xpressratio_result", True, True); @@ -1800,11 +1800,11 @@ */ void XPressPeptideParser::XPRESS_ANALYSIS(Boolean bLightPeptide) { - validate_mzXMLfile(); // do we have a valid scan data file? int ii, ctScan, iLightStartScan, iLightEndScan, iHeavyStartScan, iHeavyEndScan, iStart, iEnd; int iNumChromatogramPoints; double dLightMass, dHeavyMass, dLightQuanValue, dHeavyQuanValue; + validate_mzXMLfile(); // do we have a valid scan data file? if (pInput_.iChargeState < 1) { @@ -1852,6 +1852,22 @@ int MAX_MS_SCAN_ = pInput_.iAnalysisLastScan; + //double dIsotopeLight[MAX_ISOTOPES+1][MAX_MS_SCAN]; /* also store monoisotopic peak */ + //double dIsotopeHeavy[MAX_ISOTOPES+1][MAX_MS_SCAN]; + + double **dIsotopeLight = new double* [MAX_ISOTOPES+1]; ; + double **dIsotopeHeavy = new double* [MAX_ISOTOPES+1]; + + for (ii=0; ii<=MAX_ISOTOPES; ii++) { + dIsotopeLight[ii] = new double[MAX_MS_SCAN]; + dIsotopeHeavy[ii] = new double[MAX_MS_SCAN]; + + memset(dIsotopeHeavy[ii], 0, sizeof(double)*MAX_MS_SCAN); + memset(dIsotopeLight[ii], 0, sizeof(double)*MAX_MS_SCAN); + + } + + double dC13diff = 1.00335483; for (n=0 ; n<=pInput_.iMinNumIsotopePeaks; n++) @@ -2236,6 +2252,17 @@ //delete dHeavyMS; //delete dHeavyFilteredMS; + for (ii=0; ii<=MAX_ISOTOPES; ii++) { + + delete [] dIsotopeLight[ii]; + delete [] dIsotopeHeavy[ii]; + } + + delete [] dIsotopeLight; + + delete [] dIsotopeHeavy; + + } /*XPRESS_ANALYSIS */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |