Commit 6d379294 authored by Stezowski Olivier's avatar Stezowski Olivier
Browse files

Merge branch 'preprod' into 'preprod'

Preprod

See merge request IPNL_GAMMA/narval_emulator!65
parents 1e1813c7 3ef42892
...@@ -160,4 +160,6 @@ bool TB_Detector::ReadTransformation() ...@@ -160,4 +160,6 @@ bool TB_Detector::ReadTransformation()
in.close( ); in.close( );
Log << dolog; Log << dolog;
return true;
} }
...@@ -261,9 +261,9 @@ void TreeBuilder::NewTree() ...@@ -261,9 +261,9 @@ void TreeBuilder::NewTree()
if(fTree == nullptr) { if(fTree == nullptr) {
fTree = new TTree(fTreeName.data(),fTreeName.data()); fTree = new TTree(fTreeName.data(),fTreeName.data());
for(auto &fListOfDets: fListOfDets) { for(auto &det: fListOfDets) {
fListOfDets->SetTree(fTree); det->SetTree(fTree);
fListOfDets->InitTree(); det->InitTree();
} }
} }
else { else {
...@@ -430,8 +430,7 @@ Int_t TreeBuilder::BuildTrigger() ...@@ -430,8 +430,7 @@ Int_t TreeBuilder::BuildTrigger()
else else
fTriggerName = "event:data "; fTriggerName = "event:data ";
for(auto &fListOfDets: fListOfDets) for(auto &det: fListOfDets) fTriggerName += det->GetTriggerName() + " ";
fTriggerName += fListOfDets->GetTriggerName() + " ";
fTriggerName.Remove(fTriggerName.Length()-1); // remove the last empty space fTriggerName.Remove(fTriggerName.Length()-1); // remove the last empty space
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment