Commit 0a5e15d2 authored by myron's avatar myron

ajusted the memory estimator

parent c314271f
......@@ -6489,19 +6489,19 @@ void CCspace_read_chunk (CCspace * self , int sn, int ntok , int npbunches,
}
} else if (strcmp(self->reading_infos.proj_reading_type , "h5")==0){
if(self->params.DZPERPROJ==0) {
read_data_from_h5( proj_file_list[ 0 ],
self->reading_infos.proj_h5_dsname,
my_proj_num_list[iread],
target , // target_float
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,
0, // multiplo
0.0 // threshold
);
} else {
if( hfd5stack_done++ == 0) {
read_projSequence_from_h5( proj_file_list[ 0 ],
self->reading_infos.proj_h5_dsname,
Ninterval,
nprojs_interval,
target ,
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
) ;
}
} else {// ==================================
float *Bptr = NULL;
if(self->params.SUBTRACT_BACKGROUND ) { Bptr = self->background ; }
int iff;
......
......@@ -722,7 +722,7 @@ class Parameters:
Remove or not edf decompressed (from jp2) files at the end.
"""
PROJ_DS_NAME="setthisfieldifyouusehdf5forprojections"
PROJ_DS_NAME="data"
"""
the data set name for projections inside the FILE_PREFIX in case of hdf5.
The asked hdf5 datatype is native float.
......@@ -828,7 +828,7 @@ class Parameters:
This is the prefix used to compose the FF filename. if it ends with .h5 it will be considered hdf5.
In the latter case set also FF_DS_NAME which is the name of the 3D dataset from which FF will be read.
"""
FF_DS_NAME = "setthisfieldifyouusehdf5forffs"
FF_DS_NAME = "data"
"""
the data set name for flat field inside the FILE_PREFIX in case of hdf5.
The asked hdf5 datatype is native float : see discussion above for FILE_PREFIX
......@@ -876,7 +876,7 @@ class Parameters:
If it ends by .h5 it is considered as hdf5. Set in this case BACKGROUND_DS_NAME.
"""
BACKGROUND_DS_NAME = None
BACKGROUND_DS_NAME = "data"
"""
the data set name for BACKGROUND inside the FILE_PREFIX in case of hdf5
The asked hdf5 datatype is native float : see discussion above for FILE_PREFIX
......@@ -2265,8 +2265,13 @@ def memory_estimator( P, NSLICESATONCE, n_projs_max, n_ff_max, PIECE_MARGE_touse
## --------------------- C -------------------------------
## request.data
sum=sum+ P.NUM_IMAGE_1*P.numpjs_span * (NSLICESATONCE *1.0/nprocs+2*c_margin )
sum=sum+ P.NUM_IMAGE_1*P.numpjs_span * (NSLICESATONCE *1.0/nprocs+2*c_margin )*2
## accounting for extra buffers
sum = sum + P.NUM_IMAGE_1*sizeV*4* P.NPBUNCHES
if P.CONICITY:
sum=sum+ (1+P.END_VOXEL_1-P.START_VOXEL_1)*(1+P.END_VOXEL_1-P.START_VOXEL_1)*(NSLICESATONCE*1.0/nprocs+4)
sum=sum+ P.NUM_IMAGE_1*P.numpjs_span*(2*c_margin*P.NPBUNCHES+NSLICESATONCE*1.0/nprocs+4)
......
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