#HOTFIX: Fixed data processing issues missed after decoupling of widget unpacking and data processing

radbase/compilation/frosch_electron_1968/frosch_1968_process.py

@@ -48,57 +48,53 @@ def convert_value(quantity_str):
 by_quant_dfs.to_csv('./cross_sections.csv', index=False)
 
 interface = DataEntryInterface(start_interface=False)
+csr_procs = electron_scattering_cross_section_ratio_template.proc_dict
+cs_procs = electron_scattering_cross_section_template.proc_dict
 
 for i, row in by_quant_dfs.iterrows():
 
     if row['Value'] is None:
         continue
 
-    cs_values: dict = {'Reference': 'frosch_electron_1968'}
+    cs_values = {}
+    cs_values |= cs_procs['Reference'].process_data('frosch_electron_1968')
 
     theta, nrg = row['theta'], row['Energy [MeV]']
     theta = ufloat(theta, 1)
     nrg_j = nrg * electron_volt * 10 ** 6
     p_i = nrg_j / c  # Ultra-relativistic
     q = 2 * p_i / hbar * sin(theta / 2 * pi / 180) * 10 ** -15  # in units of fm^-1
 
-    cs_values['q [1/fm]'] = {'Value': q.n,
-                             'Uncertainty': q.s}
+    cs_values |= cs_procs['q [1/fm]'].process_data(str(q))
 
-    cs_values['Energy [MeV]'] = {'Value': nrg,
-                                 'Uncertainty': None}
-    cs_values['theta [deg]'] = {'Value': theta.n,
-                                'Uncertainty': theta.s}
+    cs_values |= cs_procs['Energy [MeV]'].process_data(str(nrg))
+    cs_values |= cs_procs['theta [deg]'].process_data(str(theta))
 
     if 'D' in row['Quantity']:
-        cs_values['Nuclide_A'] = row['Quantity'][2:6]
-        cs_values['Nuclide_B'] = row['Quantity'][7:11]
-        cs_values['q [1/fm]'] = {'Value': q.n,
-                                 'Uncertainty': q.s}
+        cs_values |= csr_procs['Nuclide A'].process_data(row['Quantity'][2:6])
+        cs_values |= csr_procs['Nuclide B'].process_data(row['Quantity'][7:11])
+        cs_values |= csr_procs['q [1/fm]'].process_data(str(q))
 
         dratio = row['Value']
         dratio, angular_acceptance = angle_acceptance(dratio)
         dratio = convert_value(dratio) / 100  # convert from percent
         ratio = (1 - dratio) / (1 + dratio)
 
-        cs_values['Cross section Ratio [fm^2/sr]'] = {'Value': dratio.n,
-                                                      'Uncertainty': dratio.s}
+        cs_values |= csr_procs['Cross section ratio (A/B) [-]'].process_data(str(ratio))
 
         interface.save_data(electron_scattering_cross_section_ratio_template, cs_values,
                             replacement_strategy='AlwaysReplace')
 
-
     else:
-        cs_values['Nuclide'] = row['Quantity']
+        cs_values |= cs_procs['Nuclide'].process_data(row['Quantity'])
 
         cs = row['Value']
         cs, angular_acceptance = angle_acceptance(cs)
         cs = convert_value(cs)
-        cs *= 100  # microbarn to fm^2 conversion
-        cs_values['Cross section [fm^2/sr]'] = {'Value': cs.n,
-                                                'Uncertainty': cs.s}
+        cs /= 100  # microbarn to fm^2 conversion
+        cs_values |= cs_procs['Cross section [fm^2/sr]'].process_data(str(cs))
 
-        cs_values['Notes'] = (f'Angular acceptance: {angular_acceptance:0.2f}')
+        cs_values |= cs_procs['Notes'].process_data(f'Angular acceptance: {angular_acceptance:0.2f}')
 
         interface.save_data(electron_scattering_cross_section_template, cs_values,
                             replacement_strategy='AlwaysReplace')