Fork me on GitHub

Changes in / [ebf057e:1160e4f] in git


Ignore:
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rebf057e r1160e4f  
    148148tmp/examples/Validation.$(ObjSuf): \
    149149        examples/Validation.cpp \
     150        classes/DelphesClasses.h \
     151        external/ExRootAnalysis/ExRootTreeReader.h \
     152        external/ExRootAnalysis/ExRootTreeWriter.h \
     153        external/ExRootAnalysis/ExRootTreeBranch.h \
     154        external/ExRootAnalysis/ExRootResult.h \
     155        external/ExRootAnalysis/ExRootUtilities.h
     156Validation_electron$(ExeSuf): \
     157        tmp/examples/Validation_electron.$(ObjSuf)
     158
     159tmp/examples/Validation_electron.$(ObjSuf): \
     160        examples/Validation_electron.cpp \
     161        classes/DelphesClasses.h \
     162        external/ExRootAnalysis/ExRootTreeReader.h \
     163        external/ExRootAnalysis/ExRootTreeWriter.h \
     164        external/ExRootAnalysis/ExRootTreeBranch.h \
     165        external/ExRootAnalysis/ExRootResult.h \
     166        external/ExRootAnalysis/ExRootUtilities.h
     167Validation_jet$(ExeSuf): \
     168        tmp/examples/Validation_jet.$(ObjSuf)
     169
     170tmp/examples/Validation_jet.$(ObjSuf): \
     171        examples/Validation_jet.cpp \
     172        classes/DelphesClasses.h \
     173        external/ExRootAnalysis/ExRootTreeReader.h \
     174        external/ExRootAnalysis/ExRootTreeWriter.h \
     175        external/ExRootAnalysis/ExRootTreeBranch.h \
     176        external/ExRootAnalysis/ExRootResult.h \
     177        external/ExRootAnalysis/ExRootUtilities.h
     178Validation_muon$(ExeSuf): \
     179        tmp/examples/Validation_muon.$(ObjSuf)
     180
     181tmp/examples/Validation_muon.$(ObjSuf): \
     182        examples/Validation_muon.cpp \
     183        classes/DelphesClasses.h \
     184        external/ExRootAnalysis/ExRootTreeReader.h \
     185        external/ExRootAnalysis/ExRootTreeWriter.h \
     186        external/ExRootAnalysis/ExRootTreeBranch.h \
     187        external/ExRootAnalysis/ExRootResult.h \
     188        external/ExRootAnalysis/ExRootUtilities.h
     189Validation_photon$(ExeSuf): \
     190        tmp/examples/Validation_photon.$(ObjSuf)
     191
     192tmp/examples/Validation_photon.$(ObjSuf): \
     193        examples/Validation_photon.cpp \
    150194        classes/DelphesClasses.h \
    151195        external/ExRootAnalysis/ExRootTreeReader.h \
    … …  
    162206        stdhep2pileup$(ExeSuf) \
    163207        Example1$(ExeSuf) \
    164         Validation$(ExeSuf)
     208        Validation$(ExeSuf) \
     209        Validation_electron$(ExeSuf) \
     210        Validation_jet$(ExeSuf) \
     211        Validation_muon$(ExeSuf) \
     212        Validation_photon$(ExeSuf)
    165213
    166214EXECUTABLE_OBJ +=  \
    … …  
    172220        tmp/converters/stdhep2pileup.$(ObjSuf) \
    173221        tmp/examples/Example1.$(ObjSuf) \
    174         tmp/examples/Validation.$(ObjSuf)
     222        tmp/examples/Validation.$(ObjSuf) \
     223        tmp/examples/Validation_electron.$(ObjSuf) \
     224        tmp/examples/Validation_jet.$(ObjSuf) \
     225        tmp/examples/Validation_muon.$(ObjSuf) \
     226        tmp/examples/Validation_photon.$(ObjSuf)
    175227
    176228DelphesHepMC$(ExeSuf): \

  • cards/delphes_card_CMS_simple.tcl

    rebf057e r1160e4f  
    213213
    214214  set EnergyMin 0.5
    215   set EnergySignificanceMin 2.0
     215  set EnergySignificanceMin 1.0
    216216
    217217  set SmearTowerCenter true
    … …  
    314314
    315315  set EnergyMin 1.0
    316   set EnergySignificanceMin 2.0
     316  set EnergySignificanceMin 1.0
    317317
    318318  set SmearTowerCenter true
    … …  
    721721  add Branch GenJetFinder/jets GenJet Jet
    722722  add Branch GenMissingET/momentum GenMissingET MissingET
    723  
     723
    724724  add Branch UniqueObjectFinder/jets Jet Jet
    725725  add Branch UniqueObjectFinder/electrons Electron Electron

  • examples/Pythia8/configParticleGun.cmnd

    rebf057e r1160e4f  
    33! 1) Settings used in the main program.
    44
    5 Main:numberOfEvents = 10000        ! number of events to generate
     5Main:numberOfEvents = 100000         ! number of events to generate
    66Main:timesAllowErrors = 3          ! how many aborts before run stops
    7 Main:spareFlag1 = on               ! true means particle gun
    8 Main:spareMode1 = 11               ! 1-5 - di-quark, 21 - di-gluon, 11 - single electron, 13 - single muon, 15 - single tau, 22 - single photon
    9 Main:spareParm1 = 10000            ! max pt
    10 Main:spareParm2 = 2.5              ! max eta
     7Main:spareFlag1 = on                ! true means particle gun
     8Main:spareMode1 = ID               ! 1-5 - di-quark, 21 - di-gluon, 11 - single electron, 13 - single muon, 22 - single photon
     9Main:spareParm1 = 10000           ! max pt
    1110
    1211! 2) Settings related to output in init(), next() and stat().

  • examples/Validation.cpp

    rebf057e r1160e4f  
    740740  std::pair<TH1D*,TH1D*> histos_el = GetEff<Electron>(branchElectron, branchParticleElectron, "Electron", elID, treeReaderElectron);
    741741
     742  histos_el.second->SaveAs("test1.pdf");
     743
    742744  // tracking reconstruction efficiency
    743745  std::pair <TH1D*,TH1D*> histos_eltrack = GetEff<Track>(branchTrackElectron, branchParticleElectron, "electronTrack", elID, treeReaderElectron);
    … …  
    839841  DrawAxis(mg_elFwd, leg_elFwd, 0.2);
    840842
    841   C_el1->Print("delphes_validation.pdf(","pdf");
    842   C_el2->Print("delphes_validation.pdf","pdf");
     843  C_el1->Print("validation.pdf(","pdf");
     844  C_el2->Print("validation.pdf","pdf");
    843845
    844846  gDirectory->cd(0);
    … …  
    940942  DrawAxis(mg_muFwd, leg_muFwd, 0.3);
    941943
    942   C_mu1->Print("delphes_validation.pdf","pdf");
    943   C_mu->Print("delphes_validation.pdf","pdf");
     944  //C_mu1->SaveAs(muEff+".eps");
     945  //C_mu->SaveAs(muRes+".eps");
     946
     947  C_mu1->Print("validation.pdf","pdf");
     948  C_mu->Print("validation.pdf","pdf");
    944949
    945950  gDirectory->cd(0);
    … …  
    10081013  leg_ph2->Draw();
    10091014
     1015  C_ph1->SaveAs(phEff+".eps");
     1016
    10101017  TString phRes = "phERes";
    10111018  TString phResFwd = "phEResFwd";
    … …  
    10411048  DrawAxis(mg_phFwd, leg_phFwd, 0.3);
    10421049
    1043   C_ph1->Print("delphes_validation.pdf","pdf");
    1044   C_ph->Print("delphes_validation.pdf","pdf");
     1050  C_ph->SaveAs(phRes+".eps");
     1051
     1052  C_ph1->Print("validation.pdf","pdf");
     1053  C_ph->Print("validation.pdf","pdf");
    10451054
    10461055  gDirectory->cd(0);
    … …  
    11731182  DrawAxis(mg_jetFwd, leg_jetFwd, 0.25);
    11741183
     1184  C_btag1->SaveAs(btagEff+".eps");
     1185  C_jet->SaveAs(jetRes+".eps");
     1186
    11751187  TString metRes = "MetRes";
    11761188  TCanvas *C_met = new TCanvas(metRes,metRes, 800, 600);
    … …  
    11921204  mg_met->GetYaxis()->SetTitle("#sigma(ME_{x}) [GeV]");
    11931205
    1194   C_jet->Print("delphes_validation.pdf","pdf");
    1195   C_btag1->Print("delphes_validation.pdf","pdf");
    1196   C_tautag1->Print("delphes_validation.pdf","pdf");
    1197   C_met->Print("delphes_validation.pdf)","pdf");
     1206  C_met->SaveAs(metRes+".eps");
     1207
     1208  C_jet->Print("validation.pdf","pdf");
     1209  C_btag1->Print("validation.pdf","pdf");
     1210  C_tautag1->Print("validation.pdf","pdf");
     1211  C_met->Print("validation.pdf)","pdf");
    11981212
    11991213  TFile *fout = new TFile(outputFile,"recreate");

  • examples/validation.sh

    rebf057e r1160e4f  
    1 #! /bin/sh
     1#!/bin/bash
    22function runParticleGun {
    3   name=$1
    4   pid=$2
    5   cmnd="examples/Pythia8/configParticleGun_$name.cmnd"
    6   sed '/Main:spareMode1/s/=[[:space:]]*[0-9]*/= '$pid'/' examples/Pythia8/configParticleGun.cmnd > $cmnd
    7   ./DelphesPythia8 cards/delphes_card_CMS.tcl $cmnd delphes_ParticleGun_$name.root
     3    in=$1
     4    ID=$2
     5    outcmnd="examples/Pythia8/configParticleGun$in.cmnd"
     6    sed 's/ID/'$ID'/g' examples/Pythia8/configParticleGun.cmnd > $outcmnd
     7    ./DelphesPythia8 cards/delphes_card_CMS.tcl $outcmnd delphes_ParticleGun$in.root
    88}
     9runParticleGun el 11
     10runParticleGun mu 13
     11runParticleGun ph 22
     12runParticleGun b 5
     13runParticleGun jet 1
     14runParticleGun tau 15
    915
    10 runParticleGun electron 11
    11 runParticleGun muon 13
    12 runParticleGun photon 22
    13 runParticleGun jet 1
    14 runParticleGun bjet 5
    15 runParticleGun taujet 15
     16./Validation delphes_ParticleGunel.root delphes_ParticleGunmu.root delphes_ParticleGunph.root delphes_ParticleGunjet.root delphes_ParticleGunb.root delphes_ParticleGuntau.root validation.root
    1617
    17 ./Validation delphes_ParticleGun_electron.root delphes_ParticleGun_muon.root delphes_ParticleGun_photon.root delphes_ParticleGun_jet.root delphes_ParticleGun_bjet.root delphes_ParticleGun_taujet.root delphes_validation.root

  • modules/SimpleCalorimeter.cc

    rebf057e r1160e4f  
    190190  Double_t fraction;
    191191  Double_t energy;
    192   Double_t sigma;
    193   Double_t energyGuess;
    194 
    195192  Int_t pdgCode;
    196193
    … …  
    367364       // compute total charged energy   
    368365       fTrackEnergy += energy;
    369        sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
    370        if(sigma/momentum.E() < track->TrackResolution) energyGuess = energy;
    371        else energyGuess = momentum.E();
    372 
    373        fTrackSigma += ((track->TrackResolution)*energyGuess)*((track->TrackResolution)*energyGuess);
     366       fTrackSigma += ((track->TrackResolution)*momentum.E())*((track->TrackResolution)*momentum.E());
     367       
    374368       fTowerTrackArray->Add(track);
     369     
    375370      }
    376371       
Note: See TracChangeset for help on using the changeset viewer.