Commit b9d0da84 authored by Pilar Cossio's avatar Pilar Cossio

Solved Bug reading multiple Mrcs

parent 7d58213b
......@@ -72,14 +72,21 @@ int bioem_RefMap::readRefMaps(bioem_param& param, const char* filemap)
input.getline(line,511);
char tmpVals[100] = {0};
string strline(line);
// cout << "MRC File name:" << strline << "\n";
strncpy (tmpVals,line,99);
sscanf (tmpVals,"%99c",mapname);
// Check for last line
strncpy (tmpm,mapname,3);
if(strcmp(tmpm,"XXX")!=0)
{
indifile = mapname;
indifile=strline.c_str();
cout << "FILE Name: " << indifile << "\n";
//Reading Multiple MRC
read_MRC(indifile,param);
}
......@@ -292,7 +299,7 @@ void bioem_Probability::init(size_t maps, size_t angles, size_t cc, bioem& bio)
nAngles = angles;
nCC = cc;
ptr = bio.malloc_device_host(get_size(maps, angles, cc, bio.param.param_device.writeAngles, bio.param.param_device.writeCC));
cout << "INI " << maps << " " << angles << " " << cc << " " << get_size(maps, angles, cc, bio.param.param_device.writeAngles, bio.param.param_device.writeCC)<< "\n";
cout << "Allocation #Maps " << maps << " #Angles " << angles << " #cross.cor " << cc << "== " << get_size(maps, angles, cc, bio.param.param_device.writeAngles, bio.param.param_device.writeCC)<< "\n";
set_pointers();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment