Changeset fafc433 in git for display/DelphesEventDisplay.cc

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.cc (modified) (14 diffs)

display/DelphesEventDisplay.cc

@@ -31 +31 @@
 DelphesEventDisplay::DelphesEventDisplay()
 {
-   event_id = 0;
+   event_id_ = 0;
    tkRadius_ = 1.29;
    totRadius_ = 2.0;
@@ -37 +37 @@
    bz_ = 3.8;
    chain_ = new TChain("Delphes");
-   gTreeReader = 0;
-   gDelphesDisplay = 0;
+   treeReader_ = 0;
+   delphesDisplay_ = 0;
 }
 
@@ -48 +48 @@
 DelphesEventDisplay::DelphesEventDisplay(const char *configFile, const char *inputFile, Delphes3DGeometry& det3D)
 {
-   event_id = 0;
+   event_id_ = 0;
    tkRadius_ = 1.29;
    totRadius_ = 2.0;
@@ -54 +54 @@
    bz_ = 3.8;
    chain_ = new TChain("Delphes");
-   gTreeReader = 0;
-   gDelphesDisplay = 0;
+   treeReader_ = 0;
+   delphesDisplay_ = 0;
 
    // initialize the application
@@ -103 +103 @@
    // Create object of class ExRootTreeReader
    printf("*** Opening Delphes data file ***\n");
-   gTreeReader = new ExRootTreeReader(chain_);
+   treeReader_ = new ExRootTreeReader(chain_);
 
    // prepare data collections
-   readConfig(configFile, det3D, gElements, gArrays);
-   for(std::vector<DelphesBranchBase*>::iterator element = gElements.begin(); element<gElements.end(); ++element) {
+   readConfig(configFile, det3D, elements_, arrays_);
+   for(std::vector<DelphesBranchBase*>::iterator element = elements_.begin(); element<elements_.end(); ++element) {
      DelphesBranchElement<TEveTrackList>*   item_v1 = dynamic_cast<DelphesBranchElement<TEveTrackList>*>(*element);
      DelphesBranchElement<TEveElementList>* item_v2 = dynamic_cast<DelphesBranchElement<TEveElementList>*>(*element);
@@ -115 +115 @@
 
    // viewers and scenes
-   gDelphesDisplay = new DelphesDisplay;
+   delphesDisplay_ = new DelphesDisplay;
    gEve->AddGlobalElement(geometry);
-   gDelphesDisplay->ImportGeomRPhi(geometry);
-   gDelphesDisplay->ImportGeomRhoZ(geometry);
+   delphesDisplay_->ImportGeomRPhi(geometry);
+   delphesDisplay_->ImportGeomRhoZ(geometry);
    // find the first calo data and use that to initialize the calo display
-   for(std::vector<DelphesBranchBase*>::iterator data=gElements.begin();data<gElements.end();++data) {
+   for(std::vector<DelphesBranchBase*>::iterator data=elements_.begin();data<elements_.end();++data) {
      if(TString((*data)->GetType())=="tower") { // we could also use GetClassName()=="DelphesCaloData"
        DelphesCaloData* container = dynamic_cast<DelphesBranchElement<DelphesCaloData>*>((*data))->GetContainer();
@@ -128 +128 @@
        calo3d->SetEndCapPos(tkHalfLength_);
        gEve->AddGlobalElement(calo3d);
-       gDelphesDisplay->ImportCaloRPhi(calo3d);
-       gDelphesDisplay->ImportCaloRhoZ(calo3d);
+       delphesDisplay_->ImportCaloRPhi(calo3d);
+       delphesDisplay_->ImportCaloRhoZ(calo3d);
        TEveCaloLego *lego = new TEveCaloLego(container);
        lego->InitMainTrans();
@@ -135 +135 @@
        lego->SetAutoRebin(kFALSE);
        lego->Set2DMode(TEveCaloLego::kValSizeOutline);
-       gDelphesDisplay->ImportCaloLego(lego);
+       delphesDisplay_->ImportCaloLego(lego);
        break;
      }
    }
 
-   //make_gui(); //TODO put back!
-   //load_event(); //TODO put back!
+   make_gui();
+   load_event();
    gEve->Redraw3D(kTRUE);   
 
@@ -217 +217 @@
      }
 //TODO one possible simplification could be to add the array to the element class.
-     arrays.push_back(gTreeReader->UseBranch(name));
+     arrays.push_back(treeReader_->UseBranch(name));
    }
    // second loop for tracks
@@ -232 +232 @@
        trkProp->SetMaxR(tk_radius);
        trkProp->SetMaxZ(tk_length);
-       arrays.push_back(gTreeReader->UseBranch(name));
+       arrays.push_back(treeReader_->UseBranch(name));
      }
    }
@@ -241 +241 @@
 void DelphesEventDisplay::load_event()
 {
-   // Load event specified in global event_id.
+   // Load event specified in global event_id_.
    // The contents of previous event are removed.
 
    //TODO move this to the status bar ???
-   printf("Loading event %d.\n", event_id);
+   printf("Loading event %d.\n", event_id_);
 
 
    // clear the previous event
    gEve->GetViewers()->DeleteAnnotations();
-   for(std::vector<DelphesBranchBase*>::iterator data=gElements.begin();data<gElements.end();++data) {
+   for(std::vector<DelphesBranchBase*>::iterator data=elements_.begin();data<elements_.end();++data) {
      (*data)->Reset();
    }
@@ -259 +259 @@
    // update display
    TEveElement* top = (TEveElement*)gEve->GetCurrentEvent();
-   gDelphesDisplay->DestroyEventRPhi();
-   gDelphesDisplay->ImportEventRPhi(top);
-   gDelphesDisplay->DestroyEventRhoZ();
-   gDelphesDisplay->ImportEventRhoZ(top);
+   delphesDisplay_->DestroyEventRPhi();
+   delphesDisplay_->ImportEventRPhi(top);
+   delphesDisplay_->DestroyEventRhoZ();
+   delphesDisplay_->ImportEventRhoZ(top);
    //update_html_summary();
    gEve->Redraw3D(kFALSE, kTRUE);
@@ -271 +271 @@
 
   // safety
-  if(event_id >= gTreeReader->GetEntries() || event_id<0 ) return;
+  if(event_id_ >= treeReader_->GetEntries() || event_id_<0 ) return;
 
   // Load selected branches with data from specified event
-  gTreeReader->ReadEntry(event_id);
+  treeReader_->ReadEntry(event_id_);
 
   // loop over selected branches, and apply the proper recipe to fill the collections.
-  // this is basically to loop on gArrays to fill gElements.
+  // this is basically to loop on arrays_ to fill elements_.
 
 //TODO: one option would be to have templated methods in the element classes. We could simply call "element.fill()"
-  std::vector<TClonesArray*>::iterator data = gArrays.begin();
-  std::vector<DelphesBranchBase*>::iterator element = gElements.begin();
-  for(; data<gArrays.end() && element<gElements.end(); ++data, ++element) {
+  std::vector<TClonesArray*>::iterator data = arrays_.begin();
+  std::vector<DelphesBranchBase*>::iterator element = elements_.begin();
+  for(; data<arrays_.end() && element<elements_.end(); ++data, ++element) {
     TString type = (*element)->GetType();
     // branch on the element type
@@ -474 +474 @@
         icondir = Form("%s/icons/", (const char*)gSystem->GetFromPipe("root-config --etcdir") );
       TGPictureButton* b = 0;
-      EvNavHandler    *fh = new EvNavHandler(this);
 
       b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoBack.gif"));
       hf->AddFrame(b);
-      b->Connect("Clicked()", "EvNavHandler", fh, "Bck()");
+      b->Connect("Clicked()", "DelphesEventDisplay", this, "Bck()");
 
       b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoForward.gif"));
       hf->AddFrame(b);
-      b->Connect("Clicked()", "EvNavHandler", fh, "Fwd()");
+      b->Connect("Clicked()", "DelphesEventDisplay", this, "Fwd()");
    }
    frmMain->AddFrame(hf);