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 2021-04-19 16:25:53 +02:00
commit 939d4fb7b5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp vendored
View File

@ -116,6 +116,13 @@ MuSR_td_PSI_bin::MuSR_td_PSI_bin()
file_name.close(); file_name.close();
delete [] buffer_file; delete [] buffer_file;
if (format_id[0] == '1') {
if (format_id[1] != 'N') {
std::cout << "**WARNING** found '" << format_id << "'. Will change it to '1N'" << std::endl;
format_id[1] = 'N';
}
}
// file may either be PSI binary format // file may either be PSI binary format
if (strncmp(format_id,"1N",2) == 0) if (strncmp(format_id,"1N",2) == 0)
{ {
@ -306,6 +313,9 @@ int MuSR_td_PSI_bin::readbin(const char * fileName)
strncpy(format_id,buffer_file,2); strncpy(format_id,buffer_file,2);
format_id[2] = '\0'; format_id[2] = '\0';
if (format_id[1] != 'N') // the warning is already issued in read()
format_id[1] = 'N';
if (strcmp(format_id,"1N") != 0) if (strcmp(format_id,"1N") != 0)
{ {
file_name.close(); file_name.close();