Changeset 629e819 in git

Timestamp:

Aug 25, 2016, 4:29:55 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b3bd4d2

Parents:

70b9632

Message:

some bug fixes

Location:

examples

Files:

• Validation.cpp (modified) (5 diffs)
• validation.sh (modified) (1 diff)

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);
@@ -329 +333 @@
         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());}
@@ -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;

examples/validation.sh

@@ -13 +13 @@
 runParticleGun jet 1
 runParticleGun tau 15
-exit
-# hadd delphes_all.root delphes_ParticleGunmu.root delphes_ParticleGunb.root delphes_ParticleGunjet.root
-hadd delphes_b_jet.root delphes_ParticleGunb.root delphes_ParticleGuntau.root delphes_ParticleGunjet.root
 
-./Validation_electron delphes_ParticleGunel.root delphes_validation_electron.root
-./Validation_muon delphes_ParticleGunmu.root delphes_validation_muon.root
-./Validation_photon delphes_ParticleGunph.root delphes_validation_photon.root
-./Validation_jet delphes_b_tau_jet.root delphes_validation_jet.root
+./Validation delphes_ParticleGunel.root delphes_ParticleGunmu.root delphes_ParticleGunph.root delphes_ParticleGunjet.root delphes_ParticleGunb.root delphes_ParticleGuntau.root validation.root
+