Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add IF file checks #704

Merged
merged 1 commit into from
Oct 6, 2020
Merged

Add IF file checks #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/include/stir/modelling/PlasmaData.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,28 @@ void PlasmaData::read_plasma_data(const std::string input_string)
if(!data_stream)
error("cannot read plasma data from file.\n");
else
data_stream >> _sample_size ;

{
// Get the first line, which should be the number of samples
std::string first_line;
if (std::getline(data_stream, first_line))
{
// replace leading/trailing whitespace
first_line.erase(std::find_if(first_line.rbegin(), first_line.rend(), std::bind1st(std::not_equal_to<char>(), ' ')).base(), first_line.end());
first_line.erase(first_line.begin(), std::find_if(first_line.begin(), first_line.end(), std::bind1st(std::not_equal_to<char>(), ' ')));
// now first, check if the first line is a single character.
// this is best done in C style, cleaner than iterating over chars
char* p;
long converted = strtol(first_line.c_str(), &p, 10);
if (*p)
error("First line of input function file ("+ input_string + ") is not number of samples");
else
_sample_size=converted;
}
else
{
error("Input function file ("+ input_string + ") is empty");
}
}
while(true)
{
float sample_time=0, blood_sample_radioactivity=0, plasma_sample_radioactivity=0;
Expand Down Expand Up @@ -192,7 +212,6 @@ PlasmaData::get_sample_data_in_frames(TimeFrameDefinitions time_frame_def)
{
if(plasma_frame_vector.size()<1) /* In case of no plasma data inside a frame, e.g. when there is large time_shift. */
{
// TODO really should write a warning or something
plasma_frame_vector.push_back(0.);
blood_frame_vector.push_back(0.);
time_frame_vector.push_back((frame_start_time+frame_end_time)*.5);
Expand Down