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

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2023-05-17 10:00:49 +02:00
commit d664f5d877
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindFFTW3.cmake
View File

@ -75,7 +75,7 @@ endfunction()
#as35 endif() #as35 endif()
find_path(FFTW3_INCLUDE NAMES fftw3.h find_path(FFTW3_INCLUDE NAMES fftw3.h
HINTS "/usr/include" "/opt/local/include" HINTS "/usr/include" "/opt/local/include" "/app/include"
) )
find_library(FFTW3_LIBRARY fftw3) find_library(FFTW3_LIBRARY fftw3)

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;

2
src/classes/PStartupHandler.cpp
View File

@ -703,6 +703,8 @@ Bool_t PStartupHandler::WriteDefaultStartupFile()
fout << " <!-- LEM/PSI -->" << std::endl; fout << " <!-- LEM/PSI -->" << std::endl;
fout << " <run_name_template inst=\"lem\">%yyyy%/lem%yy%_his_%rrrr%.root</run_name_template>" << std::endl; fout << " <run_name_template inst=\"lem\">%yyyy%/lem%yy%_his_%rrrr%.root</run_name_template>" << std::endl;
fout << " <run_name_template inst=\"lem\">d%yyyy%/tdc/lem%yy%_his_%rrrr%.root</run_name_template>" << std::endl; fout << " <run_name_template inst=\"lem\">d%yyyy%/tdc/lem%yy%_his_%rrrr%.root</run_name_template>" << std::endl;
fout << " <run_name_template inst=\"lem\">%yyyy%/lem%yy%_his_%rrrrr%.root</run_name_template>" << std::endl;
fout << " <run_name_template inst=\"lem\">d%yyyy%/tdc/lem%yy%_his_%rrrrr%.root</run_name_template>" << std::endl;
fout << " <fourier_settings>" << std::endl; fout << " <fourier_settings>" << std::endl;
fout << " <units>Gauss</units>" << std::endl; fout << " <units>Gauss</units>" << std::endl;
fout << " <fourier_power>0</fourier_power>" << std::endl; fout << " <fourier_power>0</fourier_power>" << std::endl;