Changeset fafc433 in git for display/DelphesEventDisplay.h

Timestamp:

Oct 16, 2014, 2:19:17 PM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

30bb83a

Parents:

a3b2495

Message:

Working basic GUI

The functionality of Fwd and Bck buttons has been restored.
This brings us back to a fully working prototype ready for new features.

File:

• display/DelphesEventDisplay.h (modified) (3 diffs)

display/DelphesEventDisplay.h

@@ -21 +21 @@
 
 #include <vector>
+#include <iostream>
 #include "external/ExRootAnalysis/ExRootTreeReader.h"
 #include "display/DelphesDisplay.h"
@@ -40 +41 @@
     DelphesEventDisplay(const char *configFile, const char *inputFile, Delphes3DGeometry& det3D);
     ~DelphesEventDisplay();
-    Int_t event_id;
-    ExRootTreeReader *gTreeReader;
-    void load_event();
 
   private:
     void make_gui();
+    void load_event();
     void delphes_read();
     void delphes_read_towers(TClonesArray* data, DelphesBranchBase* element);
@@ -54 +53 @@
 
     // Configuration and global variables.
+    Int_t event_id_;
+    ExRootTreeReader *treeReader_;
     Double_t tkRadius_, totRadius_, tkHalfLength_, bz_;
     TChain* chain_;
-    std::vector<DelphesBranchBase*> gElements;
-    std::vector<TClonesArray*> gArrays;
-    DelphesDisplay *gDelphesDisplay;
+    std::vector<DelphesBranchBase*> elements_;
+    std::vector<TClonesArray*> arrays_;
+    DelphesDisplay *delphesDisplay_;
 
-    // EvNavHandler class is needed to connect GUI signals.
-    class EvNavHandler
-    {     
-      public:
-      
-         EvNavHandler(DelphesEventDisplay* display):display_(display) {}
+    // gui controls
+  public:
+     void Fwd() {  
+        if (event_id_ < treeReader_->GetEntries() - 1) {
+           ++event_id_;
+           load_event();
+        } else {
+           printf("Already at last event.\n");
+        }
+     }
 
-         ~EvNavHandler() {}
-
-         void Fwd() {  
-            if (display_->event_id < display_->gTreeReader->GetEntries() - 1) {
-               ++(display_->event_id);
-               display_->load_event();
-            } else {
-               printf("Already at last event.\n");
-            }
-         }
-
-         void Bck() {
-            if (display_->event_id > 0) {
-               --(display_->event_id);
-               display_->load_event();
-            } else {
-               printf("Already at first event.\n");
-            }
-         }
-       private:
-         DelphesEventDisplay* display_;
-    };
+     void Bck() {
+        if (event_id_ > 0) {
+           --event_id_;
+           load_event();
+        } else {
+           printf("Already at first event.\n");
+        }
+     }
 };