Changeset d38348d in git

Timestamp:

Jun 26, 2015, 11:46:42 AM (10 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fe0273c

Parents:

1d9974e (diff), f53a4d2 (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 #14 from delphes/master

synchronize mergeCMS with master

Files:

• cards/delphes_card_ATLAS.tcl (modified) (1 diff)
• classes/DelphesFormula.cc (modified) (3 diffs)
• classes/DelphesFormula.h (modified) (1 diff)
• classes/DelphesTF2.cc (modified) (3 diffs)
• classes/DelphesTF2.h (modified) (2 diffs)
• display/Delphes3DGeometry.cc (modified) (6 diffs)
• display/Delphes3DGeometry.h (modified) (7 diffs)
• display/DelphesEventDisplay.cc (modified) (16 diffs)
• display/DelphesEventDisplay.h (modified) (4 diffs)
• examples/EventDisplay.C (modified) (2 diffs)
• examples/Example1.C (modified) (1 diff)
• examples/Example2.C (modified) (1 diff)
• examples/Example3.C (modified) (2 diffs)
• examples/Example4.C (modified) (5 diffs)

cards/delphes_card_ATLAS.tcl

@@ -295 +295 @@
 
 module Efficiency PhotonEfficiency {
-  set InputArray Calorimeter/photons
+  set InputArray Calorimeter/eflowPhotons
   set OutputArray photons
 

classes/DelphesFormula.cc

@@ -23 +23 @@
 
 #include <stdexcept>
-#include <string>
 
 using namespace std;
@@ -51 +50 @@
 Int_t DelphesFormula::Compile(const char *expression)
 {
-  string buffer;
+  TString buffer;
   const char *it;
   for(it = expression; *it; ++it)
   {
     if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-    buffer.push_back(*it);
+    buffer.Append(*it);
   }
-  if(TFormula::Compile(buffer.c_str()) != 0)
+  buffer.ReplaceAll("pt", "x");
+  buffer.ReplaceAll("eta", "y");
+  buffer.ReplaceAll("phi", "z");
+  buffer.ReplaceAll("energy", "t");
+  if(TFormula::Compile(buffer) != 0)
   {
     throw runtime_error("Invalid formula.");
@@ -74 +77 @@
 
 //------------------------------------------------------------------------------
-
-Int_t DelphesFormula::DefinedVariable(TString &chaine, Int_t &action)
-{
-  action = kVariable;
-  if(chaine == "pt")
-  {
-    if(fNdim < 1) fNdim = 1;
-    return 0;
-  }
-  else if(chaine == "eta")
-  {
-    if(fNdim < 2) fNdim = 2;
-    return 1;
-  }
-  else if(chaine == "phi")
-  {
-    if(fNdim < 3) fNdim = 3;
-    return 2;
-  }
-  else if(chaine == "energy")
-  {
-    if(fNdim < 4) fNdim = 4;
-    return 3;
-  }
-  return -1;
-}
-
-//------------------------------------------------------------------------------

classes/DelphesFormula.h

@@ -35 +35 @@
 
   Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0);
-
-  Int_t DefinedVariable(TString &variable, Int_t &action);
 };
 

classes/DelphesTF2.cc

@@ -18 +18 @@
 
 #include "classes/DelphesTF2.h"
+
+#include "RVersion.h"
 #include "TString.h"
+
 #include <stdexcept>
-#include <string>
 
 using namespace std;
@@ -34 +36 @@
 
 DelphesTF2::DelphesTF2(const char *name, const char *expression) :
-  TF2(name,expression)
+  TF2(name, expression)
 {
 }
@@ -46 +48 @@
 //------------------------------------------------------------------------------
 
-Int_t DelphesTF2::DefinedVariable(TString &chaine, Int_t &action)
+Int_t DelphesTF2::Compile(const char *expression)
 {
-  action = kVariable;
-  if(chaine == "z")
+  TString buffer;
+  const char *it;
+  for(it = expression; *it; ++it)
   {
-    if(fNdim < 1) fNdim = 1;
-    return 0;
+    if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
+    buffer.Append(*it);
   }
-  else if(chaine == "t")
+  buffer.ReplaceAll("z", "x");
+  buffer.ReplaceAll("t", "y");
+#if  ROOT_VERSION_CODE < ROOT_VERSION(6,04,00)
+  if(TF2::Compile(buffer) != 0)
+#else
+  if(TF2::GetFormula()->Compile(buffer) != 0)
+#endif
   {
-    if(fNdim < 2) fNdim = 2;
-    return 1;
+    throw runtime_error("Invalid formula.");
   }
-  return -1;
+  return 0;
 }
 

classes/DelphesTF2.h

@@ -21 +21 @@
 
 #include "TF2.h"
-#include "TFormula.h"
-
-#include <string>
 
 class DelphesTF2: public TF2
@@ -35 +32 @@
   ~DelphesTF2();
 
-  Int_t DefinedVariable(TString &variable, Int_t &action);
-
+  Int_t Compile(const char *expression);
 };
 
 #endif /* DelphesTF2_h */
-

display/Delphes3DGeometry.cc

@@ -17 +17 @@
  */
 
-#include "display/Delphes3DGeometry.h"
 #include <set>
 #include <map>
-#include <string>
 #include <utility>
 #include <vector>
@@ -26 +24 @@
 #include <sstream>
 #include <cassert>
+
+#include "TAxis.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
@@ -35 +35 @@
 #include "TGeoCone.h"
 #include "TGeoArb8.h"
-#include "external/ExRootAnalysis/ExRootConfReader.h"
-#include "classes/DelphesClasses.h"
 #include "TF2.h"
 #include "TFormula.h"
 #include "TH1F.h"
 #include "TMath.h"
+#include "TString.h"
+
+#include "display/Delphes3DGeometry.h"
+
+#include "classes/DelphesClasses.h"
+#include "external/ExRootAnalysis/ExRootConfReader.h"
 
 using namespace std;
@@ -93 +97 @@
    tk_Bz_     = confReader->GetDouble("ParticlePropagator::Bz", 0.0);                           // tk_Bz
    
-   string buffer;
+   TString buffer;
    const char *it;
  
@@ -103 +107 @@
    tkEffFormula.ReplaceAll("phi","0.");
  
+   buffer.Clear();
    for(it = tkEffFormula.Data(); *it; ++it)
    {
      if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.push_back(*it);
-   }
-
-   TF2* tkEffFunction = new TF2("tkEff",buffer.c_str(),0,1000,-10,10);
+     buffer.Append(*it);
+   }
+
+   TF2* tkEffFunction = new TF2("tkEff",buffer,0,1000,-10,10);
    TH1F etaHisto("eta","eta",100,5.,-5.);
    Double_t pt,eta;
@@ -132 +137 @@
    muonEffFormula.ReplaceAll("phi","0.");
    
-   buffer.clear();
+   buffer.Clear();
    for(it = muonEffFormula.Data(); *it; ++it)
    {
      if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-     buffer.push_back(*it);
-   }
-
-   TF2* muEffFunction = new TF2("muEff",buffer.c_str(),0,1000,-10,10);
+     buffer.Append(*it);
+   }
+
+   TF2* muEffFunction = new TF2("muEff",buffer,0,1000,-10,10);
    TH1F etaHisto("eta2","eta2",100,5.,-5.);
    Double_t pt,eta;

display/Delphes3DGeometry.h

@@ -1 +1 @@
 /*
- *  Delphes: a framework for fast simulation of a generic collider experiment
- *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
+  * Delphes: a framework for fast simulation of a generic collider experiment
+  * Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22 +22 @@
 #include <set>
 #include <map>
-#include <utility>
 #include <vector>
-#include <algorithm>
-#include <sstream>
-#include "TAxis.h"
-#include "TGeoManager.h"
-#include "TGeoVolume.h"
-#include "TGeoMedium.h"
+
+#include "Rtypes.h"
+
+class TAxis;
+class TGeoManager;
+class TGeoVolume;
+class TGeoMedium;
 
 // TODO: asymmetric detector
@@ -38 +38 @@
      ~Delphes3DGeometry() {}
 
-     void readFile(const char* filename, const char* ParticlePropagator="ParticlePropagator",
-                                         const char* TrackingEfficiency="ChargedHadronTrackingEfficiency",
-                                         const char* MuonEfficiency="MuonEfficiency",
-                                         const char* Calorimeters="Calorimeter");
+     void readFile(const char *filename, const char *ParticlePropagator="ParticlePropagator",
+                                         const char *TrackingEfficiency="ChargedHadronTrackingEfficiency",
+                                         const char *MuonEfficiency="MuonEfficiency",
+                                         const char *Calorimeters="Calorimeter");
 
      void setContingency(Double_t contingency) { contingency_ = contingency; }
@@ -48 +48 @@
      void setMuonSystemThickness(Double_t thickness) { muonSystem_thickn_ = thickness; }
 
-     TGeoVolume* getDetector(bool withTowers = true);
+     TGeoVolume *getDetector(bool withTowers = true);
 
      Double_t getTrackerRadius() const { return tk_radius_; }
@@ -59 +59 @@
    private:
      std::pair<Double_t, Double_t> addTracker(TGeoVolume *top);
-     std::pair<Double_t, Double_t> addCalorimeter(TGeoVolume *top, const char* name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set< std::pair<Double_t, Int_t> >& caloBinning);
-     std::pair<Double_t, Double_t> addMuonDets(TGeoVolume *top, const char* name, Double_t innerBarrelRadius, Double_t innerBarrelLength);
-     void addCaloTowers(TGeoVolume *top, const char* name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set< std::pair<Double_t, Int_t> >& caloBinning);
+     std::pair<Double_t, Double_t> addCalorimeter(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set< std::pair<Double_t, Int_t> >& caloBinning);
+     std::pair<Double_t, Double_t> addMuonDets(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength);
+     void addCaloTowers(TGeoVolume *top, const char *name, Double_t innerBarrelRadius, Double_t innerBarrelLength, std::set< std::pair<Double_t, Int_t> >& caloBinning);
 
    private:
@@ -72 +72 @@
      TGeoMedium *mudetmed_;
 
-     TAxis* etaAxis_;
-     TAxis* phiAxis_;
+     TAxis *etaAxis_;
+     TAxis *phiAxis_;
 
      Double_t contingency_;
@@ -91 +91 @@
      std::map<std::string, Double_t> muonSystem_etamax_;
      std::map<std::string, std::set< std::pair<Double_t, Int_t> > > caloBinning_;
-     
+
 };
 

display/DelphesEventDisplay.cc

@@ -1 +1 @@
 /*
- *  Delphes: a framework for fast simulation of a generic collider experiment
- *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
+  * Delphes: a framework for fast simulation of a generic collider experiment
+  * Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21 +21 @@
 #include <utility>
 #include <algorithm>
+
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
-#include "external/ExRootAnalysis/ExRootConfReader.h"
-#include "external/ExRootAnalysis/ExRootTreeReader.h"
-#include "display/DelphesCaloData.h"
-#include "display/DelphesBranchElement.h"
-#include "display/Delphes3DGeometry.h"
-#include "display/DelphesEventDisplay.h"
-#include "classes/DelphesClasses.h"
 #include "TEveElement.h"
 #include "TEveJetCone.h"
@@ -53 +47 @@
 #include "TCanvas.h"
 #include "TH1F.h"
+#include "TAxis.h"
+#include "TChain.h"
+#include "TGHtml.h"
+#include "TGStatusBar.h"
+
+#include "display/DelphesCaloData.h"
+#include "display/DelphesBranchElement.h"
+#include "display/Delphes3DGeometry.h"
+#include "display/DelphesEventDisplay.h"
+#include "display/DelphesDisplay.h"
+#include "display/Delphes3DGeometry.h"
+#include "display/DelphesHtmlSummary.h"
+#include "display/DelphesPlotSummary.h"
+
+#include "classes/DelphesClasses.h"
+#include "external/ExRootAnalysis/ExRootConfReader.h"
+#include "external/ExRootAnalysis/ExRootTreeReader.h"
 
 DelphesEventDisplay::DelphesEventDisplay()
@@ -98 +109 @@
    TEveManager::Create(kTRUE, "IV");
    fStatusBar_ = gEve->GetBrowser()->GetStatusBar();
-   TGeoManager* geom = gGeoManager;
+   TGeoManager *geom = gGeoManager;
 
    // build the detector
@@ -108 +119 @@
    etaAxis_ = det3D.getCaloAxes().first;
    phiAxis_ = det3D.getCaloAxes().second;
-   TGeoVolume* top = det3D.getDetector(false);
+   TGeoVolume *top = det3D.getDetector(false);
    geom->SetTopVolume(top);
    TEveElementList *geometry = new TEveElementList("Geometry");
-   TObjArray* nodes = top->GetNodes();
+   TObjArray *nodes = top->GetNodes();
    TIter itNodes(nodes);
-   TGeoNode* nodeobj;
-   TEveGeoTopNode* node;
+   TGeoNode *nodeobj;
+   TEveGeoTopNode *node;
    while((nodeobj = (TGeoNode*)itNodes.Next())) {
      node = new TEveGeoTopNode(gGeoManager,nodeobj);
@@ -131 +142 @@
    // prepare data collections
    readConfig(configFile, elements_);
-   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);
+   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);
      if(item_v1) gEve->AddElement(item_v1->GetContainer());
      if(item_v2) gEve->AddElement(item_v2->GetContainer());
@@ -144 +155 @@
    delphesDisplay_->ImportGeomRhoZ(geometry);
    // find the first calo data and use that to initialize the calo display
-   for(std::vector<DelphesBranchBase*>::iterator data=elements_.begin();data<elements_.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();
+       DelphesCaloData *container = dynamic_cast<DelphesBranchElement<DelphesCaloData>*>((*data))->GetContainer();
        assert(container);
        TEveCalo3D *calo3d = new TEveCalo3D(container);
@@ -182 +193 @@
    ExRootConfParam branches = confReader->GetParam("TreeWriter::Branch");
    Int_t nBranches = branches.GetSize()/3;
-   DelphesBranchElement<TEveTrackList>* tlist;
-   DelphesBranchElement<DelphesCaloData>* clist;
-   DelphesBranchElement<TEveElementList>* elist;
+   DelphesBranchElement<TEveTrackList> *tlist;
+   DelphesBranchElement<DelphesCaloData> *clist;
+   DelphesBranchElement<TEveElementList> *elist;
    // first loop with all but tracks
    for(Int_t b = 0; b<nBranches; ++b) {
@@ -273 +284 @@
 
    // update display
-   TEveElement* top = (TEveElement*)gEve->GetCurrentEvent();
+   TEveElement *top = (TEveElement*)gEve->GetCurrentEvent();
    delphesDisplay_->DestroyEventRPhi();
    delphesDisplay_->ImportEventRPhi(top);
@@ -356 +367 @@
 
    // add a tab on the left
-   TEveBrowser* browser = gEve->GetBrowser();
+   TEveBrowser *browser = gEve->GetBrowser();
    browser->SetWindowName("Delphes Event Display");
    browser->StartEmbedding(TRootBrowser::kLeft);
 
    // set the main title
-   TGMainFrame* frmMain = new TGMainFrame(gClient->GetRoot(), 1000, 600);
+   TGMainFrame *frmMain = new TGMainFrame(gClient->GetRoot(), 1000, 600);
    frmMain->SetWindowName("Delphes Event Display");
    frmMain->SetCleanup(kDeepCleanup);
@@ -371 +382 @@
    if(!gSystem->OpenDirectory(icondir)) 
      icondir = Form("%s/icons/", (const char*)gSystem->GetFromPipe("root-config --etcdir") );
-   TGGroupFrame* vf = new TGGroupFrame(frmMain,"Event navigation",kVerticalFrame | kFitWidth );
+   TGGroupFrame *vf = new TGGroupFrame(frmMain,"Event navigation",kVerticalFrame | kFitWidth );
    {
-     TGHorizontalFrame* hf = new TGHorizontalFrame(frmMain);
+     TGHorizontalFrame *hf = new TGHorizontalFrame(frmMain);
      {
-        TGPictureButton* b = 0;
+        TGPictureButton *b = 0;
 
         b = new TGPictureButton(hf, gClient->GetPicture(icondir+"GoBack.gif"));
@@ -381 +392 @@
         b->Connect("Clicked()", "DelphesEventDisplay", this, "Bck()");
 
-        TGNumberEntry* numberEntry = new TGNumberEntry(hf,0,9,-1,TGNumberFormat::kNESInteger, TGNumberFormat::kNEANonNegative, TGNumberFormat::kNELLimitMinMax, 0, treeReader_->GetEntries());
+        TGNumberEntry *numberEntry = new TGNumberEntry(hf,0,9,-1,TGNumberFormat::kNESInteger, TGNumberFormat::kNEANonNegative, TGNumberFormat::kNELLimitMinMax, 0, treeReader_->GetEntries());
         hf->AddFrame(numberEntry, new TGLayoutHints(kLHintsCenterX | kLHintsCenterY , 2, 0, 10, 10));
         this->Connect("EventChanged(Int_t)","TGNumberEntry",numberEntry,"SetIntNumber(Long_t)");
@@ -394 +405 @@
      vf->AddFrame(hf, new TGLayoutHints(kLHintsExpandX , 2, 2, 2, 2));
 
-     TGHProgressBar* progress = new TGHProgressBar(frmMain, TGProgressBar::kFancy, 100);
+     TGHProgressBar *progress = new TGHProgressBar(frmMain, TGProgressBar::kFancy, 100);
      progress->SetMax( treeReader_->GetEntries());
      progress->ShowPosition(kTRUE, kFALSE, "Event %.0f");
@@ -418 +429 @@
    // the summary tab
    htmlSummary_ = new DelphesHtmlSummary("Delphes Event Display Summary Table");
-   TEveWindowSlot* slot = TEveWindow::CreateWindowInTab(gEve->GetBrowser()->GetTabRight());
+   TEveWindowSlot *slot = TEveWindow::CreateWindowInTab(gEve->GetBrowser()->GetTabRight());
    gHtml_ = new TGHtml(0, 100, 100);
    TEveWindowFrame *wf = slot->MakeFrame(gHtml_);
@@ -426 +437 @@
    // plot tab
    slot = TEveWindow::CreateWindowInTab(gEve->GetBrowser()->GetTabRight());
-   TEveWindowTab* tab = slot->MakeTab();
+   TEveWindowTab *tab = slot->MakeTab();
    tab->SetElementName("Summary plots");
    tab->SetShowTitleBar(kFALSE);
@@ -435 +446 @@
 }
 
-
+void DelphesEventDisplay::Fwd() {  
+  if (event_id_ < treeReader_->GetEntries() - 2) {
+     EventChanged(event_id_+1);
+  } else {
+     printf("Already at last event.\n");
+  }
+}
+
+void DelphesEventDisplay::Bck() {
+  if (event_id_ > 0) {
+     EventChanged(event_id_-1);
+  } else {
+     printf("Already at first event.\n");
+  }
+}
+
+void DelphesEventDisplay::PreSetEv(char *ev) {
+  event_id_tmp_ = Int_t(atoi(ev));
+}
+
+void DelphesEventDisplay::GoTo() {
+  if (event_id_tmp_>=0 && event_id_tmp_ < treeReader_->GetEntries()-1) {
+    EventChanged(event_id_tmp_);
+  } else {
+    printf("Error: no such event.\n");
+  }
+}
+
+void DelphesEventDisplay::InitSummaryPlots() {
+  plotSummary_->FillSample(treeReader_, event_id_);
+  plotSummary_->FillEvent();
+  plotSummary_->Draw();
+}
+
+void DelphesEventDisplay::DisplayProgress(Int_t p) { 
+  fStatusBar_->SetText(Form("Processing... %d %%",p), 1);
+  gSystem->ProcessEvents();
+}

display/DelphesEventDisplay.h

@@ -1 +1 @@
 /*
- *  Delphes: a framework for fast simulation of a generic collider experiment
- *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
+  * Delphes: a framework for fast simulation of a generic collider experiment
+  * Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21 +21 @@
 
 #include <vector>
-#include <iostream>
-#include "external/ExRootAnalysis/ExRootTreeReader.h"
-#include "display/DelphesDisplay.h"
-#include "display/Delphes3DGeometry.h"
-#include "display/DelphesHtmlSummary.h"
-#include "display/DelphesPlotSummary.h"
-#include "TSystem.h"
-#include "TChain.h"
-#include "TAxis.h"
-#include "TGHtml.h"
-#include "TClonesArray.h"
-#include "TGStatusBar.h"
-#include "TGNumberEntry.h"
-#include "TGProgressBar.h"
-#include <RQ_OBJECT.h>
 
+#include "Rtypes.h"
+#include "RQ_OBJECT.h"
 
+class TAxis;
+class TChain;
+class TGHtml;
+class TGStatusBar;
+class DelphesDisplay;
+class Delphes3DGeometry;
+class DelphesBranchBase;
+class DelphesHtmlSummary;
+class DelphesPlotSummary;
+class ExRootTreeReader;
 
 /*
- * assembly.C: sauvegarde as shape-extract -> implement in the geometry class (read/write)
- * histobrowser.C: intégration d'histogrammes dans le display (on pourrait avoir Pt, eta, phi pour les principales collections)
- * also from alice_esd: summary html table
- * 
+  *assembly.C: sauvegarde as shape-extract -> implement in the geometry class (read/write)
+  *histobrowser.C: intégration d'histogrammes dans le display (on pourrait avoir Pt, eta, phi pour les principales collections)
+  *also from alice_esd: summary html table
+  *
  */
 
@@ -59 +56 @@
     void make_gui();
     void load_event();
-    void readConfig(const char *configFile, std::vector<DelphesBranchBase*>& elements);
+    void readConfig(const char *configFile, std::vector<DelphesBranchBase *>& elements);
 
     // Configuration and global variables.
@@ -67 +64 @@
     Double_t tkRadius_, totRadius_, tkHalfLength_, muHalfLength_, bz_;
     TAxis *etaAxis_, *phiAxis_;
-    TChain* chain_;
-    std::vector<DelphesBranchBase*> elements_;
+    TChain *chain_;
+    std::vector<DelphesBranchBase *> elements_;
     DelphesDisplay *delphesDisplay_;
     DelphesHtmlSummary *htmlSummary_;
     TGHtml *gHtml_;
     DelphesPlotSummary *plotSummary_;
-    TGStatusBar* fStatusBar_;
+    TGStatusBar *fStatusBar_;
     
     // gui controls
   public:
-     void Fwd() {  
-        if (event_id_ < treeReader_->GetEntries() - 2) {
-           EventChanged(event_id_+1);
-        } else {
-           printf("Already at last event.\n");
-        }
-     }
+     void Fwd();
 
-     void Bck() {
-        if (event_id_ > 0) {
-           EventChanged(event_id_-1);
-        } else {
-           printf("Already at first event.\n");
-        }
-     }
+     void Bck();
 
-    void PreSetEv(char* ev) {
-      event_id_tmp_ = Int_t(atoi(ev));
-    }
+    void PreSetEv(char *ev);
 
-    void GoTo() {
-      if (event_id_tmp_>=0 && event_id_tmp_ < treeReader_->GetEntries()-1) {
-        EventChanged(event_id_tmp_);
-      } else {
-        printf("Error: no such event.\n");
-      }
-    }
+    void GoTo();
 
-    void InitSummaryPlots() {
-      plotSummary_->FillSample(treeReader_, event_id_);
-      plotSummary_->FillEvent();
-      plotSummary_->Draw();
-    }
+    void InitSummaryPlots();
 
-    void DisplayProgress(Int_t p) { 
-         fStatusBar_->SetText(Form("Processing... %d %%",p), 1);
-         gSystem->ProcessEvents();
-    }
+    void DisplayProgress(Int_t p);
 };
 

examples/EventDisplay.C

@@ -3 +3 @@
  * root -l examples/EventDisplay.C'("cards/delphes_card_FCC_basic.tcl","delphes_output.root","ParticlePropagator","ChargedHadronTrackingEfficiency","MuonTrackingEfficiency","Ecal,Hcal")'
  */
+
+#ifdef __CLING__
+R__LOAD_LIBRARY(libEve)
+R__LOAD_LIBRARY(libDelphesDisplay)
+#include "display/DelphesEventDisplay.h"
+#include "display/Delphes3DGeometry.h"
+#endif
 
 void EventDisplay(const char *configfile = "delphes_card_CMS.tcl",
@@ -33 +40 @@
 
     // create the application
-    DelphesEventDisplay* display = new DelphesEventDisplay(configfile, datafile, det3D);
+    DelphesEventDisplay *display = new DelphesEventDisplay(configfile, datafile, det3D);
   }
 }

examples/Example1.C

@@ -6 +6 @@
 root -l examples/Example1.C'("delphes_output.root")'
 */
+
+#ifdef __CLING__
+R__LOAD_LIBRARY(libDelphes)
+#include "classes/DelphesClasses.h"
+#include "external/ExRootAnalysis/ExRootTreeReader.h"
+#endif
 
 //------------------------------------------------------------------------------

examples/Example2.C

@@ -8 +8 @@
 #include "TH1.h"
 #include "TSystem.h"
+
+#ifdef __CLING__
+R__LOAD_LIBRARY(libDelphes)
+#include "classes/DelphesClasses.h"
+#include "external/ExRootAnalysis/ExRootTreeReader.h"
+#include "external/ExRootAnalysis/ExRootResult.h"
+#endif
 
 //------------------------------------------------------------------------------

examples/Example3.C

@@ -6 +6 @@
 */
 
+#ifdef __CLING__
+R__LOAD_LIBRARY(libDelphes)
+#include "classes/DelphesClasses.h"
+#include "external/ExRootAnalysis/ExRootTreeReader.h"
+#include "external/ExRootAnalysis/ExRootResult.h"
+#else
+class ExRootTreeReader;
+class ExRootResult;
+#endif
+
 //------------------------------------------------------------------------------
 
@@ -25 +35 @@
   TH1 *fJetDeltaPT;
 };
-
-//------------------------------------------------------------------------------
-
-class ExRootResult;
-class ExRootTreeReader;
 
 //------------------------------------------------------------------------------

examples/Example4.C

@@ -1 +1 @@
 /*
-
 This macro shows how to compute jet energy scale.
 root -l examples/Example4.C'("delphes_output.root", "plots.root")'
 
-The output ROOT file contains the pT(MC)/pT(Reco) distributions for various pT(Reco) and |eta| bins.
-The peak value of such distribution is interpreted as the jet energy correction to be applied for that given pT(Reco), |eta| bin.
-
-This can be done by modifying the "ScaleFormula" input parameter to the JetEnergyScale module in the delphes_card_XXX.tcl
-
-
+The output ROOT file contains the pT(MC)/pT(Reco) distributions for
+various pT(Reco) and |eta| bins. The peak value of such distribution is
+interpreted as the jet energy correction to be applied for that
+given pT(Reco), |eta| bin.
+
+This can be done by modifying the "ScaleFormula" input parameter to
+the JetEnergyScale module in the delphes_card_XXX.tcl
 
 e.g  a smooth function:
 
-
-  set ScaleFormula { sqrt(3.0 - 0.1*(abs(eta)))^2 / pt + 1.0 ) }
-
+  set ScaleFormula { sqrt(3.0 - 0.1*(abs(eta)))^2 / pt + 1.0) }
 
 or a binned function:
-
 
   set ScaleFormula {(abs(eta) > 0.0 && abs(eta) <= 2.5) * (pt > 20.0 && pt <= 50.0)  * (1.10) +
@@ -27 +24 @@
                     (abs(eta) > 2.5 && abs(eta) <= 5.0) * (pt > 100.0)               * (1.00)}
 
-
-Be aware that a binned jet energy scale can produce "steps" in the corrected jet pt distribution ...
-
-
-
+Be aware that a binned jet energy scale can produce "steps" in the corrected
+jet pt distribution ...
 */
+
+#ifdef __CLING__
+R__LOAD_LIBRARY(libDelphes)
+#include "classes/DelphesClasses.h"
+#include "external/ExRootAnalysis/ExRootTreeReader.h"
+#include "external/ExRootAnalysis/ExRootResult.h"
+#else
+class ExRootTreeReader;
+class ExRootResult;
+#endif
 
 //------------------------------------------------------------------------------
@@ -161 +165 @@
 
   Jet *jet, *genjet;
-  GenParticle *part;
+  GenParticle *particle;
   TObject *object;
 
-  TLorentzVector JetMom, GenJetMom, BestGenJetMom;
-
-  Float_t Dr;
+  TLorentzVector jetMomentum, genJetMomentum, bestGenJetMomentum;
+
+  Float_t deltaR;
   Float_t pt, eta;
   Long64_t entry;
@@ -177 +181 @@
     // Load selected branches with data from specified event
     treeReader->ReadEntry(entry);
-    //  cout<<"--  New event -- "<<endl;
 
     if(entry%500 == 0) cout << "Event number: "<< entry <<endl;
@@ -186 +189 @@
 
       jet = (Jet*) branchJet->At(i);
-      JetMom = jet-> P4();
-
-      plots->fJetPT->Fill(JetMom.Pt());
-
-      Dr = 999;
+      jetMomentum = jet->P4();
+
+      plots->fJetPT->Fill(jetMomentum.Pt());
+
+      deltaR = 999;
 
      // Loop over all hard partons in event
      for(j = 0; j < branchParticle->GetEntriesFast(); ++j)
      {
-
-        part = (GenParticle*) branchParticle->At(j);
-
-        GenJetMom = part -> P4();
-
-        //this is simply to avoid warnings from initial state particle having infite rapidity ...
-        if(GenJetMom.Px() == 0 && GenJetMom.Py() == 0) continue;
-
-        //take the closest parton candidate
-        if( GenJetMom.DeltaR(JetMom) < Dr )
+        particle = (GenParticle*) branchParticle->At(j);
+
+        genJetMomentum = particle->P4();
+
+        // this is simply to avoid warnings from initial state particle
+        // having infite rapidity ...
+        if(genJetMomentum.Px() == 0 && genJetMomentum.Py() == 0) continue;
+
+        // take the closest parton candidate
+        if(genJetMomentum.DeltaR(jetMomentum) < deltaR)
         {
-           Dr = GenJetMom.DeltaR(JetMom);
-           BestGenJetMom = GenJetMom;
+           deltaR = genJetMomentum.DeltaR(jetMomentum);
+           bestGenJetMomentum = genJetMomentum;
         }
-
       }
 
-     if(Dr < 0.3)
-     {
-       pt  = JetMom.Pt();
-       eta = TMath::Abs(JetMom.Eta());
-
-
-       if( pt > 20.0 && pt < 50.0 && eta > 0.0 && eta < 2.5 ) plots -> fJetRes_Pt_20_50_Eta_0_25->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-       if( pt > 20.0 && pt < 50.0 && eta > 2.5 && eta < 5.0 ) plots -> fJetRes_Pt_20_50_Eta_25_5->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-
-       if( pt > 50.0 && pt < 100.0 && eta > 0.0 && eta < 2.5 ) plots -> fJetRes_Pt_50_100_Eta_0_25->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-       if( pt > 50.0 && pt < 100.0 && eta > 2.5 && eta < 5.0 ) plots -> fJetRes_Pt_50_100_Eta_25_5->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-
-       if( pt > 100.0 && pt < 200.0 && eta > 0.0 && eta < 2.5 ) plots -> fJetRes_Pt_100_200_Eta_0_25->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-       if( pt > 100.0 && pt < 200.0 && eta > 2.5 && eta < 5.0 ) plots -> fJetRes_Pt_100_200_Eta_25_5->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-
-       if( pt > 200.0 && pt < 500.0 && eta > 0.0 && eta < 2.5 ) plots -> fJetRes_Pt_200_500_Eta_0_25->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-       if( pt > 200.0 && pt < 500.0 && eta > 2.5 && eta < 5.0 ) plots -> fJetRes_Pt_200_500_Eta_25_5->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-
-       if( pt > 500.0               && eta > 0.0 && eta < 2.5 ) plots -> fJetRes_Pt_500_inf_Eta_0_25->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-       if( pt > 500.0               && eta > 2.5 && eta < 5.0 ) plots -> fJetRes_Pt_500_inf_Eta_25_5->Fill(BestGenJetMom.Pt()/JetMom.Pt());
-
-
-     }
-
-
+      if(deltaR < 0.3)
+      {
+        pt  = jetMomentum.Pt();
+        eta = TMath::Abs(jetMomentum.Eta());
+
+
+        if(pt > 20.0 && pt < 50.0 && eta > 0.0 && eta < 2.5) plots -> fJetRes_Pt_20_50_Eta_0_25->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+        if(pt > 20.0 && pt < 50.0 && eta > 2.5 && eta < 5.0) plots -> fJetRes_Pt_20_50_Eta_25_5->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+
+        if(pt > 50.0 && pt < 100.0 && eta > 0.0 && eta < 2.5) plots -> fJetRes_Pt_50_100_Eta_0_25->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+        if(pt > 50.0 && pt < 100.0 && eta > 2.5 && eta < 5.0) plots -> fJetRes_Pt_50_100_Eta_25_5->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+
+        if(pt > 100.0 && pt < 200.0 && eta > 0.0 && eta < 2.5) plots -> fJetRes_Pt_100_200_Eta_0_25->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+        if(pt > 100.0 && pt < 200.0 && eta > 2.5 && eta < 5.0) plots -> fJetRes_Pt_100_200_Eta_25_5->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+
+        if(pt > 200.0 && pt < 500.0 && eta > 0.0 && eta < 2.5) plots -> fJetRes_Pt_200_500_Eta_0_25->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+        if(pt > 200.0 && pt < 500.0 && eta > 2.5 && eta < 5.0) plots -> fJetRes_Pt_200_500_Eta_25_5->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+
+        if(pt > 500.0               && eta > 0.0 && eta < 2.5) plots -> fJetRes_Pt_500_inf_Eta_0_25->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+        if(pt > 500.0               && eta > 2.5 && eta < 5.0) plots -> fJetRes_Pt_500_inf_Eta_25_5->Fill(bestGenJetMomentum.Pt()/jetMomentum.Pt());
+
+      }
     }
   }
 }
-
 
 //------------------------------------------------------------------------------