Changeset ad015db in git for display

Timestamp:

Oct 26, 2014, 12:16:21 AM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

2695ae1

Parents:

3f51314

Message:

Small fixes for the summary plots

The plots are now correct, even if few things can be fixed (errors for
empty plots, and integration with the GUI)

Location:

display

Files:

• DelphesEventDisplay.cc (modified) (2 diffs)
• DelphesPlotSummary.cc (modified) (5 diffs)

display/DelphesEventDisplay.cc

@@ -155 +155 @@
    //ready...
    fStatusBar_->SetText("Ready.", 1);
+   plotSummary_->FillSample(treeReader_, event_id_); //TODO later, control it via a GUI button.
    load_event();
-   plotSummary_->FillSample(treeReader_, event_id_); //TODO later, control it via a GUI button.
-   plotSummary_->FillEvent(); //TODO later move to event loop
-   plotSummary_->Draw();
    gEve->Redraw3D(kTRUE);   
 
@@ -265 +263 @@
    delphesDisplay_->ImportEventRhoZ(top);
    update_html_summary();
-   //TODO: update plot tab (show current event on top)
+   plotSummary_->FillEvent();
+   plotSummary_->Draw();
 
    gEve->Redraw3D(kFALSE, kTRUE);

display/DelphesPlotSummary.cc

@@ -1 +1 @@
 #include "display/DelphesPlotSummary.h"
 #include "TRootEmbeddedCanvas.h"
+#include <algorithm>
 
+bool vecsorter (TLorentzVector i,TLorentzVector j) { return (i.Pt()>j.Pt()); }
 
 DelphesPlotSummary::DelphesPlotSummary(TEveWindowTab* tab):tab_(tab) {}
 
 DelphesPlotSummary::~DelphesPlotSummary() {}
+
+//TODO: sort the vectors before filling.
 
 void DelphesPlotSummary::Init(std::vector<DelphesBranchBase*>& elements) {
@@ -50 +54 @@
     for(std::vector<DelphesBranchBase*>::iterator element = elements_->begin();element<elements_->end();++element) {
       std::vector<TLorentzVector> vectors = (*element)->GetVectors();
+      std::sort(vectors.begin(), vectors.end(), vecsorter); 
       std::vector<TH1F*> histograms = histograms_[(*element)->GetName()];
       for(std::vector<TLorentzVector>::iterator it=vectors.begin(); it<vectors.end();++it) {
@@ -80 +85 @@
       c->cd(i+1);
       histograms[i]->Draw();
-      if(i<3) 
+      if(i<3) {
         eventProfiles[i]->Draw("same");
-      else
-        eventMarkers[i-3]->Draw("same");
+      } else {
+        if(eventMarkers.size()>(unsigned int)(i-3)) {
+          eventMarkers[i-3]->Draw("same");
+        }
+      }
     }
+    c->Update();
   } 
 }
@@ -104 +113 @@
   // loop over the elements and fill markers with event data
   TMarker *m;
-  std::vector<TMarker*> mv;
   for(std::vector<DelphesBranchBase*>::iterator element = elements_->begin();element<elements_->end();++element) {
+    std::vector<TMarker*> mv;
     std::vector<TLorentzVector> vectors = (*element)->GetVectors();
+    std::sort(vectors.begin(), vectors.end(), vecsorter); 
     std::vector<TH1F*> histograms = histograms_[(*element)->GetName()];
     TH1F* h1 = (TH1F*)histograms[0]->Clone(); h1->Reset(); h1->SetLineColor(kBlue);
@@ -116 +126 @@
       h3->Fill(it->Phi());
       if(it==vectors.begin()) {
-        m = new TMarker(it->Pt(),0,29); m->SetMarkerColor(kBlue);
+        m = new TMarker(it->Pt(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
         mv.push_back(m);
-        m = new TMarker(it->Eta(),0,29); m->SetMarkerColor(kBlue);
+        m = new TMarker(it->Eta(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
         mv.push_back(m);
-        m = new TMarker(it->Phi(),0,29); m->SetMarkerColor(kBlue);
+        m = new TMarker(it->Phi(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
         mv.push_back(m);
       }
       if(it==vectors.begin()+1) {
-        m = new TMarker(it->Pt(),0,29); m->SetMarkerColor(kBlue);
+        m = new TMarker(it->Pt(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
         mv.push_back(m);
-        m = new TMarker(it->Eta(),0,29); m->SetMarkerColor(kBlue);
+        m = new TMarker(it->Eta(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
         mv.push_back(m);
-        m = new TMarker(it->Phi(),0,29); m->SetMarkerColor(kBlue);
+        m = new TMarker(it->Phi(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
         mv.push_back(m);
       }