Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
MPIBP-Hummer
BioEM
Commits
b9d0da84
Commit
b9d0da84
authored
Nov 26, 2014
by
Pilar Cossio
Browse files
Solved Bug reading multiple Mrcs
parent
7d58213b
Changes
1
Hide whitespace changes
Inline
Side-by-side
map.cpp
View file @
b9d0da84
...
...
@@ -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
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment