Changeset 9cd3a4d in git for examples

Timestamp:

Feb 23, 2017, 11:48:07 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8a4fba8

Parents:

abcacdb (diff), 9a3d132 (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 branch 'master' of github.com:delphes/delphes

Location:

examples

Files:

• CaloGrid.cpp (modified) (1 diff)
• Validation.cpp (modified) (16 diffs)

examples/CaloGrid.cpp

@@ -11 +11 @@
 #include "display/Delphes3DGeometry.h"
 #include "classes/DelphesClasses.h"
-#include "external/ExRootAnalysis/ExRootConfReader.h"
+#include "ExRootAnalysis/ExRootConfReader.h"
 
 #include "TCanvas.h"

examples/Validation.cpp

@@ -1456 +1456 @@
   TLegend *leg_trkpi_eff_eta = (TLegend*)leg_trkpi_res_eta->Clone();
 
-
-  TGraphErrors gr_trkpi_res_pt[n_etabins], gr_trkpi_eff_pt[n_etabins], gr_trkpi_res_eta[n_ptbins], gr_trkpi_eff_eta[n_ptbins];
+  TGraphErrors *gr_trkpi_res_pt  = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkpi_eff_pt  = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkpi_res_eta = new TGraphErrors[n_ptbins];
+  TGraphErrors *gr_trkpi_eff_eta = new TGraphErrors[n_ptbins];
   TH1D* h_trkpi_eff_pt, *h_trkpi_eff_eta;
 
-  std::vector<resolPlot> plots_trkpi_res_pt[n_etabins], plots_trkpi_res_eta[n_ptbins];
+  std::vector<resolPlot> *plots_trkpi_res_pt   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_trkpi_res_eta  = new std::vector<resolPlot>[n_ptbins];
 
   // loop over eta bins
@@ -1559 +1562 @@
   TLegend *leg_trkele_eff_eta = (TLegend*)leg_trkele_res_eta->Clone();
 
-  TGraphErrors gr_trkele_res_pt[n_etabins], gr_trkele_eff_pt[n_etabins], gr_trkele_res_eta[n_ptbins], gr_trkele_eff_eta[n_ptbins];
+  TGraphErrors *gr_trkele_res_pt  = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkele_eff_pt  = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkele_res_eta = new TGraphErrors[n_ptbins];
+  TGraphErrors *gr_trkele_eff_eta = new TGraphErrors[n_ptbins];
+
   TH1D* h_trkele_eff_pt, *h_trkele_eff_eta;
 
-  std::vector<resolPlot> plots_trkele_res_pt[n_etabins], plots_trkele_res_eta[n_ptbins];
+  std::vector<resolPlot> *plots_trkele_res_pt   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_trkele_res_eta  = new std::vector<resolPlot>[n_ptbins];
 
   // loop over eta bins
@@ -1663 +1671 @@
 
 
-  TGraphErrors gr_trkmu_res_pt[n_etabins], gr_trkmu_eff_pt[n_etabins], gr_trkmu_res_eta[n_ptbins], gr_trkmu_eff_eta[n_ptbins];
+  TGraphErrors *gr_trkmu_res_pt  = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkmu_eff_pt  = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkmu_res_eta = new TGraphErrors[n_ptbins];
+  TGraphErrors *gr_trkmu_eff_eta = new TGraphErrors[n_ptbins];
+
   TH1D* h_trkmu_eff_pt, *h_trkmu_eff_eta;
 
-  std::vector<resolPlot> plots_trkmu_res_pt[n_etabins], plots_trkmu_res_eta[n_ptbins];
+  std::vector<resolPlot> *plots_trkmu_res_pt   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_trkmu_res_eta  = new std::vector<resolPlot>[n_ptbins];
 
   // loop over eta bins
@@ -1764 +1777 @@
   TLegend *leg_ecal_res_eta = new TLegend(0.60,0.59,0.95,0.90);
 
-  TGraphErrors gr_ecal_res_e[n_etabins], gr_ecal_res_eta[n_ptbins];
-
-  std::vector<resolPlot> plots_ecal_res_e[n_etabins], plots_ecal_res_eta[n_ptbins];
+  TGraphErrors *gr_ecal_res_e    = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_ecal_res_eta  = new TGraphErrors[n_ptbins];
+
+  std::vector<resolPlot> *plots_ecal_res_e   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_ecal_res_eta = new std::vector<resolPlot>[n_ptbins];
 
   // loop over eta bins
@@ -1833 +1848 @@
   TLegend *leg_hcal_res_eta = new TLegend(0.60,0.59,0.95,0.90);
 
-  TGraphErrors gr_hcal_res_e[n_etabins], gr_hcal_res_eta[n_ptbins];
-
-  std::vector<resolPlot> plots_hcal_res_e[n_etabins], plots_hcal_res_eta[n_ptbins];
+  TGraphErrors *gr_hcal_res_e   = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_hcal_res_eta = new TGraphErrors[n_ptbins];
+
+  std::vector<resolPlot> *plots_hcal_res_e   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_hcal_res_eta = new std::vector<resolPlot>[n_ptbins];
 
   // loop over eta bins
@@ -1903 +1920 @@
   TLegend *leg_pfele_res_eta[n_ptbins];
 
-  TGraphErrors gr_pfele_res_e[n_etabins];
-  TGraphErrors gr_pfele_res_eta[n_ptbins];
-
-  TGraphErrors gr_trkele_res_e[n_etabins];
-  TGraphErrors gr_trkele_res_eeta[n_ptbins];
-
-  std::vector<resolPlot> plots_pfele_res_e[n_etabins], plots_pfele_res_eta[n_ptbins];
-  std::vector<resolPlot> plots_trkele_res_e[n_etabins], plots_trkele_res_eeta[n_ptbins];
+  TGraphErrors *gr_pfele_res_e = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_pfele_res_eta = new TGraphErrors[n_ptbins];
+  TGraphErrors *gr_trkele_res_e = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkele_res_eeta = new TGraphErrors[n_ptbins];
+
+  std::vector<resolPlot> *plots_pfele_res_e     = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_pfele_res_eta   = new std::vector<resolPlot>[n_ptbins];
+  std::vector<resolPlot> *plots_trkele_res_e    = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_trkele_res_eeta = new std::vector<resolPlot>[n_ptbins];
 
   TCanvas *c_pfele_res_e[n_etabins];
@@ -2010 +2028 @@
   TLegend *leg_pfpi_res_eta[n_ptbins];
 
-  TGraphErrors gr_pfpi_res_e[n_etabins];
-  TGraphErrors gr_pfpi_res_eta[n_ptbins];
-
-  TGraphErrors gr_trkpi_res_e[n_etabins];
-  TGraphErrors gr_trkpi_res_eeta[n_ptbins];
-
-  std::vector<resolPlot> plots_pfpi_res_e[n_etabins], plots_pfpi_res_eta[n_ptbins];
-  std::vector<resolPlot> plots_trkpi_res_e[n_etabins], plots_trkpi_res_eeta[n_ptbins];
+  TGraphErrors *gr_pfpi_res_e     = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_pfpi_res_eta   = new TGraphErrors[n_ptbins];
+
+  TGraphErrors *gr_trkpi_res_e    = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_trkpi_res_eeta = new TGraphErrors[n_ptbins];
+
+  std::vector<resolPlot> *plots_pfpi_res_e     = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_pfpi_res_eta   = new std::vector<resolPlot>[n_ptbins];
+  std::vector<resolPlot> *plots_trkpi_res_e    = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_trkpi_res_eeta = new std::vector<resolPlot>[n_ptbins];
 
   TCanvas *c_pfpi_res_e[n_etabins];
@@ -2119 +2139 @@
   TLegend *leg_pfjet_res_eta[n_ptbins];
 
-  TGraphErrors gr_pfjet_res_e[n_etabins];
-  TGraphErrors gr_pfjet_res_eta[n_ptbins];
-
-  TGraphErrors gr_cajet_res_e[n_etabins];
-  TGraphErrors gr_cajet_res_eta[n_ptbins];
-
-  std::vector<resolPlot> plots_pfjet_res_e[n_etabins], plots_pfjet_res_eta[n_ptbins];
-  std::vector<resolPlot> plots_cajet_res_e[n_etabins], plots_cajet_res_eta[n_ptbins];
+  TGraphErrors *gr_pfjet_res_e   = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_pfjet_res_eta = new TGraphErrors[n_ptbins];
+
+  TGraphErrors *gr_cajet_res_e   = new TGraphErrors[n_etabins];
+  TGraphErrors *gr_cajet_res_eta = new TGraphErrors[n_ptbins];
+
+  std::vector<resolPlot> *plots_pfjet_res_e   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_pfjet_res_eta = new std::vector<resolPlot>[n_ptbins];
+  std::vector<resolPlot> *plots_cajet_res_e   = new std::vector<resolPlot>[n_etabins];
+  std::vector<resolPlot> *plots_cajet_res_eta = new std::vector<resolPlot>[n_ptbins];
 
   TCanvas *c_pfjet_res_e[n_etabins];
@@ -2260 +2282 @@
     TLegend *leg_recele_eff_eta = new TLegend(0.55,0.22,0.90,0.48);
 
-    TGraphErrors gr_recele_eff_pt[n_etabins], gr_recele_eff_eta[n_ptbins];
+    TGraphErrors *gr_recele_eff_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_recele_eff_eta = new TGraphErrors[n_ptbins];
     TH1D* h_recele_eff_pt, *h_recele_eff_eta;
 
@@ -2325 +2348 @@
     TLegend *leg_recmu_eff_eta = new TLegend(0.55,0.22,0.90,0.48);
 
-    TGraphErrors gr_recmu_eff_pt[n_etabins], gr_recmu_eff_eta[n_ptbins];
+    TGraphErrors *gr_recmu_eff_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_recmu_eff_eta = new TGraphErrors[n_ptbins];
     TH1D* h_recmu_eff_pt, *h_recmu_eff_eta;
 
@@ -2390 +2414 @@
     TLegend *leg_recpho_eff_eta = new TLegend(0.55,0.22,0.90,0.48);
 
-    TGraphErrors gr_recpho_eff_pt[n_etabins], gr_recpho_eff_eta[n_ptbins];
+    TGraphErrors *gr_recpho_eff_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_recpho_eff_eta = new TGraphErrors[n_ptbins];
     TH1D* h_recpho_eff_pt, *h_recpho_eff_eta;
 
@@ -2455 +2480 @@
     TLegend *leg_recbjet_eff_eta = new TLegend(0.50,0.22,0.90,0.48);
 
-    TGraphErrors gr_recbjet_eff_pt[n_etabins], gr_recbjet_eff_eta[n_ptbins];
+    TGraphErrors *gr_recbjet_eff_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_recbjet_eff_eta = new TGraphErrors[n_ptbins];
     TH1D* h_recbjet_eff_pt, *h_recbjet_eff_eta;
 
@@ -2517 +2543 @@
     TLegend *leg_recbjet_cmis_eta = new TLegend(0.50,0.64,0.90,0.90);
 
-    TGraphErrors gr_recbjet_cmis_pt[n_etabins], gr_recbjet_cmis_eta[n_ptbins];
+    TGraphErrors *gr_recbjet_cmis_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_recbjet_cmis_eta = new TGraphErrors[n_ptbins];
     TH1D* h_recbjet_cmis_pt, *h_recbjet_cmis_eta;
 
@@ -2579 +2606 @@
     TLegend *leg_recbjet_lmis_eta = new TLegend(0.50,0.64,0.90,0.90);
 
-    TGraphErrors gr_recbjet_lmis_pt[n_etabins], gr_recbjet_lmis_eta[n_ptbins];
+    TGraphErrors *gr_recbjet_lmis_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_recbjet_lmis_eta = new TGraphErrors[n_ptbins];
     TH1D* h_recbjet_lmis_pt, *h_recbjet_lmis_eta;
 
@@ -2644 +2672 @@
     TLegend *leg_rectaujet_eff_eta = new TLegend(0.50,0.22,0.90,0.48);
 
-    TGraphErrors gr_rectaujet_eff_pt[n_etabins], gr_rectaujet_eff_eta[n_ptbins];
+    TGraphErrors *gr_rectaujet_eff_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_rectaujet_eff_eta = new TGraphErrors[n_ptbins];
     TH1D* h_rectaujet_eff_pt, *h_rectaujet_eff_eta;
 
@@ -2708 +2737 @@
     TLegend *leg_rectaujet_mis_eta = new TLegend(0.50,0.64,0.90,0.90);
 
-    TGraphErrors gr_rectaujet_mis_pt[n_etabins], gr_rectaujet_mis_eta[n_ptbins];
+    TGraphErrors *gr_rectaujet_mis_pt  = new TGraphErrors[n_etabins];
+    TGraphErrors *gr_rectaujet_mis_eta = new TGraphErrors[n_ptbins];
     TH1D* h_rectaujet_mis_pt, *h_rectaujet_mis_eta;