gwm17/spspy
1
0
Fork 0
mirror of https://github.com/gwm17/spspy.git synced 2024-11-22 18:18:52 -05:00
Code Issues Projects Releases Wiki Activity

Fix bug in SPSTarget where catima projectile was given (z, a) when should have been given (a, z)

Browse Source
This commit is contained in:
Gordon McCann 2023-01-24 19:16:38 -05:00
parent 36123b0639
commit 1da81cb7ad
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spspy/SPSTarget.py
View File

@ -104,7 +104,7 @@ class SPSTarget:
def get_rxn_layer(self, zt: int, at: int) -> int: def get_rxn_layer(self, zt: int, at: int) -> int:
for idx, layer in enumerate(self.layer_details): for idx, layer in enumerate(self.layer_details):
for (a, z, s) in layer.compound_list: for (z, a, s) in layer.compound_list:
if at == a and zt == z: if at == a and zt == z:
return idx return idx
return INVALID_RXN_LAYER return INVALID_RXN_LAYER
@ -114,19 +114,21 @@ class SPSTarget:
if angle == pi*0.5: if angle == pi*0.5:
return e_initial return e_initial
projectile = catima.Projectile(zp, ap) print(f"z{zp} a{ap}")
projectile = catima.Projectile(ap, zp)
e_current = e_initial/ap e_current = e_initial/ap
for (idx, layer) in enumerate(self.layer_details): for (idx, layer) in enumerate(self.layer_details):
material = catima.Material([(global_nuclear_data.get_data(z, a).mass, z, float(s)) for (z, a, s) in layer.compound_list]) material = catima.Material([(global_nuclear_data.get_data(z, a).mass, z, float(s)) for (z, a, s) in layer.compound_list])
projectile.T(e_current) #catima wants MeV/u projectile.T(e_current) #catima wants MeV/u
if idx == rxn_layer: if idx == rxn_layer:
material.thickness(self.layer_details[idx].thickness * self.UG2G / (2.0 * abs(cos(angle)))) material.thickness(self.layer_details[idx].thickness * self.UG2G / (2.0 * abs(cos(angle))))
e_current -= get_energyloss(projectile, material) e_current -= get_energyloss(projectile, material)
print("e_current: ", e_current*ap)
return e_initial - e_current*ap return e_initial - e_current*ap
else: else:
material.thickness(self.layer_details[idx].thickness * self.UG2G / abs(cos(angle))) material.thickness(self.layer_details[idx].thickness * self.UG2G / abs(cos(angle)))
e_current -= get_energyloss(projectile, material) e_current -= get_energyloss(projectile, material)
print("e_current2: ", e_current*ap)
return e_initial - e_current*ap return e_initial - e_current*ap
@ -135,7 +137,7 @@ class SPSTarget:
if angle == pi*0.5: if angle == pi*0.5:
return e_initial return e_initial
projectile = catima.Projectile(zp, ap) projectile = catima.Projectile(ap, zp)
e_current = e_initial/ap e_current = e_initial/ap
for (idx, layer) in enumerate(self.layer_details[rxn_layer:], start=rxn_layer): for (idx, layer) in enumerate(self.layer_details[rxn_layer:], start=rxn_layer):
@ -154,7 +156,7 @@ class SPSTarget:
if angle == pi*0.5: if angle == pi*0.5:
return 0.0 return 0.0
projectile = catima.Projectile(zp, ap) projectile = catima.Projectile(ap, zp)
e_current = e_final/ap e_current = e_final/ap
sublist = self.layer_details[rxn_layer:] #only care about rxn_layer -> exit sublist = self.layer_details[rxn_layer:] #only care about rxn_layer -> exit
reveresedRxnLayer = len(sublist) -1 #when reversed rxn_layer is the last layer reveresedRxnLayer = len(sublist) -1 #when reversed rxn_layer is the last layer