Changeset a3b2495 in git

Timestamp:

Oct 16, 2014, 10:52:47 AM (10 years ago)

Author:

Christophe Delaere <christophe.delaere@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fafc433

Parents:

84dd1c8

Message:

Display of automatically selected elements working

The original features are back, but with a much more flexible code that
selects automatically the list of branches from the tcl file. The main
issue left is the GUI (handler not found), and then some more
cleaning. One idea is to further exploit templating to avoid ifs when
leading events.

Location:

display

Files:

• DelphesBranchElement.cc (modified) (2 diffs)
• DelphesEventDisplay.cc (modified) (17 diffs)

display/DelphesBranchElement.cc

@@ -43 +43 @@
 template<> void DelphesBranchElement<TEveElementList>::Reset() { data_->DestroyElements(); }
 
+//TODO: does the type really make sense?
 // special case for track lists
 template<> DelphesBranchElement<TEveTrackList>::DelphesBranchElement(const char* name, const char*type, const enum EColor color):DelphesBranchBase(name, type, color) {
@@ -58 +59 @@
         data_->SetMarkerSize(0.5);
       } else {
-        throw std::exception();
+        data_ = new TEveTrackList(name);
+        data_->SetMainColor(color_);
+        data_->SetMarkerColor(color_);
+        data_->SetMarkerStyle(kCircle);
+        data_->SetMarkerSize(0.5);
+        //throw std::exception();
       }
     }

display/DelphesEventDisplay.cc

@@ -109 +109 @@
    for(std::vector<DelphesBranchBase*>::iterator element = gElements.begin(); element<gElements.end(); ++element) {
      DelphesBranchElement<TEveTrackList>*   item_v1 = dynamic_cast<DelphesBranchElement<TEveTrackList>*>(*element);
-     DelphesBranchElement<DelphesCaloData>* item_v2 = dynamic_cast<DelphesBranchElement<DelphesCaloData>*>(*element);
-     DelphesBranchElement<TEveElementList>* item_v3 = dynamic_cast<DelphesBranchElement<TEveElementList>*>(*element);
+     DelphesBranchElement<TEveElementList>* item_v2 = dynamic_cast<DelphesBranchElement<TEveElementList>*>(*element);
      if(item_v1) gEve->AddElement(item_v1->GetContainer());
      if(item_v2) gEve->AddElement(item_v2->GetContainer());
-     if(item_v3) gEve->AddElement(item_v3->GetContainer());
    }
 
@@ -123 +121 @@
    // 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) {
-     if(TString((*data)->GetType())=="tower") {
+     if(TString((*data)->GetType())=="tower") { // we could also use GetClassName()=="DelphesCaloData"
        DelphesCaloData* container = dynamic_cast<DelphesBranchElement<DelphesCaloData>*>((*data))->GetContainer();
        assert(container);
@@ -142 +140 @@
    }
 
-   //make_gui();
-   //load_event();
+   //make_gui(); //TODO put back!
+   //load_event(); //TODO put back!
    gEve->Redraw3D(kTRUE);   
 
@@ -163 +161 @@
    DelphesBranchElement<DelphesCaloData>* clist;
    DelphesBranchElement<TEveElementList>* elist;
+   // first loop with all but tracks
    for(Int_t b = 0; b<nBranches; ++b) {
      TString input = branches[b*3].GetString();
      TString name = branches[b*3+1].GetString();
      TString className = branches[b*3+2].GetString();
-     if(className=="Track") {
-       if(input.Contains("eflow",TString::kIgnoreCase) || name.Contains("eflow",TString::kIgnoreCase)) continue; //no eflow
-       tlist = new DelphesBranchElement<TEveTrackList>(name,"track",kBlue);
-       elements.push_back(tlist);
-       TEveTrackPropagator *trkProp = tlist->GetContainer()->GetPropagator();
-       trkProp->SetMagField(0., 0., -tk_Bz);
-       trkProp->SetMaxR(tk_radius);
-       trkProp->SetMaxZ(tk_length);
-     } else if(className=="Tower") {
+     if(className=="Tower") {
        if(input.Contains("eflow",TString::kIgnoreCase) || name.Contains("eflow",TString::kIgnoreCase)) continue; //no eflow
        clist = new DelphesBranchElement<DelphesCaloData>(name,"tower",kBlack);
@@ -191 +182 @@
        }
      } else if(className=="Electron") {
-       tlist = new DelphesBranchElement<TEveTrackList>(name,"track",kRed);
+       tlist = new DelphesBranchElement<TEveTrackList>(name,"electron",kRed);
        elements.push_back(tlist);
        TEveTrackPropagator *trkProp = tlist->GetContainer()->GetPropagator();
@@ -205 +196 @@
        trkProp->SetMaxZ(tk_length);
      } else if(className=="Muon") {
-       tlist = new DelphesBranchElement<TEveTrackList>(name,"track",kGreen);
+       tlist = new DelphesBranchElement<TEveTrackList>(name,"muon",kGreen);
        elements.push_back(tlist);
        TEveTrackPropagator *trkProp = tlist->GetContainer()->GetPropagator();
@@ -214 +205 @@
        elements.push_back(new DelphesBranchElement<TEveElementList>(name,"vector",kViolet));
      } else if(className=="GenParticle") {
-       tlist = new DelphesBranchElement<TEveTrackList>(name,"track",kCyan);
+       tlist = new DelphesBranchElement<TEveTrackList>(name,"genparticle",kCyan);
        elements.push_back(tlist);
        tlist->GetContainer()->SetRnrSelf(false);
@@ -222 +213 @@
        trkProp->SetMaxR(tk_radius);
        trkProp->SetMaxZ(tk_length);
+     } else {
+       continue;
      }
 //TODO one possible simplification could be to add the array to the element class.
      arrays.push_back(gTreeReader->UseBranch(name));
+   }
+   // second loop for tracks
+   for(Int_t b = 0; b<nBranches; ++b) {
+     TString input = branches[b*3].GetString();
+     TString name = branches[b*3+1].GetString();
+     TString className = branches[b*3+2].GetString();
+     if(className=="Track") {
+       if(input.Contains("eflow",TString::kIgnoreCase) || name.Contains("eflow",TString::kIgnoreCase)) continue; //no eflow
+       tlist = new DelphesBranchElement<TEveTrackList>(name,"track",kBlue);
+       elements.push_back(tlist);
+       TEveTrackPropagator *trkProp = tlist->GetContainer()->GetPropagator();
+       trkProp->SetMagField(0., 0., -tk_Bz);
+       trkProp->SetMaxR(tk_radius);
+       trkProp->SetMaxZ(tk_length);
+       arrays.push_back(gTreeReader->UseBranch(name));
+     }
    }
 }
@@ -248 +257 @@
    delphes_read();
 
-//TODO: it blocks somewhere below....
-//TODO: also the event content has one weird entry "TEveCalData" -> corruption????
-//other observation: projections appear in the 3D view ! -> seems to indicate that we have a common problem there.
-//should check the content of the elements vector when filling them
    // update display
    TEveElement* top = (TEveElement*)gEve->GetCurrentEvent();
@@ -277 +282 @@
   std::vector<TClonesArray*>::iterator data = gArrays.begin();
   std::vector<DelphesBranchBase*>::iterator element = gElements.begin();
-  std::vector<TClonesArray*>::iterator data_tracks = gArrays.begin();
-  std::vector<DelphesBranchBase*>::iterator element_tracks = gElements.begin();
-  Int_t nTracks = 0;
   for(; data<gArrays.end() && element<gElements.end(); ++data, ++element) {
     TString type = (*element)->GetType();
-    // keep the most generic track collection for the end
-    if(type=="track" && TString((*element)->GetClassName())=="Track" && nTracks==0) {
-      data_tracks = data;
-      element_tracks = element;
-      nTracks = (*data_tracks)->GetEntries();
-      continue;
-    }
     // branch on the element type
     if(type=="tower") delphes_read_towers(*data,*element);
-    else if(type=="track" || type=="photon") delphes_read_tracks(*data,*element);
+    else if(type=="track" || type=="photon" || type=="electron" || type=="muon" || type=="genparticle") delphes_read_tracks(*data,*element);
     else if(type=="jet") delphes_read_jets(*data,*element);
     else if(type=="vector") delphes_read_vectors(*data,*element);
   }
-  // finish whith what we consider to be the main track collection
-  if(nTracks>0) delphes_read_tracks(*data,*element);
 }
 
@@ -317 +310 @@
   TEveTrackList* container = dynamic_cast<DelphesBranchElement<TEveTrackList>*>(element)->GetContainer();
   assert(container);
-  TString className = element->GetClassName();
+  TString type = element->GetType();
   TIter itTrack(data);
   Int_t counter = 0;
   TEveTrack *eveTrack;
   TEveTrackPropagator *trkProp = container->GetPropagator();
-  if(className=="Track") {
+  if(type=="track") {
     // Loop over all tracks
     Track *track;
@@ -330 +323 @@
                    track->P4().Pz(), track->P4().E(),
                    track->X, track->Y, track->Z, 0.0);
-
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -339 +331 @@
       eveTrack->MakeTrack();
     }
-  } else if(className=="Electron") {
+  } else if(type=="electron") {
     // Loop over all electrons
     Electron *electron;
@@ -346 +338 @@
                    electron->P4().Px(), electron->P4().Py(),
                    electron->P4().Pz(), electron->P4().E(),
-                   0., 0., 0., 0.);
-
-      eveTrack = new TEveTrack(&pb, counter, trkProp);
-      eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
-      eveTrack->SetStdTitle();
-      eveTrack->SetAttLineAttMarker(container);
-      container->AddElement(eveTrack);
-      eveTrack->SetLineColor(element->GetColor());
-      eveTrack->MakeTrack();
-  }
-  } else if(className=="Muon") {
-    // Loop over all muons
-    Muon *muon;
-    while((muon = (Muon *) itTrack.Next())) {
-      TParticle pb(muon->Charge<0?13:-13, 1, 0, 0, 0, 0,
-                   muon->P4().Px(), muon->P4().Py(),
-                   muon->P4().Pz(), muon->P4().E(),
                    0., 0., 0., 0.);
 
@@ -373 +348 @@
       eveTrack->MakeTrack();
     }
-  } else if(className=="Photon") {
+  } else if(type=="muon") {
+    // Loop over all muons
+    Muon *muon;
+    while((muon = (Muon *) itTrack.Next())) {
+      TParticle pb(muon->Charge<0?13:-13, 1, 0, 0, 0, 0,
+                   muon->P4().Px(), muon->P4().Py(),
+                   muon->P4().Pz(), muon->P4().E(),
+                   0., 0., 0., 0.);
+
+      eveTrack = new TEveTrack(&pb, counter, trkProp);
+      eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
+      eveTrack->SetStdTitle();
+      eveTrack->SetAttLineAttMarker(container);
+      container->AddElement(eveTrack);
+      eveTrack->SetLineColor(element->GetColor());
+      eveTrack->MakeTrack();
+    }
+  } else if(type=="photon") {
     // Loop over all photons
     Photon *photon;
@@ -381 +373 @@
                    photon->P4().Pz(), photon->P4().E(),
                    0., 0., 0., 0.);
-
+      eveTrack = new TEveTrack(&pb, counter, trkProp);
+      eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
+      eveTrack->SetStdTitle();
+      eveTrack->SetAttLineAttMarker(container);
+      eveTrack->SetLineStyle(7);
+      container->AddElement(eveTrack);
+      eveTrack->SetLineColor(element->GetColor());
+      eveTrack->MakeTrack();
+    }
+  } else if(type=="genparticle") {
+    // Loop over all particles
+    GenParticle *particle;
+    while((particle = (GenParticle *) itTrack.Next())) {
+      TParticle pb(particle->PID, particle->Status, particle->M1, particle->M2, particle->D1, particle->D2,
+                   particle->P4().Px(), particle->P4().Py(),
+                   particle->P4().Pz(), particle->P4().E(),
+                   particle->X, particle->Y, particle->Z, particle->T);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -388 +396 @@
       container->AddElement(eveTrack);
       eveTrack->SetLineColor(element->GetColor());
+      if(particle->Charge==0) eveTrack->SetLineStyle(7);
       eveTrack->MakeTrack();
     }