Changeset ebf057e in git for examples/Validation.cpp

Timestamp:

Aug 26, 2016, 2:17:11 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

058006a

Parents:

1160e4f (diff), 7da1826 (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 'dev_01' of ​https://github.com/delphes/delphes into ValidationWorkWithPavel

File:

• examples/Validation.cpp (modified) (7 diffs)

examples/Validation.cpp

@@ -740 +740 @@
   std::pair<TH1D*,TH1D*> histos_el = GetEff<Electron>(branchElectron, branchParticleElectron, "Electron", elID, treeReaderElectron);
 
-  histos_el.second->SaveAs("test1.pdf");
-
   // tracking reconstruction efficiency
   std::pair <TH1D*,TH1D*> histos_eltrack = GetEff<Track>(branchTrackElectron, branchParticleElectron, "electronTrack", elID, treeReaderElectron);
@@ -841 +839 @@
   DrawAxis(mg_elFwd, leg_elFwd, 0.2);
 
-  C_el1->Print("validation.pdf(","pdf");
-  C_el2->Print("validation.pdf","pdf");
+  C_el1->Print("delphes_validation.pdf(","pdf");
+  C_el2->Print("delphes_validation.pdf","pdf");
 
   gDirectory->cd(0);
@@ -942 +940 @@
   DrawAxis(mg_muFwd, leg_muFwd, 0.3);
 
-  //C_mu1->SaveAs(muEff+".eps");
-  //C_mu->SaveAs(muRes+".eps");
-
-  C_mu1->Print("validation.pdf","pdf");
-  C_mu->Print("validation.pdf","pdf");
+  C_mu1->Print("delphes_validation.pdf","pdf");
+  C_mu->Print("delphes_validation.pdf","pdf");
 
   gDirectory->cd(0);
@@ -1013 +1008 @@
   leg_ph2->Draw();
 
-  C_ph1->SaveAs(phEff+".eps");
-
   TString phRes = "phERes";
   TString phResFwd = "phEResFwd";
@@ -1048 +1041 @@
   DrawAxis(mg_phFwd, leg_phFwd, 0.3);
 
-  C_ph->SaveAs(phRes+".eps");
-
-  C_ph1->Print("validation.pdf","pdf");
-  C_ph->Print("validation.pdf","pdf");
+  C_ph1->Print("delphes_validation.pdf","pdf");
+  C_ph->Print("delphes_validation.pdf","pdf");
 
   gDirectory->cd(0);
@@ -1182 +1173 @@
   DrawAxis(mg_jetFwd, leg_jetFwd, 0.25);
 
-  C_btag1->SaveAs(btagEff+".eps");
-  C_jet->SaveAs(jetRes+".eps");
-
   TString metRes = "MetRes";
   TCanvas *C_met = new TCanvas(metRes,metRes, 800, 600);
@@ -1204 +1192 @@
   mg_met->GetYaxis()->SetTitle("#sigma(ME_{x}) [GeV]");
 
-  C_met->SaveAs(metRes+".eps");
-
-  C_jet->Print("validation.pdf","pdf");
-  C_btag1->Print("validation.pdf","pdf");
-  C_tautag1->Print("validation.pdf","pdf");
-  C_met->Print("validation.pdf)","pdf");
+  C_jet->Print("delphes_validation.pdf","pdf");
+  C_btag1->Print("delphes_validation.pdf","pdf");
+  C_tautag1->Print("delphes_validation.pdf","pdf");
+  C_met->Print("delphes_validation.pdf)","pdf");
 
   TFile *fout = new TFile(outputFile,"recreate");