Commit 630bda74 authored by myron's avatar myron

corretto calcolo margin

parent 58162398
......@@ -2287,7 +2287,10 @@ if not Parameters.DO_V3D_UNSHARP and Parameters.NSLICESATONCE is None and (sys.
if P.CONICITY:
f_tmp = (P.SOURCE_DISTANCE+P.DETECTOR_DISTANCE)/(float(P.SOURCE_DISTANCE)) # ??? /P.IMAGE_PIXEL_SIZE_2
VOXEL_SIZE = P.IMAGE_PIXEL_SIZE_1/f_tmp
Fact = (P.SOURCE_DISTANCE+P.DETECTOR_DISTANCE)/(float(P.SOURCE_DISTANCE))*VOXEL_SIZE*1.0/P.IMAGE_PIXEL_SIZE_2 +(abs(P.DECT_PSI)+abs(P.DECT_PSI) )*3.2/180.0*2
Fact = (P.SOURCE_DISTANCE+P.DETECTOR_DISTANCE)/(float(P.SOURCE_DISTANCE))*VOXEL_SIZE*1.0/P.IMAGE_PIXEL_SIZE_2
DFa = +(abs(P.DECT_PSI)+abs(P.DECT_TILT) )*3.2/180.0*2
DR1 = (P.END_VOXEL_1 - P.START_VOXEL_1)/2.0
DR2 = (P.END_VOXEL_2 - P.START_VOXEL_2)/2.0
RADIUS = math.sqrt( DR1*DR1+DR2*DR2 )
......@@ -2295,7 +2298,7 @@ if not Parameters.DO_V3D_UNSHARP and Parameters.NSLICESATONCE is None and (sys.
alpha = (max (abs(P.START_VOXEL_3),abs(P.END_VOXEL_3) ) *VOXEL_SIZE/1.0e6)/(P.SOURCE_DISTANCE)
C_MARGIN = int( RADIUS*
alpha*Fact
alpha*(Fact+DFa )
+0.01)+1
if Parameters.VERBOSITY>1 : print( " C_MARGIN " , C_MARGIN)
......@@ -2729,8 +2732,11 @@ if (sys.argv[0][-12:]!="sphinx-build") and not P.DO_V3D_UNSHARP :
f_tmp = (P.SOURCE_DISTANCE+P.DETECTOR_DISTANCE)/(float(P.SOURCE_DISTANCE)) # ??? /P.IMAGE_PIXEL_SIZE_2
P.VOXEL_SIZE = P.IMAGE_PIXEL_SIZE_1/f_tmp
Fact = (P.SOURCE_DISTANCE+P.DETECTOR_DISTANCE)/(float(P.SOURCE_DISTANCE))*P.VOXEL_SIZE*1.0/P.IMAGE_PIXEL_SIZE_2 +(abs(P.DECT_PSI)+abs(P.DECT_PSI) )*3.2/180.0*2
Fact = (P.SOURCE_DISTANCE+P.DETECTOR_DISTANCE)/(float(P.SOURCE_DISTANCE))*P.VOXEL_SIZE*1.0/P.IMAGE_PIXEL_SIZE_2
DFa = +(abs(P.DECT_PSI)+abs(P.DECT_TILT) )*3.2/180.0*2
DR1 = (P.END_VOXEL_1 - P.START_VOXEL_1)/2.0
DR2 = (P.END_VOXEL_2 - P.START_VOXEL_2)/2.0
RADIUS = math.sqrt( DR1*DR1+DR2*DR2 )
......@@ -2745,7 +2751,7 @@ if (sys.argv[0][-12:]!="sphinx-build") and not P.DO_V3D_UNSHARP :
alpha = (abs(P.first_slices[i])*P.VOXEL_SIZE/1.0e6)/(P.SOURCE_DISTANCE)
P.CONICITY_MARGIN_DOWN[i] = int( RADIUS*
alpha*Fact
alpha*(Fact +DFa)
+0.01)+1
if P.DZPERPROJ!=0:
......@@ -2755,7 +2761,7 @@ if (sys.argv[0][-12:]!="sphinx-build") and not P.DO_V3D_UNSHARP :
P.CONICITY_MARGIN_UP[i] = int( RADIUS*
alpha*Fact
alpha*(Fact +DFa)
+0.01)+1
......
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