Changeset 6301e02 in git

Timestamp:

Nov 5, 2014, 7:23:34 PM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

0a67548

Parents:

2695ae1

Message:

Better GUI

Improved the event navigation widget + batch operations

Location:

display

Files:

• DelphesBranchElement.cc (modified) (1 diff)
• DelphesEventDisplay.cc (modified) (7 diffs)
• DelphesEventDisplay.h (modified) (4 diffs)
• DelphesPlotSummary.cc (modified) (2 diffs)

display/DelphesBranchElement.cc

@@ -25 +25 @@
 #include "TEveVector.h"
 #include <iostream>
-
-//TODO implement GetVectors()
 
 // special case for calo towers

display/DelphesEventDisplay.cc

@@ -45 +45 @@
 #include "TRootBrowser.h"
 #include "TGButton.h"
+#include "TGTextEntry.h"
+#include "TGProgressBar.h"
+#include "TGNumberEntry.h"
 #include "TRootEmbeddedCanvas.h"
 #include "TClonesArray.h"
@@ -113 +116 @@
    // Create object of class ExRootTreeReader
    fStatusBar_->SetText("Opening Delphes data file", 1);
+   gSystem->ProcessEvents();
    treeReader_ = new ExRootTreeReader(chain_);
 
@@ -155 +159 @@
    //ready...
    fStatusBar_->SetText("Ready.", 1);
-   plotSummary_->FillSample(treeReader_, event_id_); //TODO later, control it via a GUI button.
+   gSystem->ProcessEvents();
    load_event();
    gEve->Redraw3D(kTRUE);   
@@ -243 +247 @@
    // message
    fStatusBar_->SetText(Form("Loading event %d.", event_id_), 1);
+   gSystem->ProcessEvents();
 
    // clear the previous event
@@ -268 +273 @@
    gEve->Redraw3D(kFALSE, kTRUE);
    fStatusBar_->SetText(Form("Loaded event %d.", event_id_), 1);
+   gSystem->ProcessEvents();
 }
 
@@ -337 +343 @@
 {
    // Create minimal GUI for event navigation.
-   // TODO: better GUI could be made based on the ch15 of the manual (Writing a GUI)
 
    // add a tab on the left
    TEveBrowser* browser = gEve->GetBrowser();
+   browser->SetWindowName("Delphes Event Display");
    browser->StartEmbedding(TRootBrowser::kLeft);
 
@@ -349 +355 @@
 
    // build the navigation menu
-   TGHorizontalFrame* hf = new TGHorizontalFrame(frmMain);
+   TString icondir;
+   if(gSystem->Getenv("ROOTSYS"))
+     icondir = Form("%s/icons/", gSystem->Getenv("ROOTSYS"));
+   if(!gSystem->OpenDirectory(icondir)) 
+     icondir = Form("%s/icons/", (const char*)gSystem->GetFromPipe("root-config --etcdir") );
+   TGGroupFrame* vf = new TGGroupFrame(frmMain,"Event navigation",kVerticalFrame | kFitWidth );
    {
-      TString icondir;
-      if(gSystem->Getenv("ROOTSYS"))
-        icondir = Form("%s/icons/", gSystem->Getenv("ROOTSYS"));
-      if(!gSystem->OpenDirectory(icondir)) 
-        icondir = Form("%s/icons/", (const char*)gSystem->GetFromPipe("root-config --etcdir") );
-      TGPictureButton* b = 0;
-
-      b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoBack.gif"));
-      hf->AddFrame(b);
-      b->Connect("Clicked()", "DelphesEventDisplay", this, "Bck()");
-
-      b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoForward.gif"));
-      hf->AddFrame(b);
-      b->Connect("Clicked()", "DelphesEventDisplay", this, "Fwd()");
-   }
-   frmMain->AddFrame(hf);
+     TGHorizontalFrame* hf = new TGHorizontalFrame(frmMain);
+     {
+        TGPictureButton* b = 0;
+
+        b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoBack.gif"));
+        hf->AddFrame(b, new TGLayoutHints(kLHintsLeft | kLHintsCenterY , 10, 2, 10, 10));
+        b->Connect("Clicked()", "DelphesEventDisplay", this, "Bck()");
+
+        numberEntry_ = new TGNumberEntry(hf,0,9,-1,TGNumberFormat::kNESInteger, TGNumberFormat::kNEANonNegative, TGNumberFormat::kNELLimitMinMax, 0, treeReader_->GetEntries());
+        hf->AddFrame(numberEntry_, new TGLayoutHints(kLHintsCenterX | kLHintsCenterY , 2, 0, 10, 10));
+        numberEntry_->Connect("ValueSet(Long_t)", "DelphesEventDisplay", this, "GoTo(Long_t)");
+        
+        b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoForward.gif"));
+        hf->AddFrame(b, new TGLayoutHints(kLHintsRight | kLHintsCenterY , 2, 10, 10, 10));
+        b->Connect("Clicked()", "DelphesEventDisplay", this, "Fwd()");
+  
+     }
+     vf->AddFrame(hf, new TGLayoutHints(kLHintsExpandX , 2, 2, 2, 2));
+
+     progress_ = new TGHProgressBar(frmMain, TGProgressBar::kFancy, 100);
+     progress_->SetMax( treeReader_->GetEntries());
+     progress_->ShowPosition(kTRUE, kFALSE, "Event %.0f");
+     progress_->SetBarColor("green");
+     vf->AddFrame(progress_, new TGLayoutHints(kLHintsExpandX, 10, 10, 5, 5));
+   }
+   frmMain->AddFrame(vf, new TGLayoutHints(kLHintsExpandX , 5, 5, 5, 5));
+   vf = new TGGroupFrame(frmMain,"Batch operations",kVerticalFrame | kFitWidth );
+   {
+        TGTextButton *b = new TGTextButton(vf, "Initialize Summary Plots");
+        vf->AddFrame(b, new TGLayoutHints(kLHintsCenterX | kLHintsCenterY | kLHintsExpandX, 10, 10, 10, 10));
+        b->Connect("Clicked()", "DelphesEventDisplay", this, "InitSummaryPlots()");
+   }
+   frmMain->AddFrame(vf, new TGLayoutHints(kLHintsExpandX , 5, 5, 5, 5));
+
    frmMain->MapSubwindows();
    frmMain->Resize();

display/DelphesEventDisplay.h

@@ -32 +32 @@
 #include "TClonesArray.h"
 #include "TGStatusBar.h"
+#include "TGNumberEntry.h"
+#include "TGProgressBar.h"
+
+
 
 /*
@@ -65 +69 @@
     DelphesPlotSummary *plotSummary_;
     TGStatusBar* fStatusBar_;
+    TGNumberEntry* numberEntry_; // event_id
+    TGHProgressBar* progress_; // event_id
+    
 
     // gui controls
   public:
      void Fwd() {  
-        if (event_id_ < treeReader_->GetEntries() - 1) {
+        if (event_id_ < treeReader_->GetEntries() - 2) {
            ++event_id_;
+           numberEntry_->SetIntNumber(event_id_);
+           progress_->SetPosition(event_id_);
            load_event();
         } else {
@@ -80 +89 @@
         if (event_id_ > 0) {
            --event_id_;
+           numberEntry_->SetIntNumber(event_id_);
+           progress_->SetPosition(event_id_);
            load_event();
         } else {
@@ -85 +96 @@
         }
      }
+
+    void GoTo(Long_t ev) {
+      Int_t event = Int_t(numberEntry_->GetNumber());
+      if (event < treeReader_->GetEntries()-1) {
+        event_id_ = event;
+        progress_->SetPosition(event_id_);  //TODO we could provide a signal related to event_id changes
+        load_event();
+      } else {
+        printf("Error: no such event.\n");
+      }
+    }
+
+    void InitSummaryPlots() {
+      plotSummary_->FillSample(treeReader_, event_id_); // TODO we could add a signal to give the progress
+      plotSummary_->FillEvent();
+      plotSummary_->Draw();
+    }
 };
 

display/DelphesPlotSummary.cc

@@ -8 +8 @@
 
 DelphesPlotSummary::~DelphesPlotSummary() {}
-
-//TODO: sort the vectors before filling.
 
 void DelphesPlotSummary::Init(std::vector<DelphesBranchBase*>& elements) {
@@ -98 +96 @@
 }
 
-void DelphesPlotSummary::FillEvent() {
+void DelphesPlotSummary::FillEvent() { //TODO make it faster... try to reuse objects and simply change the values
   // clear previous markers
   for(std::map< TString, std::vector<TMarker*> >::iterator mv = eventMarkers_.begin(); mv!=eventMarkers_.end();++mv) {