Skip to content
Snippets Groups Projects
Commit fe968cfd authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Fix wrong conflict resolution in CaloPi0Ntp.cpp

parent 5e231f7b
No related branches found
No related tags found
1 merge request!1493Forward compatibility for gaudi/Gaudi!514
Pipeline #814003 passed
...@@ -279,7 +279,7 @@ StatusCode CaloPi0Ntp::execute(){ ...@@ -279,7 +279,7 @@ StatusCode CaloPi0Ntp::execute(){
// #vertices // #vertices
sc=ntp->column("Nvertices", nVert); sc=ntp->column("Nvertices", nVert);
// #SpdMult // #SpdMult
ntp->column("spdMult", nSpd); sc=ntp->column("spdMult", m_spdMult);
ok = ntp->write().isSuccess(); ok = ntp->write().isSuccess();
} }
if( !isPi0) continue; if( !isPi0) continue;
......
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