Permalink
Browse files

minor cleanup

  • Loading branch information...
1 parent 6173086 commit 8cc7a0995c1943ccd0c2ddd79cf79bd5c7932ae4 @ddale ddale committed May 12, 2011
Showing with 3 additions and 4 deletions.
  1. +3 −4 praxes/fluorescence/mptaskmanager.py
@@ -52,7 +52,6 @@ def analyze_spectrum(index, spectrum, monitor):
temp['fitresult'] = fitresult
temp['result'] = result
temp['result']['config'] = advanced_fit.config
- mass_fraction_tool.config['time'] = 1
mass_fraction_tool.config['flux'] = monitor
conc = mass_fraction_tool.processFitResult(
fitresult=temp,
@@ -104,13 +103,13 @@ def __init__(self, scan, config, progress_queue, **kwargs):
try:
# are we processing a group of mca elements...
mcas = scan.mcas.values()
- self._counts = [mca['counts'] for mca in mcas]
+ self._counts = [mca['counts'].corrected_value for mca in mcas]
self._monitor = getattr(
mcas[0].monitor, 'corrected_value', None
)
except AttributeError:
# or a single element?
- self._counts = [scan['counts']]
+ self._counts = [scan['counts'].corrected_value]
self._monitor = getattr(scan.monitor, 'corrected_value', None)
def create_pool(self):
@@ -141,7 +140,7 @@ def next(self):
if self._masked[i]:
return 0
- cts = [counts.corrected_value[i] for counts in self._counts]
+ cts = [counts[i] for counts in self._counts]
spectrum = np.sum(cts, 0)
monitor = None

0 comments on commit 8cc7a09

Please sign in to comment.