Changeset 564 in svn
- Timestamp:
- Jun 10, 2010, 12:09:49 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CHANGELOG
r558 r564 1 * Changes relative to V.1.8 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 2 4 - new: b-(mis)tag algorithms 3 5 * pt/eta dependence for b-(mis)tagging ; … … 9 11 NB 'SumPt' was before 'IsolPt' in muon collection only 10 12 - datacard: change of several variable names!!! 11 before ->new name13 old name -> new name 12 14 ISOL_PT -> ISOL_trk_PT 13 15 ISOL_Cone -> ISOL_trk_Cone … … 15 17 ISOL_Calo_ET -> ISOL_calo_ET 16 18 ISOL_Calo_Grid -> ISOL_calo_Grid 17 - bug fix: EtRatio for muons 19 - new: Vx, Vy, Vz: real vertex location for tracks 20 - bug fix: EtRatio for muons, now similar to LHCO standards 18 21 - new: ./configure for the installation 19 22 - update: default jet algorithms have change in data cards -
trunk/Delphes.cpp
r557 r564 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 ** ** … … 219 219 { 220 220 cout <<"** LHEF file format detected **"<<endl; 221 cout <<"** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!**"<<endl; 222 cout <<"** !!!!!! The file should already be hadronised !!!!!!**"<<endl; 223 cout <<"** !!!!!! Delphes is running neither PYTHIA neither Herwig !!!!!!**"<<endl; 224 cout <<"** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!**"<<endl; 221 225 cout <<"** This can take several minutes **"<< endl; 222 226 LHEFConverter converter(inputFileList,outputfilename,DET->PDGtable,DET->NEvents); … … 444 448 ) 445 449 ) 446 { 450 { 451 bool trackRec=true; 452 if((grandom->Uniform()*100.) > DET->TRACK_eff)trackRec=false; 447 453 // 2.1a.2.3.1 Filling the particle properties + smearing 448 454 // Hypothesis: the final eta/phi are the ones from the generator, thanks to the track reconstruction … … 452 458 453 459 // 2.1a.2.3.2 Muons 454 if (pid == pMU && fabs(particle->EtaCalo)< DET->CEN_max_mu )460 if (pid == pMU && fabs(particle->EtaCalo)< DET->CEN_max_mu && trackRec==true) 455 461 { 456 462 TLorentzVector p; … … 464 470 } 465 471 // 2.1a.2.3.3 Electrons 466 else if (pid == pE )472 else if (pid == pE && trackRec==true) 467 473 { 468 474 // Finds in which calorimeter the particle has gone, to know its resolution … … 501 507 // 2.1a.2.3.5 Tracks 502 508 //if( (rand()%100) < DET->TRACK_eff && sET!=0) 503 if( (grandom->Uniform()*100.) < DET->TRACK_eff&& sET!=0)509 if( trackRec==true && sET!=0) 504 510 { 505 511 elementTrack = (TRootTracks*) branchTrack->NewEntry(); … … 683 689 } 684 690 } 691 //on rajoute les muons dans ETMIS 692 for(unsigned int i=0; i < muon.size(); i++) 693 { 694 695 Att.SetPxPyPzE(muon[i].Px(),muon[i].Py(),muon[i].Pz(),muon[i].E()); 696 PTmis = PTmis + Att; 697 } 698 //on rempli les muons du dessus 685 699 elementEtmis = (TRootETmis*) branchETmis->NewEntry(); 686 700 elementEtmis->ET = (PTmis).Pt(); … … 688 702 elementEtmis->Px = (-PTmis).Px(); 689 703 elementEtmis->Py = (-PTmis).Py(); 704 690 705 691 706 // 2.2.3 ************* jets, B-tag, tau jets 692 707 vector<int> NTrackJet; //for number of tracks 693 708 vector<float> EHADEEM; //for energyHad over energyEm 694 sorted_jets=JETRUN->RunJets(input_particles, TrackCentral,NTrackJet,EHADEEM,list_of_active_towers); 695 JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ,NTrackJet,EHADEEM); 696 JETRUN->RunTauJets(treeWriter,branchTauJet,sorted_jets,towers, TrackCentral,NTrackJet,EHADEEM); 709 vector<int> NCALO; //nombre de tours calorimetriques utilisee 710 sorted_jets=JETRUN->RunJets(input_particles, TrackCentral,NTrackJet,EHADEEM,list_of_active_towers,NCALO); 711 JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ,NTrackJet,EHADEEM,NCALO); 712 JETRUN->RunTauJets(treeWriter,branchTauJet,sorted_jets,towers, TrackCentral,NTrackJet,EHADEEM,NCALO); 697 713 698 714 treeWriter->Fill();
Note:
See TracChangeset
for help on using the changeset viewer.