Commit ff90cd1c authored by myron's avatar myron

DOUBLE FLAT FIELD is automatised now . Just set DOUBLEFFCORRECTION=1

parent dd874428
......@@ -97,7 +97,7 @@ class Control:
if STEAM_DIRECTION==1:
## -----------------------------------------------------------------------------
if Parameters.DO_OUTPUT_PAGANIN:
if Parameters.DO_OUTPUT_PAGANIN or Parameters.DOUBLERUN4DFF :
preprocessing_frees = ["SiliciumResources","RawDataResources","TreatedDataResources" ]
else:
preprocessing_frees = ["SiliciumResources","RawDataResources" ]
......@@ -164,7 +164,7 @@ class Control:
LEVEL=6
if not Parameters.DO_OUTPUT_PAGANIN :
if (not Parameters.DO_OUTPUT_PAGANIN ) and (not Parameters.DOUBLERUN4DFF) :
TLEVEL = LEVEL
transposing = Processing_Transposing( processingLevel=LEVEL-0*DOSHARED*(STEAM_DIRECTION==1),
resources={"MPI_Resources":self.MPI_Resources ,
......@@ -257,7 +257,7 @@ class Control:
self.PacketsManager.setPacketStart(start)
if not Parameters.DO_OUTPUT_PAGANIN:
if (not Parameters.DO_OUTPUT_PAGANIN ) and (not Parameters.DOUBLERUN4DFF) :
reconstructor.NEXTPOOL=[dumsink]
else:
preprocessing.NEXTPOOL=[dumsink]
......
......@@ -36,7 +36,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include<libgen.h>
#include<string.h>
#include"CCspace.h"
#include"edftools.h"
......@@ -5863,7 +5863,7 @@ void CCspace_InterleavedReadingPreProcessing_chunk(CCspace * self ,int sn,int
// Write this in edf
{
char name[10000];
sprintf(name,"%s/projectionsmean.edf", dirname(self->params.OUTPUT_FILE) ) ;
sprintf(name,"%s/projectionsmean_%20.10f.edf", dirname(self->params.OUTPUT_FILE) , self->params.FF2_SIGMA ) ;
write_data_to_edf(self->ff2_globalmean, Size0, Size1, name);
}
......@@ -5968,7 +5968,8 @@ void CCspace_InterleavedReadingPreProcessing_chunk(CCspace * self ,int sn,int
{
char name[10000];
sprintf(name,"%s/projectionsmean.edf", dirname(self->params.OUTPUT_FILE) ) ;
sprintf(name,"%s/projectionsmean_%20.10f.edf", dirname(self->params.OUTPUT_FILE) , self->params.FF2_SIGMA ) ;
write_data_to_edf(self->ff2_globalmean, Size0, Size1, name);
if (self->params.verbosity >= 10) puts("wrote projectionsmean.edf");
}
......
......@@ -2052,7 +2052,8 @@ Units are pixels per projection.
DOUBLERUN4DFF=0
if DOUBLEFFCORRECTION:
dname = os.path.dirname(OUTPUT_FILE)
dd_path = os.path.join( dname,"projectionsmean.edf")
dd_path = os.path.join( dname,"projectionsmean_%20.10f.edf"%FF2_SIGMA)
print( " CONTROLLO ", dd_path)
if not os.path.exists(dd_path):
DOUBLEFFCORRECTION = 0
DOUBLEFFCORRECTION_ONTHEFLY = 1
......
......@@ -30,5 +30,5 @@
# is a problem for you.
#############################################################################*/
version = "h5fast"
version = "test"
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