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

AA35 will not do anything anyway, therefore:

Browse Source 
changed the type of the PSI-BIN bin_width member from float to double.
This commit is contained in:
Bastian M. Wojek
2011-02-09 17:53:15 +00:00
parent 507c36b4d8
commit 8369690dc3
3 changed files with 106 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,11 +408,11 @@ int MuSR_td_PSI_bin::readbin(const char * fileName)
}
dum_Float32 = (Float32 *) &buffer_file[1012];
bin_width = *dum_Float32;
bin_width = static_cast<double>(*dum_Float32);
if (bin_width == 0.)
{
bin_width=(625.E-6)/8.*pow(Float32(2.),Float32(tdc_resolution));
bin_width=0.125*(625.E-6)*pow(static_cast<double>(2.0),static_cast<double>(tdc_resolution));
}
default_binning = 1;
@ -702,7 +702,7 @@ int MuSR_td_PSI_bin::writebin(const char *fileName)
strncpy(buffer+948+i*4, labels_histo[i], 4);
}
// write TDS time resolution
dum_Float32 = (Float32)bin_width;
dum_Float32 = static_cast<Float32>(bin_width);
memcpy(buffer+1012, (const char*)&dum_Float32, 4);
// write header information
@ -3396,7 +3396,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
double MuSR_td_PSI_bin::get_binWidth_ps()
{
return double((double)bin_width*(double)1000000.);
return bin_width*1.0e6;
}
//*******************************
@ -3410,7 +3410,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
void MuSR_td_PSI_bin::put_binWidth_ps(double binWidth)
{
bin_width = (float)(binWidth/1.0e6);
bin_width = binWidth*1.0e-6;
}
//*******************************
@ -3422,7 +3422,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
double MuSR_td_PSI_bin::get_binWidth_ns()
{
return double((double)bin_width*(double)1000.);
return bin_width*1.0e3;
}
//*******************************
@ -3436,7 +3436,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
void MuSR_td_PSI_bin::put_binWidth_ns(double binWidth)
{
bin_width = (float)(binWidth/1.0e3);
bin_width = binWidth*1.0e-3;
}
//*******************************
@ -3448,7 +3448,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
double MuSR_td_PSI_bin::get_binWidth_us()
{
return double(bin_width);
return bin_width;
}
//*******************************
@ -3462,7 +3462,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
void MuSR_td_PSI_bin::put_binWidth_us(double binWidth)
{
bin_width = (float)binWidth;
bin_width = binWidth;
}
//*******************************
@ -4253,7 +4253,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
for (unsigned int i=0; i<scalersName.size(); i++) {
strncpy(labels_scalers[i], scalersName[i].c_str(), MAXLABELSIZE-1);
labels_scalers[i][MAXLABELSIZE] = '\0';
labels_scalers[i][MAXLABELSIZE-1] = '\0';
}
return 0;
@ -4540,7 +4540,7 @@ double * MuSR_td_PSI_bin::get_histo_array(int histo_num, int binning)
strcpy(date_stop, " ");
strcpy(time_stop, " ");
bin_width = 0.f;
bin_width = 0.;
number_histo = 0;
length_histo = 0;
total_events = 0;

2
src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.h vendored
View File

@ -82,7 +82,7 @@ class MuSR_td_PSI_bin {
char time_start[9];
char time_stop[9];
float bin_width;
double bin_width;
int number_histo;
int length_histo;