- Timestamp:
- Jun 16, 2010, 11:05:05 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CHANGELOG
r564 r567 1 * Changes relative to V.1.8 -- last changes: 02/03/2010 2 - a muon/electron is not reconstructed if its track is not existing 3 - new warning when LHE files are read as input in Delphes 1 * Changes relative to V.1.8 -- last changes: 07/06/2010 2 - New entry available in JET and TAUJET: the number of calotower that are contained in the jet 3 - LHE warning: the file should already be hadronised by an external software 4 - ETmis now take into account the presence of muons 4 5 - new: b-(mis)tag algorithms 5 6 * pt/eta dependence for b-(mis)tagging ; -
trunk/Delphes.cpp
r564 r567 305 305 vector<D_Particle> gamma; 306 306 307 vector<int> NTrackJet; 307 vector<int> NTrackJet; //for number of tracks 308 vector<float> EHADEEM; //for energyHad over energyEm 309 vector<int> NCALO; //nombre de tours calorimetriques utilisee 308 310 309 311 TSimpleArray<TRootC::GenParticle> NFCentralQ; … … 369 371 input_particles.clear(); 370 372 NTrackJet.clear(); 373 NCALO.clear(); 374 EHADEEM.clear(); 371 375 372 376 // 'list_of_active_towers' contains the exact list of calorimetric towers which have some deposits inside (E>0). … … 705 709 706 710 // 2.2.3 ************* jets, B-tag, tau jets 707 vector<int> NTrackJet; //for number of tracks708 vector<float> EHADEEM; //for energyHad over energyEm709 vector<int> NCALO; //nombre de tours calorimetriques utilisee710 711 sorted_jets=JETRUN->RunJets(input_particles, TrackCentral,NTrackJet,EHADEEM,list_of_active_towers,NCALO); 711 712 JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ,NTrackJet,EHADEEM,NCALO); -
trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h
r555 r567 423 423 float Charge; // normally, using the charge of the track ; here using gen-level tau charge 424 424 int NTracks; 425 int NCalo; 425 426 426 427 float EHoverEE; … … 453 454 bool Btag; 454 455 int NTracks; 456 int NCalo; 455 457 456 458 float EHoverEE; -
trunk/VERSION
r529 r567 1 1. 81 1.9 -
trunk/data/DetectorCard.dat
r559 r567 86 86 # General jet variable 87 87 JET_coneradius 0.7 // generic jet radius ; not for tau's !!! 88 JET_jetalgo 4// Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt88 JET_jetalgo 2 // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt 89 89 JET_seed 1.0 // minimum seed to start jet reconstruction, in GeV 90 90 JET_Eflow 0 // Perfect energy assumed in the tracker coverage … … 98 98 # put 'x' for pt ; range: [0, 9E6 GeV/c] 99 99 # put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ] 100 # never put any blank in the formula100 # e.g. (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0) 101 101 BTAG_func_b 0.4+0*x+0*y // formula for Pt dependence of the b-tag efficiency (b-jets) 102 102 BTAG_func_c 0.1+0*x+0*y // formula for Pt dependence of the mistag efficiency (c-jets) … … 145 145 NEvents_Frog 100 146 146 # Number of events to process 147 NEvents 10000// -1 means 'all'147 NEvents -1 // -1 means 'all' 148 148 149 149 # input PDG tables -
trunk/data/DetectorCard_ATLAS.dat
r559 r567 88 88 JET_jetalgo 6 // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt 89 89 JET_seed 1.0 // minimum seed to start jet reconstruction, in GeV 90 JET_Eflow 1// Perfect energy assumed in the tracker coverage90 JET_Eflow 0 // Perfect energy assumed in the tracker coverage 91 91 92 92 # b-(mis)tagging efficiencies … … 98 98 # put 'x' for pt ; range: [0, 9E6 GeV/c] 99 99 # put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ] 100 # never put any blank in the formula100 # e.g. (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0) 101 101 BTAG_func_b 0.4+0*x+0*y // formula for Pt dependence of the b-tag efficiency (b-jets) 102 102 BTAG_func_c 0.1+0*x+0*y // formula for Pt dependence of the mistag efficiency (c-jets) -
trunk/data/DetectorCard_CMS.dat
r563 r567 88 88 JET_jetalgo 6 // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt 89 89 JET_seed 1.0 // minimum seed to start jet reconstruction, in GeV 90 JET_Eflow 1// Perfect energy assumed in the tracker coverage90 JET_Eflow 0 // Perfect energy assumed in the tracker coverage 91 91 92 92 # b-(mis)tagging efficiencies … … 98 98 # put 'x' for pt ; range: [0, 9E6 GeV/c] 99 99 # put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ] 100 # never put any blank in the formula101 BTAG_func_b (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0)// formula for Pt dependence of the b-tag efficiency (b-jets)102 BTAG_func_c (x<300)?(0.01+0*x+0*y):(0.15+0*x+0*y)// formula for Pt dependence of the mistag efficiency (c-jets)100 # e.g. (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0) 101 BTAG_func_b 0.4+0*x+0*y // formula for Pt dependence of the b-tag efficiency (b-jets) 102 BTAG_func_c 0.1+0*x+0*y // formula for Pt dependence of the mistag efficiency (c-jets) 103 103 BTAG_func_g 0.01+0*x+0*y // (gluon-jets) 104 104 BTAG_func_l 0.01+0*x+0*y // (light-jets) -
trunk/interface/JetsUtil.h
r443 r567 80 80 void init(); // for constructors 81 81 82 vector<fastjet::PseudoJet> RunJets(const vector<fastjet::PseudoJet>& input_particles, const vector<TRootTracks> & TrackCentral, vector<int> &NTrackJet, vector<float> &EHADEEM, D_CaloTowerList list_of_active_towers );82 vector<fastjet::PseudoJet> RunJets(const vector<fastjet::PseudoJet>& input_particles, const vector<TRootTracks> & TrackCentral, vector<int> &NTrackJet, vector<float> &EHADEEM, D_CaloTowerList list_of_active_towers, vector<int> &NCALO); 83 83 84 84 vector<fastjet::PseudoJet> RunJetsResol(const vector<fastjet::PseudoJet>& input_particles); 85 85 86 void RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle> & NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM );86 void RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle> & NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM, const vector<int> &NCALO); 87 87 88 void RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TRootTracks> & TrackCentral, const vector<int> &NTrackJet, const vector<float> &EHADEEM );88 void RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TRootTracks> & TrackCentral, const vector<int> &NTrackJet, const vector<float> &EHADEEM,const vector<int> &NCALO); 89 89 90 90 private: -
trunk/src/JetsUtil.cc
r547 r567 122 122 } 123 123 124 vector<fastjet::PseudoJet> JetsUtil::RunJets(const vector<fastjet::PseudoJet>& input_particles, const vector<TRootTracks> & TrackCentral, vector<int> &NTrackJet, vector<float> &EHADEEM,D_CaloTowerList list_of_active_towers )124 vector<fastjet::PseudoJet> JetsUtil::RunJets(const vector<fastjet::PseudoJet>& input_particles, const vector<TRootTracks> & TrackCentral, vector<int> &NTrackJet, vector<float> &EHADEEM,D_CaloTowerList list_of_active_towers, vector<int> &NCALO) 125 125 { 126 126 inclusive_jets.clear(); … … 144 144 DET->BinEtaPhi(TrackCentral[t].PhiOuter,TrackCentral[t].EtaOuter,iPhiTrack[t],iEtaTrack[t]); 145 145 else { 146 iPhiTrack[t] = TrackCentral[t].Phi Outer; iEtaTrack[t] = TrackCentral[t].EtaOuter;146 iPhiTrack[t] = TrackCentral[t].Phi; iEtaTrack[t] = TrackCentral[t].Eta; // should NOT be PhiOuter and EtaOuter 147 147 } 148 148 } … … 163 163 //now, get EHad over EEm 164 164 float EmVal=0,HadVal=0; 165 NCALO.push_back(constituents.size()); 165 166 for (unsigned int j = 0; j < constituents.size(); j++) 166 167 { … … 197 198 198 199 199 void JetsUtil::RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle>& NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM )200 void JetsUtil::RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootC::GenParticle>& NFCentralQ, const vector<int> &NTrackJet, const vector<float> &EHADEEM, const vector<int> &NCALO) 200 201 { 201 202 TRootJet *elementJet; … … 209 210 elementJet->NTracks = NTrackJet[i]; 210 211 elementJet->EHoverEE = EHADEEM[i]; 212 elementJet->NCalo = NCALO[i]; 211 213 212 214 // b-jets … … 218 220 } 219 221 220 void JetsUtil::RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TRootTracks> & TrackCentral, const vector<int> &NTrackJet, const vector<float> &EHADEEM )222 void JetsUtil::RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TRootTracks> & TrackCentral, const vector<int> &NTrackJet, const vector<float> &EHADEEM,const vector<int> &NCALO) 221 223 { 222 224 TRootTauJet *elementTauJet; … … 240 242 elementTauJet->Charge = charge; 241 243 elementTauJet->EHoverEE = EHADEEM[i]; 244 elementTauJet->NCalo = NCALO[i]; 242 245 } // if tau jet 243 246 } // if JET.eta < tracker - tau_cone : Tau jet identification -
trunk/src/SmearUtil.cc
r558 r567 27 27 ** Louvain-la-Neuve, Belgium ** 28 28 ** ** 29 ** Copyright (C) 2008-20 09, **29 ** Copyright (C) 2008-2010, ** 30 30 ** All rights reserved. ** 31 31 ** ** … … 138 138 // General jet variable 139 139 JET_coneradius = 0.7; // generic jet radius ; not for tau's !!! 140 JET_jetalgo = 1; // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm140 JET_jetalgo = 2; // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm 141 141 JET_seed = 1.0; // minimum seed to start jet reconstruction 142 JET_Eflow = 1; // 1 for Energy flow in jets reco ; 0 if not142 JET_Eflow = 0; // 1 for Energy flow in jets reco ; 0 if not 143 143 144 144 // Tagging definition … … 774 774 f_out <<"** of a generic collider experiment **"<< endl; 775 775 f_out <<"** **"<< endl; 776 f_out <<"** --- Version 1. 8of Delphes --- **"<< endl;777 f_out <<"** Last date of change: 16 August 2009**"<< endl;776 f_out <<"** --- Version 1.9 of Delphes --- **"<< endl; 777 f_out <<"** Last date of change: 7 May 2010 **"<< endl; 778 778 f_out <<"** **"<< endl; 779 779 f_out <<"** **"<< endl; … … 1767 1767 cout <<"** arXiv:0903.2225v1 [hep-ph] **"<< endl; 1768 1768 cout <<"** **"<< endl; 1769 cout <<"** --- Version 1. 8of Delphes --- **"<< endl;1770 cout <<"** Last date of change: 16 August 2009**"<< endl;1769 cout <<"** --- Version 1.9 of Delphes --- **"<< endl; 1770 cout <<"** Last date of change: 7 May 2010 **"<< endl; 1771 1771 cout <<"** **"<< endl; 1772 1772 cout <<"** **"<< endl;
Note:
See TracChangeset
for help on using the changeset viewer.