Changeset 53b78e8 in git

Timestamp:

Nov 6, 2014, 2:00:06 PM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5565691

Parents:

0a67548

Message:

New signal to show the progress of plot processing

Progress is now shown in the status bar when generating std plots.

Location:

display

Files:

• DelphesEventDisplay.cc (modified) (1 diff)
• DelphesEventDisplay.h (modified) (2 diffs)
• DelphesPlotSummary.cc (modified) (3 diffs)
• DelphesPlotSummary.h (modified) (2 diffs)
• DisplayLinkDef.h (modified) (2 diffs)

display/DelphesEventDisplay.cc

@@ -430 +430 @@
    plotSummary_ = new DelphesPlotSummary(tab);
    plotSummary_->Init(elements_);
-}
-
+   plotSummary_->Connect("Progress(Int_t)", "DelphesEventDisplay", this, "DisplayProgress(Int_t)");
+
+}
+
+

display/DelphesEventDisplay.h

@@ -27 +27 @@
 #include "display/DelphesHtmlSummary.h"
 #include "display/DelphesPlotSummary.h"
+#include "TSystem.h"
 #include "TChain.h"
 #include "TAxis.h"
@@ -105 +106 @@
 
     void InitSummaryPlots() {
-      plotSummary_->FillSample(treeReader_, event_id_); // TODO we could add a signal to give the progress
+      plotSummary_->FillSample(treeReader_, event_id_);
       plotSummary_->FillEvent();
       plotSummary_->Draw();
+    }
+
+    void DisplayProgress(Int_t p) { //TODO replace by a progress bar
+         fStatusBar_->SetText(Form("Processing... %d %%",p), 1);
+         gSystem->ProcessEvents();
     }
 };

display/DelphesPlotSummary.cc

@@ -8 +8 @@
 
 DelphesPlotSummary::~DelphesPlotSummary() {}
+
+void DelphesPlotSummary::Progress(Int_t p)
+{
+  Emit("Progress(Int_t)",p);
+}
 
 void DelphesPlotSummary::Init(std::vector<DelphesBranchBase*>& elements) {
@@ -48 +53 @@
 
 void DelphesPlotSummary::FillSample(ExRootTreeReader* treeReader, Int_t event_id) {
-  for(Int_t i=0;i<treeReader->GetEntries();++i) {
+  Int_t entries = treeReader->GetEntries();
+  for(Int_t i=0;i<entries;++i) {
     treeReader->ReadEntry(i);
     for(std::vector<DelphesBranchBase*>::iterator element = elements_->begin();element<elements_->end();++element) {
@@ -70 +76 @@
       }
     }
+    Progress(int(100*i/entries));
   }
   treeReader->ReadEntry(event_id);
+  Progress(100);
 }
 

display/DelphesPlotSummary.h

@@ -10 +10 @@
 #include "DelphesBranchElement.h"
 #include "external/ExRootAnalysis/ExRootTreeReader.h"
+#include <RQ_OBJECT.h>
+
 
 class DelphesPlotSummary
 {
+    RQ_OBJECT("DelphesPlotSummary")
   public:
     DelphesPlotSummary(TEveWindowTab* tab);
@@ -20 +23 @@
     void FillEvent();
     void Draw();
+    void Progress(Int_t); // *SIGNAL*
 
   private:

display/DisplayLinkDef.h

@@ -36 +36 @@
 #include "display/DelphesEventDisplay.h"
 #include "display/DelphesHtmlSummary.h"
+#include "display/DelphesPlotSummary.h"
 
 #ifdef __CINT__
@@ -52 +53 @@
 #pragma link C++ class DelphesHtmlObjTable;
 #pragma link C++ class DelphesHtmlSummary;
+#pragma link C++ class DelphesPlotSummary;
 
 #endif