Commit 7dc97c75 authored by Alessandro Mirone's avatar Alessandro Mirone

RELEASE 2020a

parent 752df6a6
......@@ -723,9 +723,10 @@ void CCspace_ffstatus_dealloc(CCspace * self ) {
void CCspace_end(CCspace * self ) {
MPI_Barrier(MPI_COMM_WORLD);
MPI_Finalize();
exit(0);
/* printf("finalize\n"); */
/* MPI_Finalize(); */
/* printf("finalize OK\n"); */
/* exit(0); */
}
......
......@@ -103,6 +103,7 @@ static void
Cspace_dealloc(Cspace *self)
{
DEBUG("... going to destroy a Cspace ...")
CCspace_end(self->myCCspace);
Py_DECREF(self->Orawdataarray) ;
Py_DECREF(self->Off_rawdataarray) ;
......@@ -116,7 +117,6 @@ Cspace_dealloc(Cspace *self)
CCspace_ffstatus_dealloc( self->myCCspace);
CCspace_end(self->myCCspace);
if(self && 0 )
free(self);
DEBUG("... going to destroy a Cspace ... OK")
......
......@@ -2727,7 +2727,7 @@ if (sys.argv[0][-12:]!="sphinx-build") and not P.DO_V3D_UNSHARP :
P.END_VOXEL_3-1)
P.patch_ep = 0
if P.STEAM_INVERTER==0:
if P.STEAM_INVERTER==0 and mpistatus.status:
if P.ITERATIVE_CORRECTIONS>0 and P.DENOISING_TYPE in [4]:
......
......@@ -64,10 +64,11 @@ casi = [ "ID11_SNOW" ]
##################################################
PREFIX="/home/esrf/mirone/WORKS/TEST_PYHST/DATASETS"
casi=["CRAYON"]
casi=CASI_ALL
casi=[ "CRAYON", "HEIKKI", "HELICOIDAL", "ID11_SNOW", "LENA", "LENA_MULTIRINGS", "MOUSSE", "MULTIPAGANIN","NANOPOINTS",
"PATCHES_VECTORIAL", "SINO_THRESHOLD" ]
LAUNCHING_INSTRUCTION = "PyHST2_2020a input.par p9-04,0"
outputprefix="/home/esrf/mirone/nobackup/TEST_PYHST/RESULTS/p9-04/monogpu"
outputprefix="/home/esrf/mirone/nobackup/TEST_PYHST/RESULTS/p9-04/monogpu2"
# outputprefix="/tmp/TEST_PYHST/RESULTS/p9-04/"
###############################################################
......
PyHST2_2018b $*
\ No newline at end of file
PyHST2_2020a $*
\ No newline at end of file
#!python
msg = """
The pyhst2 script launches PyHST2_2018b
The pyhst2 script launches PyHST2_2020a
*** PyHST2_2020a
-- improoved hdf5 reading
--A correction ot the conical geometry projector
-- For conical geometry : detector tilt and rotation
-- just giving DOUBLEFFCORRECTION=1 triggers the double flat field for rings correction. First a file name pyhst_dff_f.ff.edf where f.ff is a float corresponding to the gassuab sigma of the high pass filter (FF2_SIGMA defaults to 0.00 which means no filtering). Then the reconstruction is done taking into account this correction to the flat fields.
If the file is already there, the reconstruction is done without recalculating it.
*** PyHST2_2019b
......
......@@ -80,9 +80,9 @@ ONLYCUDA=0
DO_LINK=0
### CHANGE HERE
DOCUDA = 1
DOCUDA = 0
ONLYCUDA = 0
DO_LINK = 0
DO_LINK = 1
global version
global aumento_versione
......@@ -104,7 +104,7 @@ def do_link():
aumento_versione=""
version = "2019b"
version = "2020a"
packages = []
......
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