Changes in / [eb332c8:c4e18da] in git

Files:

• examples/Validation.cpp (modified) (2 diffs)
• examples/validation.sh (modified) (5 diffs)
• modules/Isolation.cc (modified) (2 diffs)

examples/Validation.cpp

@@ -2263 +2263 @@
 
     mg_met_res_ht->Draw("APE");
-    DrawAxis(mg_met_res_ht, leg_met_res_ht, 10, 10000, 0.1, 1000, " #sum p_{T} [GeV]", "resolution in E_{x,y}^{miss} [GeV]", true, true);
+    DrawAxis(mg_met_res_ht, leg_met_res_ht, 100, 100000, 0.1, 1000, " #sum p_{T} [GeV]", "resolution in E_{x,y}^{miss} [GeV]", true, true);
 
     leg_met_res_ht->Draw();
@@ -2642 +2642 @@
 
     mg_recbjet_lmis_pt->Draw("APE");
-    DrawAxis(mg_recbjet_lmis_pt, leg_recbjet_lmis_pt, ptMin, ptMax, 0.0, 20.0, "p_{T} [GeV]", "light - mistag rate (%)", true, false);
+    
+    DrawAxis(mg_recbjet_lmis_pt, leg_recbjet_lmis_pt, ptMin, ptMax, 0.0, 10.0, "p_{T} [GeV]", "light - mistag rate (%)", true, false);
+    
     leg_recbjet_lmis_pt->Draw();
     pave->Draw();

examples/validation.sh

@@ +1 @@
+#!/bin/sh
 ##############################################################################################
 #
@@ -20 +21 @@
 ############################################################################################
 
-#! /bin/sh
-
 EXPECTED_ARGS=2
 E_BADARGS=65
@@ -42 +41 @@
 version=$(cat VERSION)
 outpdf=$mainoutputdir/${output%.*}.pdf
+qcdPgLocation="/home/fynu/mselvaggi/storage/DelphesValidationSamples"
 
 mkdir -p $outputroot
@@ -47 +47 @@
 
 sed 's/delphes_card_CMS.tcl/'$cardbase'/g' cards/validation_card.tcl  > $validationCard
+sed -i "1i set MaxEvents ${nEvents}" "$validationCard"
 
 function runParticleGun {
@@ -59 +60 @@
 }
 
-runParticleGun pion 211
-runParticleGun electron 11
-runParticleGun muon 13
-runParticleGun photon 22
-runParticleGun neutron 2112
-runParticleGun jet 1
-runParticleGun bjet 5
-runParticleGun cjet 4
-runParticleGun taujet 15
+
+function runJetsGun {
+  name=$1
+  pid=$2
+  inputroot="${qcdPgLocation}/${pid}.root"
+  rootfile="particleGun_${name}_${cardlabel}.root"
+  ./DelphesROOT $validationCard $outputroot/$rootfile $inputroot
+  echo "./DelphesROOT $validationCard $outputroot/$rootfile $inputroot"
+}
+
+
+runParticleGun pion 211 
+runParticleGun electron 11 
+runParticleGun muon 13 
+runParticleGun photon 22 
+runParticleGun neutron 2112 
+runParticleGun taujet 15 
+runJetsGun jet 1 &
+runJetsGun bjet 5 &
+runJetsGun cjet 4 &
+
+wait
+echo all particle guns complete ...
+
 
 ./Validation $outputroot/particleGun_pion_$cardlabel.root $outputroot/particleGun_electron_$cardlabel.root $outputroot/particleGun_muon_$cardlabel.root $outputroot/particleGun_photon_$cardlabel.root $outputroot/particleGun_neutron_$cardlabel.root $outputroot/particleGun_jet_$cardlabel.root $outputroot/particleGun_bjet_$cardlabel.root $outputroot/particleGun_cjet_$cardlabel.root $outputroot/particleGun_taujet_$cardlabel.root $mainoutputdir/$output $version

modules/Isolation.cc

@@ -167 +167 @@
   fFilter->Reset();
   isolationArray = fFilter->GetSubArray(fClassifier, 0);
+  cout<<"------------------------------------"<<endl;
 
   if(isolationArray == 0) return;
 
   TIter itIsolationArray(isolationArray);
+
 
   // loop over all input jets
@@ -261 +263 @@
     ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
 
+    cout<<"------------------------------------"<<endl;
+    cout<<sumDBeta<<endl;
+
     candidate->IsolationVar = ratioDBeta;
     candidate->IsolationVarRhoCorr = ratioRhoCorr;