Changeset f6b6ee7 in git for display

Timestamp:

Dec 8, 2014, 6:12:04 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

49234af, e7e90df

Parents:

fcdb8bc (diff), c3c9ac5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #3 from delaere/eventdisplay

Eventdisplay

Location:

display

Files:

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

display/Delphes3DGeometry.cc

@@ -42 +42 @@
 using namespace std;
 
-Delphes3DGeometry::Delphes3DGeometry(TGeoManager *geom) {
+Delphes3DGeometry::Delphes3DGeometry(TGeoManager *geom, bool transp) {
 
    //--- the geometry manager
@@ -51 +51 @@
    TGeoMaterial *matVacuum = new TGeoMaterial("Vacuum", 0,0,0);
    TGeoMaterial *matAl = new TGeoMaterial("Al", 26.98,13,2.7); // placeholder
-   matVacuum->SetTransparency(85);
-   matAl->SetTransparency(85);
+   if(transp) {
+     matVacuum->SetTransparency(85);
+     matAl->SetTransparency(85);
+   }
 
    //--- define some media

display/Delphes3DGeometry.h

@@ -35 +35 @@
 class Delphes3DGeometry {
    public:
-     Delphes3DGeometry(TGeoManager *geom = NULL);
+     Delphes3DGeometry(TGeoManager *geom = NULL, bool transp = false);
      ~Delphes3DGeometry() {}
 

display/DelphesEventDisplay.cc

@@ -156 +156 @@
        TEveCaloLego *lego = new TEveCaloLego(container);
        lego->InitMainTrans();
-       lego->RefMainTrans().SetScale(TMath::TwoPi(), TMath::TwoPi(), TMath::Pi());
+ //    lego->RefMainTrans().SetScale(TMath::TwoPi(), TMath::TwoPi(), TMath::Pi());
+       lego->RefMainTrans().SetScale(100, 100, TMath::Pi());
        lego->SetAutoRebin(kFALSE);
        lego->Set2DMode(TEveCaloLego::kValSizeOutline);

display/DelphesEventDisplay.h

@@ -111 +111 @@
     }
 
-    void DisplayProgress(Int_t p) { //TODO replace by a progress bar
+    void DisplayProgress(Int_t p) { 
          fStatusBar_->SetText(Form("Processing... %d %%",p), 1);
          gSystem->ProcessEvents();

display/DelphesPlotSummary.cc

@@ -49 +49 @@
     histograms.push_back(h);
     histograms_[(*data)->GetName()] = histograms;
+    // the event histograms
+    TH1F* h1 = (TH1F*)histograms[0]->Clone(); h1->Reset(); h1->SetLineColor(kBlue);
+    TH1F* h2 = (TH1F*)histograms[1]->Clone(); h2->Reset(); h2->SetLineColor(kBlue);
+    TH1F* h3 = (TH1F*)histograms[2]->Clone(); h3->Reset(); h3->SetLineColor(kBlue);
+    std::vector<TH1F*> hv;
+    hv.push_back(h1);
+    hv.push_back(h2);
+    hv.push_back(h3);
+    eventProfiles_[(*data)->GetName()] = hv;
+    // the event markers
+    TMarker *m;
+    std::vector<TMarker*> mv;
+    m = new TMarker(0,0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
+    mv.push_back(m);
+    m = new TMarker(0,0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
+    mv.push_back(m);
+    m = new TMarker(0,0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
+    mv.push_back(m);
+    m = new TMarker(0,0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
+    mv.push_back(m);
+    m = new TMarker(0,0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
+    mv.push_back(m);
+    m = new TMarker(0,0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
+    mv.push_back(m);
+    eventMarkers_[(*data)->GetName()] = mv;
   }
 }
@@ -95 +120 @@
         eventProfiles[i]->Draw("same");
       } else {
-        if(eventMarkers.size()>(unsigned int)(i-3)) {
-          eventMarkers[i-3]->Draw("same");
-        }
+        eventMarkers[i-3]->Draw("same");
       }
     }
@@ -104 +127 @@
 }
 
-void DelphesPlotSummary::FillEvent() { //TODO make it faster... try to reuse objects and simply change the values
-  // clear previous markers
+void DelphesPlotSummary::FillEvent() {
+  // clear event histograms and markers
+  for(std::map< TString, std::vector<TH1F*> >::iterator hv = eventProfiles_.begin(); hv!=eventProfiles_.end();++hv) {
+    for(std::vector<TH1F*>::iterator h = hv->second.begin(); h<hv->second.end();++h) {
+      (*h)->Reset();
+    }
+  }
   for(std::map< TString, std::vector<TMarker*> >::iterator mv = eventMarkers_.begin(); mv!=eventMarkers_.end();++mv) {
     for(std::vector<TMarker*>::iterator m = mv->second.begin(); m<mv->second.end();++m) {
-      delete *m;
+      (*m)->SetMarkerSize(0);
     }
   }
-  eventMarkers_.clear();
-  for(std::map< TString, std::vector<TH1F*> >::iterator hv = eventProfiles_.begin(); hv!=eventProfiles_.end();++hv) {
-    for(std::vector<TH1F*>::iterator h = hv->second.begin(); h<hv->second.end();++h) {
-      delete *h;
-    }
-  }
-  eventProfiles_.clear();
   // loop over the elements and fill markers with event data
-  TMarker *m;
   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);
-    TH1F* h2 = (TH1F*)histograms[1]->Clone(); h2->Reset(); h2->SetLineColor(kBlue);
-    TH1F* h3 = (TH1F*)histograms[2]->Clone(); h3->Reset(); h3->SetLineColor(kBlue);
+    std::vector<TH1F*> hv = eventProfiles_[(*element)->GetName()];
+    TH1F* h1 = hv[0]; h1->Reset();
+    TH1F* h2 = hv[1]; h1->Reset();
+    TH1F* h3 = hv[2]; h1->Reset();
+    std::vector<TMarker*> mv = eventMarkers_[(*element)->GetName()];
     for(std::vector<TLorentzVector>::iterator it=vectors.begin(); it<vectors.end();++it) {
       h1->Fill(it->Pt());
@@ -133 +153 @@
       h3->Fill(it->Phi());
       if(it==vectors.begin()) {
-        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->SetMarkerSize(3);
-        mv.push_back(m);
-        m = new TMarker(it->Phi(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
-        mv.push_back(m);
+        mv[0]->SetX(it->Pt()); mv[0]->SetMarkerSize(3);
+        mv[1]->SetX(it->Eta()); mv[1]->SetMarkerSize(3);
+        mv[2]->SetX(it->Phi()); mv[2]->SetMarkerSize(3);
       }
       if(it==vectors.begin()+1) {
-        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->SetMarkerSize(3);
-        mv.push_back(m);
-        m = new TMarker(it->Phi(),0,29); m->SetMarkerColor(kBlue); m->SetMarkerSize(3);
-        mv.push_back(m);
+        mv[3]->SetX(it->Pt()); mv[3]->SetMarkerSize(3);
+        mv[4]->SetX(it->Eta()); mv[4]->SetMarkerSize(3);
+        mv[5]->SetX(it->Phi()); mv[5]->SetMarkerSize(3);
       }
     }
-    std::vector<TH1F*> hv;
-    hv.push_back(h1);
-    hv.push_back(h2);
-    hv.push_back(h3);
-    eventProfiles_[(*element)->GetName()] = hv;
-    eventMarkers_[(*element)->GetName()] = mv;
   }
 }