@@ -551,11 +551,13 @@ def pixel_solid_angles(self) -> np.ndarray:
551551 dvecs = self .cart_to_dvecs (xy )
552552 mod_r = np .linalg .norm (dvecs , axis = 1 )
553553 return (
554- (self .pixel_area / mod_r ** 3 ) *
555- np .abs (np .sum (
556- self .pixel_normal * dvecs ,
557- axis = 1 ,
558- ))
554+ (self .pixel_area / mod_r ** 3 )
555+ * np .abs (
556+ np .sum (
557+ self .pixel_normal * dvecs ,
558+ axis = 1 ,
559+ )
560+ )
559561 ).reshape (self .shape )
560562
561563 # =========================================================================
@@ -1572,7 +1574,6 @@ def simulate_rotation_series(
15721574 valid_xys = []
15731575 ang_pixel_size = []
15741576 for gparm in grain_param_list :
1575-
15761577 # make useful parameters
15771578 rMat_c = make_rmat_of_expmap (gparm [:3 ])
15781579 tVec_c = gparm [3 :6 ]
@@ -1652,7 +1653,6 @@ def simulate_laue_pattern(
16521653 ):
16531654 """ """
16541655 if isinstance (crystal_data , PlaneData ):
1655-
16561656 plane_data = crystal_data
16571657
16581658 # grab the expanded list of hkls from plane_data
@@ -1995,7 +1995,6 @@ def calc_compton_transmission(
19951995 physics_package : AbstractPhysicsPackage ,
19961996 pp_layer : str ,
19971997 ) -> np .ndarray :
1998-
19991998 if pp_layer == 'sample' :
20001999 formula = physics_package .sample_material
20012000 density = physics_package .sample_density
@@ -2055,51 +2054,48 @@ def calc_compton_transmission_window(
20552054 )
20562055 return np .exp (- mu_w_prime * thickness_w * secb )
20572056
2058- def calc_effective_pinhole_area (self , physics_package : AbstractPhysicsPackage ) -> np .array :
2057+ def calc_effective_pinhole_area (
2058+ self , physics_package : AbstractPhysicsPackage
2059+ ) -> np .array :
20592060 '''get the effective pinhole area correction
20602061 @SS 04/01/25 a modification was made based on the
20612062 CeO2 data recorded on NIF. An extra factor of sec(beta)
20622063 was included as compared to RSI 91, 043902 (2020).
20632064 '''
2064- if (
2065- np .isclose (
2066- physics_package .pinhole_thickness ,
2067- 0.0 ) or
2068- np .isclose (
2069- physics_package .pinhole_diameter ,
2070- 0.0 )):
2065+ if np .isclose (physics_package .pinhole_thickness , 0.0 ) or np .isclose (
2066+ physics_package .pinhole_diameter , 0.0
2067+ ):
20712068 return np .ones (self .shape )
20722069
2073- else :
2074- hod = (
2075- physics_package .pinhole_thickness /
2076- physics_package .pinhole_diameter
2077- )
2070+ hod = (
2071+ physics_package .pinhole_thickness
2072+ / physics_package .pinhole_diameter
2073+ )
20782074
2079- '''we compute the beta angle using existing
2080- functions by just changing beam vector
2081- to be the z-axis with the right sign.
2082- '''
2083- bvec = np .array ([0. , 0. , np .sign (self .bvec [2 ])])
2084- beta , eta = self .pixel_angles (bvec = bvec )
2075+ '''we compute the beta angle using existing
2076+ functions by just changing beam vector
2077+ to be the z-axis with the right sign.
2078+ '''
2079+ bvec = np .array ([0.0 , 0.0 , np .sign (self .bvec [2 ])])
2080+ beta , eta = self .pixel_angles (bvec = bvec )
20852081
2086- tb = np .tan (beta )
2087- jb = hod * tb
2088- jb [jb > 1 ] = np .nan
2089- jb2 = jb ** 2
2090- mask = np .isclose (jb2 , 0. )
2082+ tb = np .tan (beta )
2083+ jb = hod * tb
2084+ jb [jb > 1 ] = np .nan
2085+ jb2 = jb ** 2
2086+ mask = np .isclose (jb2 , 0.0 )
20912087
2092- f1 = np .zeros_like (jb )
2093- f3 = 1 / jb2 [~ mask ] - 1
2094- f3 [f3 < 0. ] = np .nan
2095- f1 [~ mask ] = np .arctan (np .sqrt (f3 ))
2096- f1 [mask ] = np .pi / 2
2088+ f1 = np .zeros_like (jb )
2089+ f3 = 1 / jb2 [~ mask ] - 1
2090+ f3 [f3 < 0.0 ] = np .nan
2091+ f1 [~ mask ] = np .arctan (np .sqrt (f3 ))
2092+ f1 [mask ] = np .pi / 2
20972093
2098- f3 = 1 - jb2
2099- f3 [f3 < 0. ] = np .nan
2100- f2 = jb * np .sqrt (f3 )
2094+ f3 = 1 - jb2
2095+ f3 [f3 < 0.0 ] = np .nan
2096+ f2 = jb * np .sqrt (f3 )
21012097
2102- return 0.5 * (f1 - f2 )
2098+ return 0.5 * (f1 - f2 )
21032099
21042100 def calc_transmission_generic (
21052101 self ,
@@ -2135,6 +2131,7 @@ def calc_transmission_phosphor(
21352131# UTILITY METHODS
21362132# =============================================================================
21372133
2134+
21382135def _fix_indices (idx , lo , hi ):
21392136 nidx = np .array (idx )
21402137 off_lo = nidx < lo
@@ -2205,8 +2202,8 @@ def _interpolate_bilinear_in_place(
22052202 for i in range (on_panel_idx .shape [0 ]):
22062203 idx = on_panel_idx [i ]
22072204 output_img [idx ] += (
2208- cc [i ] * img [i_floor_img [i ], j_floor_img [i ]] +
2209- fc [i ] * img [i_floor_img [i ], j_ceil_img [i ]] +
2210- cf [i ] * img [i_ceil_img [i ], j_floor_img [i ]] +
2211- ff [i ] * img [i_ceil_img [i ], j_ceil_img [i ]]
2205+ cc [i ] * img [i_floor_img [i ], j_floor_img [i ]]
2206+ + fc [i ] * img [i_floor_img [i ], j_ceil_img [i ]]
2207+ + cf [i ] * img [i_ceil_img [i ], j_floor_img [i ]]
2208+ + ff [i ] * img [i_ceil_img [i ], j_ceil_img [i ]]
22122209 )
0 commit comments