From: <ro...@us...> - 2010-11-09 10:58:39
|
Revision: 1726 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1726&view=rev Author: ron-fox Date: 2010-11-09 10:58:33 +0000 (Tue, 09 Nov 2010) Log Message: ----------- 1. Fix typo in counter data stuff was \n\n needed to be \r\n 2. Add space after text in each comment line because LNLL data analysis seems to cut it off otherwise. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-08 12:03:11 UTC (rev 1725) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-09 10:58:33 UTC (rev 1726) @@ -199,7 +199,7 @@ char firstTimeComment[80]; double firstNeutron = startDelay(); - sprintf(firstTimeComment, "\r\nFirst neutron at %f uSec\r\n", firstNeutron); + sprintf(firstTimeComment, " \r\nFirst neutron at %f uSec \r\n", firstNeutron); comment += firstTimeComment; writeMultiplicityData(filename, comment); @@ -692,7 +692,7 @@ - out << "***** Counter Data *****\n\n"; + out << "***** Counter Data *****\r\n"; out << num << ",\t\tTotal number of multplet entries\r\n"; out << gate+1 << ",\t\tgate\r\n"; out << gateWidthUsec << ",\t\tgate-width (microseconds)\r\n\r\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-11-10 10:46:25
|
Revision: 1727 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1727&view=rev Author: ron-fox Date: 2010-11-10 10:46:19 +0000 (Wed, 10 Nov 2010) Log Message: ----------- Fix small formatting errors in files. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-09 10:58:33 UTC (rev 1726) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-10 10:46:19 UTC (rev 1727) @@ -623,7 +623,7 @@ << binWidthSec << " X " << cycles << " = " << m_bins * binWidthSec * cycles << " seconds\r\n"; - out << "\n\n"; + out << "\r\n"; out << "Average count rate for the largest gate (" << (m_bins*m_minTime)*1000 << " microsseconds)\r\n\r\n"; @@ -692,7 +692,7 @@ - out << "***** Counter Data *****\r\n"; + out << "***** Counter Data *****\r\n\r\n"; out << num << ",\t\tTotal number of multplet entries\r\n"; out << gate+1 << ",\t\tgate\r\n"; out << gateWidthUsec << ",\t\tgate-width (microseconds)\r\n\r\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-11-11 10:11:20
|
Revision: 1728 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1728&view=rev Author: ron-fox Date: 2010-11-11 10:11:14 +0000 (Thu, 11 Nov 2010) Log Message: ----------- More typo fixes. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-10 10:46:19 UTC (rev 1727) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-11 10:11:14 UTC (rev 1728) @@ -565,7 +565,7 @@ localtime_r(&epochTime, &brokenDownTime); strftime(timeStamp, sizeof(timeStamp), - "%D, %R:%S, data stored", + "%m/%d/%Y, %R:%S, data stored", &brokenDownTime); // The filename must have '/'s replaced by '\'s. @@ -608,7 +608,7 @@ out << startDelayuSec << ",\t\tstart delay (microseconds) \r\n"; out << ((double)m_minTime/1000.0) << ",\t\tbin width (microseconds)\r\n"; out << (int)((double)m_bins) << ",\t\tbins\r\n"; - out << cycles << ",\t\ttotal number of cyclees\r\n"; + out << cycles << ",\t\ttotal number of cycles\r\n"; out << "\r\n"; @@ -626,7 +626,7 @@ out << "\r\n"; out << "Average count rate for the largest gate (" - << (m_bins*m_minTime)*1000 << " microsseconds)\r\n\r\n"; + << (m_bins*m_minTime)/1000 << " microseconds)\r\n\r\n"; // Need to sum total counts and counts in first 20 bins // There's an implicit assumption that there are at least 20 bins in a cycle. @@ -650,12 +650,12 @@ double averageRate20 = (double)total20/runLengthSec; out << "Average Count Rate = Total Count (gate " << (int)((double)lastgate + 1) // Number gates from 1. - << " / Total Run Time (sec)\r\n"; + << ") / Total Run Time (sec)\r\n"; out << "Average Count Rate = " << totalCounts << " / " << (double)runLengthSec << " = " << averageRate << "\r\n" << "\r\n"; - out << "Average Count Rate for the twentieth gate ( " - << (double)m_minTime * 20.0 * 1000.0 << " microseconds)\r\n\r\n"; + out << "Average Count Rate for the twentieth gate (" + << (double)m_minTime * 20.0 / 1000.0 << " microseconds)\r\n\r\n"; out << "Average Count Rate = Total Count (gate 20) / Total Run Time (sec)\r\n"; out << "Average Count Rate = " << total20 << " / " @@ -693,7 +693,7 @@ out << "***** Counter Data *****\r\n\r\n"; - out << num << ",\t\tTotal number of multplet entries\r\n"; + out << num << ",\t\tTotal number of multiplet entries\r\n"; out << gate+1 << ",\t\tgate\r\n"; out << gateWidthUsec << ",\t\tgate-width (microseconds)\r\n\r\n"; out << "Multiplet No.,\tData\r\n\r\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-11-12 11:36:42
|
Revision: 1731 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1731&view=rev Author: ron-fox Date: 2010-11-12 11:36:36 +0000 (Fri, 12 Nov 2010) Log Message: ----------- One more little syntax error to fix in the output file format. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-11 10:45:08 UTC (rev 1730) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-12 11:36:36 UTC (rev 1731) @@ -623,7 +623,7 @@ << binWidthSec << " X " << cycles << " = " << m_bins * binWidthSec * cycles << " seconds\r\n"; - out << "\r\n"; + out << "\r\n\r\n"; out << "Average count rate for the largest gate (" << (m_bins*m_minTime)/1000 << " microseconds)\r\n\r\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2010-11-17 10:24:03
|
Revision: 1732 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1732&view=rev Author: ron-fox Date: 2010-11-17 10:23:57 +0000 (Wed, 17 Nov 2010) Log Message: ----------- Fix typo in assert that caused crashes. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-12 11:36:36 UTC (rev 1731) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2010-11-17 10:23:57 UTC (rev 1732) @@ -753,7 +753,7 @@ // Make sure we got this right:' assert(gate <= m_Histogram.size()); - assert(multiplicity <= m_Histogram[multiplicity].size()); + assert(multiplicity <= m_Histogram[gate].size()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2011-01-17 10:29:53
|
Revision: 1788 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1788&view=rev Author: ron-fox Date: 2011-01-17 10:29:47 +0000 (Mon, 17 Jan 2011) Log Message: ----------- getGateMultiplicities...gates are progressively wider..therefore must sum the bins to get the gate multiplicities. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2011-01-14 12:08:06 UTC (rev 1787) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2011-01-17 10:29:47 UTC (rev 1788) @@ -1042,11 +1042,16 @@ { vector<unsigned> result; if (gate < m_Histogram.size()) { - for (int n = 0; n < m_Histogram[gate].size(); n++) { - result.push_back(m_Histogram[gate][n]); + for (int bin = 0; bin < gate; bin++) { // sum over previous bins to make the gate width. + for (int n = 0; n < m_Histogram[bin].size(); n++) { + while (result.size() <= n) { + result.push_back(0); + } + result[n] += m_Histogram[bin][n]; + } } } - return result; + return result; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2011-03-30 09:56:07
|
Revision: 1849 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1849&view=rev Author: ron-fox Date: 2011-03-30 09:56:01 +0000 (Wed, 30 Mar 2011) Log Message: ----------- Get y3f computation correct. Modified Paths: -------------- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp Modified: branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp =================================================================== --- branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2011-03-30 09:38:55 UTC (rev 1848) +++ branches/LLNLMadcChainSpecTcl/CMultiplicity.cpp 2011-03-30 09:56:01 UTC (rev 1849) @@ -57,7 +57,9 @@ static inline double binomial(int n, int m) { - return factorial(n)/(factorial(m)*factorial(n-m)); + if (n < m) return 0.0; // can't choose 2 things 3 at a time e.g. + + return (double)(int)(factorial(n)/(factorial(m)*factorial(n-m))); } /*! @@ -1110,6 +1112,9 @@ for (int i =0; i < multiplicities.size(); i++) { norm += multiplicities[i]; } +#ifdef DEBUG + cout << "nbks(" << gate << ") = " << norm << endl; +#endif return norm; } @@ -1133,6 +1138,9 @@ } if (norm == 0.0) return 0.0; double cbar = numerator/norm; // Really the centroid of the multiplicity distribution. +#ifdef DEBUG + cout << "cbar(" << gate << ") = " << cbar << endl; +#endif return cbar; } @@ -1151,7 +1159,9 @@ double coef = binomial(i,2); ps += coef*mult[i]; } - +#ifdef DEBUG + cout << "Pairs(" << gate << ") = " << ps/nbks(gate) << endl; +#endif return ps/nbks(gate); } @@ -1170,6 +1180,9 @@ double coef = binomial(i,3); ts += coef*mult[i]; } +#ifdef DEBUG + cout << "triples(" << gate << ") = " << ts/nbks(gate) << endl; +#endif return ts/nbks(gate); } /** @@ -1215,8 +1228,9 @@ double y3 = ts - cb*ps + cb*cb*cb/3.0; double y3f = y3/cb; +#ifdef DEBUG cout << gate << " : " << y3f << endl; - +#endif return y3f; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |