LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

allow more flexible dealing with LEM run numbers > 9999.

Browse Source
This commit is contained in:
suter_a 2023-05-16 08:27:52 +02:00
parent 95715dd62d
commit 1850a2c762
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/classes/PMsr2Data.cpp
View File

@ -213,11 +213,12 @@ int PMsr2Data::DetermineRunNumberDigits(unsigned int runNo, bool normalMode) con
*/ */
int PMsr2Data::CheckRunNumbersInRange() const int PMsr2Data::CheckRunNumbersInRange() const
{ {
double max(pow(static_cast<double>(10), static_cast<int>(fRunNumberDigits)) - 1.0); // since 2023, we encounter in LEM run numbers > 9999, hence this check has been loosened
// by replacing static_cast<int>(fRunNumberDigits)) by static_cast<int>(fRunNumberDigits+1)).
double max(pow(static_cast<double>(10), static_cast<int>(fRunNumberDigits+1)) - 1.0);
unsigned int max_UInt; unsigned int max_UInt;
max > static_cast<double>(std::numeric_limits<unsigned int>::max()) ? max_UInt = std::numeric_limits<unsigned int>::max() max > static_cast<double>(std::numeric_limits<unsigned int>::max()) ? max_UInt = std::numeric_limits<unsigned int>::max()
: max_UInt = static_cast<unsigned int>(max); : max_UInt = static_cast<unsigned int>(max);
for (std::vector<unsigned int>::const_iterator iter(fRunVector.begin()); iter != fRunVector.end(); ++iter) { for (std::vector<unsigned int>::const_iterator iter(fRunVector.begin()); iter != fRunVector.end(); ++iter) {
if (*iter > max_UInt) { if (*iter > max_UInt) {
return -1; return -1;