← Back to branch summary

~christopher-hunt08/maus/maus_integrated_kalman

« back to all changes in this revision

Viewing changes to src/common_py/framework/single_thread.py

  • Committer: Durga Rajaram
  • Date: 2014-07-16 15:13:05 UTC
  • mfrom: (659.1.92 cand)
  • Revision ID: durga@fnal.gov-20140716151305-q27rv1y9p03v9lks
Tags: MAUS-v0.9, MAUS-v0.9.0
MAUS-v0.9.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common_py/framework/single_thread.py
18
18
 
19
19
import json
20
20
import maus_cpp.run_action_manager
 
21
import maus_cpp.converter
21
22
 
22
23
from framework.utilities import DataflowUtilities
23
24
 
126
127
        Process a single event - if it is a Spill, check for run_number change
127
128
        and call EndOfEvent/StartOfEvent if run_number has changed.
128
129
        """
129
 
        event_json = json.loads(event)
 
130
        event_json = maus_cpp.converter.json_repr(event)
130
131
        if DataflowUtilities.get_event_type(event_json) == "Spill":
131
132
            current_run_number = DataflowUtilities.get_run_number(event_json)
132
133
            if (DataflowUtilities.is_end_of_run(event_json)):
137
138
                self.start_of_run(current_run_number)
138
139
                self.run_number = current_run_number
139
140
            event = self.transformer.process(event)
 
141
            event = maus_cpp.converter.string_repr(event)
140
142
            event = self.merger.process(event)
141
143
        self.outputer.save(event)
142
144