Commit cf649f9b authored by Simon Spannagel's avatar Simon Spannagel
Browse files

GUI: obey detector configuration

parent b162143e
...@@ -17,9 +17,6 @@ void GUI::initialise(Parameters* par) { ...@@ -17,9 +17,6 @@ void GUI::initialise(Parameters* par) {
// Make the local pointer to the global parameters // Make the local pointer to the global parameters
parameters = par; parameters = par;
// Check the number of devices
nDetectors = parameters->nDetectors;
// TApplication keeps the canvases persistent // TApplication keeps the canvases persistent
app = new TApplication("example", 0, 0); app = new TApplication("example", 0, 0);
...@@ -44,16 +41,16 @@ void GUI::initialise(Parameters* par) { ...@@ -44,16 +41,16 @@ void GUI::initialise(Parameters* par) {
addPlot(trackCanvas, "/corryvreckan/BasicTracking/trackAngleX"); addPlot(trackCanvas, "/corryvreckan/BasicTracking/trackAngleX");
// Per detector histograms // Per detector histograms
for(auto detectorID : parameters->detectors) { for(auto& detector : m_detectors) {
string hitmap = "/corryvreckan/TestAlgorithm/hitmap_" + detectorID; string hitmap = "/corryvreckan/TestAlgorithm/hitmap_" + detector->name();
addPlot(hitmapCanvas, hitmap, "colz"); addPlot(hitmapCanvas, hitmap, "colz");
string residualHisto = "/corryvreckan/BasicTracking/residualsX_" + detectorID; string residualHisto = "/corryvreckan/BasicTracking/residualsX_" + detector->name();
if(detectorID == parameters->DUT) if(detector->name() == parameters->DUT)
residualHisto = "/corryvreckan/DUTAnalysis/residualsX"; residualHisto = "/corryvreckan/DUTAnalysis/residualsX";
addPlot(residualsCanvas, residualHisto); addPlot(residualsCanvas, residualHisto);
string chargeHisto = "/corryvreckan/TestAlgorithm/clusterTot_" + detectorID; string chargeHisto = "/corryvreckan/TestAlgorithm/clusterTot_" + detector->name();
addPlot(chargeCanvas, chargeHisto); addPlot(chargeCanvas, chargeHisto);
} }
......
...@@ -41,7 +41,6 @@ namespace corryvreckan { ...@@ -41,7 +41,6 @@ namespace corryvreckan {
TApplication* app; TApplication* app;
// Misc. member objects // Misc. member objects
int nDetectors;
int eventNumber; int eventNumber;
int updateNumber; int updateNumber;
}; };
......
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