Commit 658ff8b0 authored by Johannes Elmsheuser's avatar Johannes Elmsheuser
Browse files

Merge branch 'TIDAUser' into 'master'

More fixes to the figure keys

See merge request atlas/athena!44039
parents 4d3d6f8d e2bd47a6
......@@ -1110,11 +1110,26 @@ int main(int argc, char** argv) {
std::vector<std::string> panel_config = rc.GetStringVector( "panels" );
std::vector<string> panel_columns;
if ( rc.isTagDefined("panel_columns") ) {
panel_columns = rc.GetStringVector( "panel_columns" );
if ( panel_columns.size()%2 ) return usage( argv[0], -1, "incorrect panel settings" );
}
for ( size_t ipanel=panel_config.size() ; ipanel-- ; ) {
std::vector<std::string> raw_input = rc.GetStringVector( panel_config[ipanel] );
int tncols = ncols;
Panel p( panel_config[ipanel], ncols );
if ( panel_columns.size() ) {
std::vector<string>::iterator itr = find( panel_columns.begin(), panel_columns.end(), panel_config[ipanel] );
if ( itr!=panel_columns.end() ) tncols = std::atoi( (++itr)->c_str() );
}
Panel p( panel_config[ipanel], tncols );
if ( raw_input.empty() ) throw std::exception();
for ( size_t iraw=0 ; iraw<raw_input.size() ; iraw += 6 ) p.push_back( HistDetails( &(raw_input[iraw]) ) );
......
......@@ -375,12 +375,18 @@ public:
/// ha ! don't actually create the legend until we want to draw it,
/// then we can determine the size etc automatically
double y0 = m_y[0];
m_y[1] = y0 + m_entries.size()*0.05;
double y0 = 0;
if ( m_y[0]>0.5 ) {
y0 = m_y[1] - m_entries.size()*0.05;
}
else {
y0 = m_y[0];
m_y[1] = y0 + m_entries.size()*0.05;
}
m_leg = new TLegend( m_x[0], y0, m_x[1], m_y[1] );
m_leg->SetBorderSize(0);
m_leg->SetTextFont(42);
m_leg->SetTextSize(0.04);
......
......@@ -2,6 +2,7 @@
panels = { eff_panel, res_panel, diff_panel, spoff_panel, sp_panel, dist_panel, trt_panel };
panel_columns = { eff_panel, 3 };
eff_panel = {
"eta_eff", "Efficiency #eta", "xaxis:lin", "Reference track #eta", "yaxis:lin:auto:90:102", "Efficiency [%]",
......@@ -9,7 +10,7 @@ eff_panel = {
"phi_eff", "Efficiency #phi", "xaxis:lin", "Reference track #phi", "yaxis:lin:auto:90:102", "Efficiency [%]",
"a0_eff", "Efficiency a0", "xaxis:lin:autosym", "Reference track d_{0} [mm]", "yaxis:lin:auto:90:102", "Efficiency [%]",
"z0_eff", "Efficiency z0", "xaxis:lin:autosym", "Reference track z_{0} [mm]", "yaxis:lin:auto:90:102", "Efficiency [%]",
"eff_vs_mu", "Efficiency mu", "xaxis:lin:auto", "pil-up <#mu>", "yaxis:lin:auto:90:102", "Efficiency [%]"
"eff_vs_mu", "Efficiency mu", "xaxis:lin:auto", "Pile-up<#mu>", "yaxis:lin:auto:90:102", "Efficiency [%]"
};
......
Supports Markdown
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