Skip to content
Snippets Groups Projects
Commit 3a31aa56 authored by Markus Frank's avatar Markus Frank Committed by MarkusFrankATcernch
Browse files

Fix Digi framework example

parent e7b0b4ff
No related branches found
No related tags found
No related merge requests found
...@@ -54,8 +54,7 @@ namespace dd4hep { ...@@ -54,8 +54,7 @@ namespace dd4hep {
else if ( const auto* v = work.get_input<DepositVector>() ) else if ( const auto* v = work.get_input<DepositVector>() )
std::for_each(v->begin(), v->end(), call); std::for_each(v->begin(), v->end(), call);
else else
error("+++ Request to dump an invalid container %s", error("+++ Request to dump an invalid container %s", Key::key_name(work.input.key.item()).c_str());
Key::key_name(work.input.key.item()));
} }
}; };
} // End namespace digi } // End namespace digi
......
...@@ -229,16 +229,18 @@ def _get_container_action(self): ...@@ -229,16 +229,18 @@ def _get_container_action(self):
def TestAction(kernel, nam, sleep=0): def TestAction(kernel, nam, sleep=0):
obj = Interface.createEventAction(kernel, str('DigiTestAction/' + nam)) obj = Interface.createAction(kernel, str('DigiTestAction/' + nam))
if sleep != 0: if sleep != 0:
obj.sleep = sleep obj.sleep = sleep
return obj return obj
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
def Action(kernel, nam): def Action(kernel, nam, **options):
obj = Interface.createAction(kernel, str(nam)) action = Interface.createAction(kernel, str(nam))
return obj for option in options.items():
setattr(action, option[0], option[1])
return action
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -335,8 +337,8 @@ def _props2(obj, **extensions): ...@@ -335,8 +337,8 @@ def _props2(obj, **extensions):
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
_setup('DigiSynchronize', py_call=_adopt_event_action) _setup('DigiSynchronize', call='adopt', py_call=_adopt_event_action)
_setup('DigiActionSequence', py_call=_adopt_event_action) _setup('DigiActionSequence', call='adopt', py_call=_adopt_event_action)
_import_class('digi', 'DigiKernel') _import_class('digi', 'DigiKernel')
_import_class('digi', 'DigiContext') _import_class('digi', 'DigiContext')
......
...@@ -32,7 +32,7 @@ def make_subdetector(kernel, name): ...@@ -32,7 +32,7 @@ def make_subdetector(kernel, name):
action_3 = dddigi.TestAction(kernel, name + '_deadChan', 100) action_3 = dddigi.TestAction(kernel, name + '_deadChan', 100)
action_4 = dddigi.TestAction(kernel, name + '_noiseChan', 50) action_4 = dddigi.TestAction(kernel, name + '_noiseChan', 50)
action_5 = dddigi.TestAction(kernel, name + '_merge', 200) action_5 = dddigi.TestAction(kernel, name + '_merge', 200)
seq = dddigi.ActionSequence(kernel, 'DigiActionSequence/' + name + '_sequence', True) seq = dddigi.Action(kernel, 'DigiActionSequence/' + name + '_sequence', parallel=True)
seq.adopt(action_1) seq.adopt(action_1)
seq.adopt(action_2) seq.adopt(action_2)
seq.adopt(action_3) seq.adopt(action_3)
...@@ -53,7 +53,7 @@ def run(): ...@@ -53,7 +53,7 @@ def run():
digi = dddigi.Digitize(kernel) digi = dddigi.Digitize(kernel)
digi.printDetectors() digi.printDetectors()
event_processor = dddigi.Synchronize(kernel, 'DigiSynchronize/MainDigitizer', True) event_processor = dddigi.Action(kernel, 'DigiSynchronize/MainDigitizer')
event_processor.parallel = True event_processor.parallel = True
# input # input
make_input(kernel) make_input(kernel)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment