Fork me on GitHub

Changeset 567 in svn


Ignore:
Timestamp:
Jun 16, 2010, 11:05:05 AM (14 years ago)
Author:
Xavier Rouby
Message:

version 1.9

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
    45   - new: b-(mis)tag algorithms
    56       * pt/eta dependence for b-(mis)tagging ;

  • trunk/Delphes.cpp

    r564 r567  
    305305  vector<D_Particle> gamma;
    306306 
    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
    308310
    309311  TSimpleArray<TRootC::GenParticle> NFCentralQ;
    … …  
    369371      input_particles.clear();
    370372      NTrackJet.clear();     
     373      NCALO.clear();     
     374      EHADEEM.clear();     
    371375     
    372376      // 'list_of_active_towers' contains the exact list of calorimetric towers which have some deposits inside (E>0).
    … …  
    705709     
    706710      // 2.2.3 ************* jets, B-tag, tau jets
    707       vector<int> NTrackJet; //for number of tracks
    708       vector<float> EHADEEM; //for energyHad over energyEm
    709       vector<int> NCALO; //nombre de tours calorimetriques utilisee
    710711      sorted_jets=JETRUN->RunJets(input_particles, TrackCentral,NTrackJet,EHADEEM,list_of_active_towers,NCALO);
    711712      JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ,NTrackJet,EHADEEM,NCALO);

  • trunk/Utilities/ExRootAnalysis/interface/BlockClasses.h

    r555 r567  
    423423  float Charge; // normally, using the charge of the track ; here using gen-level tau charge
    424424  int NTracks;
     425  int NCalo;
    425426
    426427  float EHoverEE;
    … …  
    453454  bool Btag;
    454455  int NTracks;
     456  int NCalo;
    455457 
    456458  float EHoverEE;

  • trunk/VERSION

    r529 r567  
    1 1.8
     11.9

  • trunk/data/DetectorCard.dat

    r559 r567  
    8686# General jet variable
    8787JET_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 antikt
     88JET_jetalgo      2              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    8989JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
    9090JET_Eflow        0              // Perfect energy assumed in the tracker coverage
    … …  
    9898# put 'x' for pt ; range: [0, 9E6 GeV/c]
    9999# put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ]
    100 # never put any blank in the formula
     100# e.g. (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0)
    101101BTAG_func_b      0.4+0*x+0*y            // formula for Pt dependence of the b-tag efficiency (b-jets)
    102102BTAG_func_c      0.1+0*x+0*y            // formula for Pt dependence of the mistag efficiency (c-jets)
    … …  
    145145NEvents_Frog      100
    146146# Number of events to process
    147 NEvents           10000                    // -1 means 'all'
     147NEvents           -1                   // -1 means 'all'
    148148
    149149# input PDG tables

  • trunk/data/DetectorCard_ATLAS.dat

    r559 r567  
    8888JET_jetalgo      6              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    8989JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
    90 JET_Eflow        1              // Perfect energy assumed in the tracker coverage
     90JET_Eflow        0              // Perfect energy assumed in the tracker coverage
    9191
    9292# b-(mis)tagging efficiencies
    … …  
    9898# put 'x' for pt ; range: [0, 9E6 GeV/c]
    9999# put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ]
    100 # never put any blank in the formula
     100# e.g. (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0)
    101101BTAG_func_b      0.4+0*x+0*y            // formula for Pt dependence of the b-tag efficiency (b-jets)
    102102BTAG_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  
    8888JET_jetalgo      6              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
    8989JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
    90 JET_Eflow        1              // Perfect energy assumed in the tracker coverage
     90JET_Eflow        0              // Perfect energy assumed in the tracker coverage
    9191
    9292# b-(mis)tagging efficiencies
    … …  
    9898# put 'x' for pt ; range: [0, 9E6 GeV/c]
    9999# put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ]
    100 # never put any blank in the formula
    101 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)
     101BTAG_func_b      0.4+0*x+0*y            // formula for Pt dependence of the b-tag efficiency (b-jets)
     102BTAG_func_c      0.1+0*x+0*y            // formula for Pt dependence of the mistag efficiency (c-jets)
    103103BTAG_func_g      0.01+0*x+0*y           // (gluon-jets)
    104104BTAG_func_l      0.01+0*x+0*y           // (light-jets)

  • trunk/interface/JetsUtil.h

    r443 r567  
    8080  void init(); // for constructors
    8181
    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);
    8383
    8484  vector<fastjet::PseudoJet> RunJetsResol(const vector<fastjet::PseudoJet>&  input_particles);
    8585 
    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);
    8787 
    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);
    8989
    9090 private:

  • trunk/src/JetsUtil.cc

    r547 r567  
    122122}
    123123
    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)
     124vector<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)
    125125{
    126126  inclusive_jets.clear();
    … …  
    144144            DET->BinEtaPhi(TrackCentral[t].PhiOuter,TrackCentral[t].EtaOuter,iPhiTrack[t],iEtaTrack[t]);
    145145          else {
    146             iPhiTrack[t] = TrackCentral[t].PhiOuter;    iEtaTrack[t] = TrackCentral[t].EtaOuter;
     146            iPhiTrack[t] = TrackCentral[t].Phi;    iEtaTrack[t] = TrackCentral[t].Eta;  // should NOT be PhiOuter and EtaOuter
    147147          }
    148148        }
    … …  
    163163            //now, get EHad over EEm
    164164            float EmVal=0,HadVal=0;
     165            NCALO.push_back(constituents.size());
    165166            for (unsigned int j = 0; j < constituents.size(); j++)
    166167                {
    … …  
    197198
    198199
    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)
     200void 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)
    200201{
    201202  TRootJet *elementJet;
    … …  
    209210        elementJet->NTracks = NTrackJet[i];
    210211        elementJet->EHoverEE = EHADEEM[i];
     212        elementJet->NCalo = NCALO[i];
    211213
    212214        // b-jets
    … …  
    218220}
    219221
    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)
     222void 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)
    221223{
    222224  TRootTauJet *elementTauJet;
    … …  
    240242        elementTauJet->Charge = charge;
    241243        elementTauJet->EHoverEE = EHADEEM[i];
     244        elementTauJet->NCalo = NCALO[i];
    242245      } // if tau jet
    243246    } // if JET.eta < tracker - tau_cone : Tau jet identification

  • trunk/src/SmearUtil.cc

    r558 r567  
    2727**                     Louvain-la-Neuve, Belgium                      **
    2828**                                                                    **
    29 **                      Copyright (C) 2008-2009,                      **
     29**                      Copyright (C) 2008-2010,                      **
    3030**                        All rights reserved.                        **
    3131**                                                                    **
    … …  
    138138  // General jet variable
    139139  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 algorithm
     140  JET_jetalgo      = 2;              // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
    141141  JET_seed         = 1.0;            // minimum seed to start jet reconstruction
    142   JET_Eflow        = 1;              // 1 for Energy flow in jets reco ; 0 if not
     142  JET_Eflow        = 0;              // 1 for Energy flow in jets reco ; 0 if not
    143143
    144144  // Tagging definition
    … …  
    774774  f_out <<"**                 of a  generic collider experiment                **"<< endl;
    775775  f_out <<"**                                                                  **"<< endl;
    776   f_out <<"**                --- Version 1.8 of 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;
    778778  f_out <<"**                                                                  **"<< endl;
    779779  f_out <<"**                                                                  **"<< endl;
    … …  
    17671767  cout <<"**                    arXiv:0903.2225v1 [hep-ph]                   **"<< endl;
    17681768  cout <<"**                                                                 **"<< endl;
    1769   cout <<"**                  --- Version 1.8 of 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;
    17711771  cout <<"**                                                                 **"<< endl;
    17721772  cout <<"**                                                                 **"<< endl;
Note: See TracChangeset for help on using the changeset viewer.