Changeset 5076b1b in git for examples

Timestamp:

Aug 26, 2016, 12:02:18 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

360d17e

Parents:

298734e (diff), 7b61e66 (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.

git-author:

Pavel Demin <pavel-demin@…> (08/26/16 12:02:18)

git-committer:

GitHub <noreply@…> (08/26/16 12:02:18)

Message:

Merge pull request #29 from AlexandreMertens/ValidationWorkWithPavel

Validation work with pavel

Location:

examples

Files:

• Validation.cpp (modified) (5 diffs)
• validation.sh (added)

examples/Validation.cpp

@@ -188 +188 @@
   TH1D *histRecoPtfwd = new TH1D(name+" reco spectra Eta",name+" reco spectra fwd", Nbins, TMath::Log10(ptrangemin), TMath::Log10(ptrangemax));
 
+  histGenPtcen->SetDirectory(0);
+  histRecoPtcen->SetDirectory(0);
+  histGenPtfwd->SetDirectory(0);
+  histRecoPtfwd->SetDirectory(0);
 
   BinLogX(histGenPtcen);
@@ -324 +328 @@
       if(deltaR < 0.3)
       {
-        pt  = bestGenMomentum.Pt();
+        pt  = bestGenMomentum.E();
         eta = TMath::Abs(bestGenMomentum.Eta());
 
         for (bin = 0; bin < Nbins; bin++)
         {
-          if(pt > histos->at(bin).ptmin && pt < histos->at(bin).ptmax && eta > 0.0 && eta < 2.5)
+          if(pt > histos->at(bin).ptmin && pt < histos->at(bin).ptmax && eta < 2.5)
           {
-            if (eta < 1.5) {histos->at(bin).cenResolHist->Fill(recoMomentum.Pt()/bestGenMomentum.Pt());}
-            else if (eta < 2.5) {histos->at(bin).fwdResolHist->Fill(recoMomentum.Pt()/bestGenMomentum.Pt());}
+            if (eta < 1.5) {histos->at(bin).cenResolHist->Fill(recoMomentum.E()/bestGenMomentum.E());}
+            else if (eta < 2.5) {histos->at(bin).fwdResolHist->Fill(recoMomentum.E()/bestGenMomentum.E());}
           }
         }
@@ -731 +735 @@
   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);
@@ -795 +801 @@
   DrawAxis(histos_eltrack.second, leg_el2, 0);
   leg_el2->Draw();
-
-  C_el1->cd(0);
 
   TString elRes = "electronERes";
@@ -1276 +1280 @@
   char *appName = "Validation";
 
-  if(argc != 3)
+  if(argc != 8)
   {
     cout << " Usage: " << appName << " input_file_electron input_file_muon input_file_photon input_file_jet input_file_bjet input_file_taujet output_file" << endl;