Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pyhst2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
myron
pyhst2
Commits
aecf6f8c
Commit
aecf6f8c
authored
May 24, 2019
by
Pierre Paleo
Committed by
Alessandro Mirone
Jun 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scrivere parte immaginaria in edf
corrige' a deux endroit passage en argument du semaphore
parent
0eccb5ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
PyHST/Cspace/CCspace.c
PyHST/Cspace/CCspace.c
+8
-1
PyHST/Cspace/edftools.c
PyHST/Cspace/edftools.c
+1
-1
compila
compila
+1
-1
No files found.
PyHST/Cspace/CCspace.c
View file @
aecf6f8c
...
...
@@ -6415,7 +6415,7 @@ void CCspace_read_chunk (CCspace * self , int sn, int ntok , int npbunches,
pos_s_
[
2
*
sn_nb
],
pos_s_
[
2
*
sn_nb
+
1
],
size_s_
[
2
*
sn_nb
+
0
],
size_s_
[
2
*
sn_nb
+
1
],
rotation_vertical
,
binning
,
&
(
self
->
filereading_sem
)
binning
);
}
else
{
fprintf
(
stderr
,
"file type MUST be either edf or h5, reading ffs
\n
"
);
...
...
@@ -7236,6 +7236,13 @@ void Paganin(CCspace * self, float * RawptrA,
sprintf
(
output_name
,
"%s_%04d.edf"
,
self
->
params
.
OUTPUT_PAGANIN_FILE
,
(
int
)
mystart
+
npj
-
pstart
);
if
(
self
->
params
.
verbosity
>
0
)
printf
(
" writing projection on %s
\n
"
,
output_name
);
write_data_to_edf
(
Rawptr
,
Size0
,
Size1
,
output_name
);
if
(
npj
+
1
<=
pend
-
1
)
{
char
output_name
[
1000
];
sprintf
(
output_name
,
"%s_%04d.edf"
,
self
->
params
.
OUTPUT_PAGANIN_FILE
,
(
int
)
mystart
+
npj
+
1
-
pstart
);
if
(
self
->
params
.
verbosity
>
0
)
printf
(
" writing projection on %s
\n
"
,
output_name
);
write_data_to_edf
(
Rawptr
+
proj_step
,
Size0
,
Size1
,
output_name
);
}
}
}
...
...
PyHST/Cspace/edftools.c
View file @
aecf6f8c
...
...
@@ -686,7 +686,7 @@ void read_data_from_edf_eli( char * filename,
float
*
ffcorr
,
float
*
currents
,
float
curr
,
sem_t
*
semaforo_pt
sem_t
*
semaforo_pt
r
)
{
long
int
i
,
j
,
nbytes
,
n1
,
n2
,
k
,
l
;
char
bsw
;
...
...
compila
View file @
aecf6f8c
...
...
@@ -2,7 +2,7 @@ export TD=~/packages/
# export TD=/tmp_14_days/mirone/
mkdir $TD
rm ${TD}/scripts/PyHST
python setup.py install --prefix ${TD}
python
3
setup.py install --prefix ${TD}
#--install-lib ${TD}/libs
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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