Fork me on GitHub

Changes in / [4d3fb73:414db83] in git


Ignore:
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    r4d3fb73 r414db83  
    113.4.2:
    22- added DenseTrackFilter for modelling tracking inefficiencies in boosted, dense environments
    3 - added detector cards for CLIC and HL-LHC detectors
     3- added detector cards for CLIC, HL-LHC and IDEA detectors
    44- added muons to Tower collection used for jets reconstruction and MET calculation in the ATLAS card (#1118)
    55- added Weight branch to HepMC

  • Makefile

    r4d3fb73 r414db83  
    413413        modules/DenseTrackFilter.h \
    414414        modules/Calorimeter.h \
     415        modules/DualReadoutCalorimeter.h \
    415416        modules/OldCalorimeter.h \
    416417        modules/Isolation.h \
    … …  
    714715        external/ExRootAnalysis/ExRootFilter.h \
    715716        external/ExRootAnalysis/ExRootResult.h
     717tmp/modules/DualReadoutCalorimeter.$(ObjSuf): \
     718        modules/DualReadoutCalorimeter.$(SrcSuf) \
     719        modules/DualReadoutCalorimeter.h \
     720        classes/DelphesClasses.h \
     721        classes/DelphesFactory.h \
     722        classes/DelphesFormula.h \
     723        external/ExRootAnalysis/ExRootResult.h \
     724        external/ExRootAnalysis/ExRootFilter.h \
     725        external/ExRootAnalysis/ExRootClassifier.h
    716726tmp/modules/Efficiency.$(ObjSuf): \
    717727        modules/Efficiency.$(SrcSuf) \
    … …  
    11191129        tmp/modules/Delphes.$(ObjSuf) \
    11201130        tmp/modules/DenseTrackFilter.$(ObjSuf) \
     1131        tmp/modules/DualReadoutCalorimeter.$(ObjSuf) \
    11211132        tmp/modules/Efficiency.$(ObjSuf) \
    11221133        tmp/modules/EnergyScale.$(ObjSuf) \
    … …  
    22602271        @touch $@
    22612272
     2273modules/DualReadoutCalorimeter.h: \
     2274        classes/DelphesModule.h
     2275        @touch $@
     2276
    22622277
    22632278

  • README

    r4d3fb73 r414db83  
    6666Open ROOT file and do some basic analysis using Draw or TBrowser:
    6767
    68    TFile::Open("delphes_output.root");
    69    Delphes->Draw("Electron.PT");
     68   TFile *f = TFile::Open("delphes_output.root");
     69   f->Get("Delphes")->Draw("Electron.PT");
    7070   TBrowser browser;
    7171

  • README.md

    r4d3fb73 r414db83  
    8989
    9090```
    91    TFile::Open("delphes_output.root");
    92    Delphes->Draw("Electron.PT");
     91   TFile *f = TFile::Open("delphes_output.root");
     92   f->Get("Delphes")->Draw("Electron.PT");
    9393   TBrowser browser;
    9494```

  • cards/CMS_PhaseII/CMS_PhaseII_noPU_HFnose_v0.tcl

    r4d3fb73 r414db83  
    6969
    7070  UniqueObjectFinder
     71  GenParticleFilter
    7172
    7273  ScalarHT
    … …  
    928929
    929930  # scale formula for jets
    930   set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
     931  set ScaleFormula {1.0}
    931932}
    932933
    … …  
    11601161}
    11611162
     1163###############################################################################################################
     1164# StatusPidFilter: this module removes all generated particles except electrons, muons, taus, and status == 3 #
     1165###############################################################################################################
     1166
     1167module StatusPidFilter GenParticleFilter {
     1168
     1169    set InputArray Delphes/allParticles
     1170    set OutputArray filteredParticles
     1171    set PTMin 0.0
     1172
     1173}
     1174
     1175
    11621176##################
    11631177# ROOT tree writer
    … …  
    11701184module TreeWriter TreeWriter {
    11711185# add Branch InputArray BranchName BranchClass
    1172   add Branch Delphes/allParticles Particle GenParticle
    1173 
    1174   add Branch TrackMerger/tracks Track Track
    1175   add Branch Calorimeter/towers Tower Tower
    1176 
    1177   add Branch HCal/eflowTracks EFlowTrack Track
    1178   add Branch PhotonEnergySmearing/eflowPhotons EFlowPhoton Tower
    1179   add Branch HCal/eflowNeutralHadrons EFlowNeutralHadron Tower
     1186 # add Branch Delphes/allParticles Particle GenParticle
     1187  add Branch GenParticleFilter/filteredParticles Particle GenParticle
     1188
     1189
     1190#  add Branch TrackMerger/tracks Track Track
     1191#  add Branch Calorimeter/towers Tower Tower
     1192
     1193#  add Branch HCal/eflowTracks EFlowTrack Track
     1194#  add Branch PhotonEnergySmearing/eflowPhotons EFlowPhoton Tower
     1195#  add Branch HCal/eflowNeutralHadrons EFlowNeutralHadron Tower
    11801196
    11811197  add Branch GenJetFinder/jets GenJet Jet

  • cards/CMS_PhaseII/CMS_PhaseII_noPU_v0.tcl

    r4d3fb73 r414db83  
    6969
    7070  UniqueObjectFinder
     71  GenParticleFilter
    7172
    7273  ScalarHT
    … …  
    691692                          (abs(eta) > 2.5 && abs(eta) <= 3.0) * (pt > 35.0 && pt <= 50.0) * (0.830) +
    692693                          (abs(eta) > 2.5 && abs(eta) <= 3.0) * (pt > 50.0 && pt <= 14000.0) * (0.919) +
    693                           (abs(eta) > 3.0) * (0.00)
    694       }
     694                          (abs(eta) > 3.0 && abs(eta) <= 4.0) * (pt > 4.0 && pt <= 6.0) * (0.049) +
     695                          (abs(eta) > 3.0  && abs(eta) <= 4.0) * (pt > 6.0 && pt <= 8.0) * (0.152) +
     696                          (abs(eta) > 3.0  && abs(eta) <= 4.0) * (pt > 8.0 && pt <= 10.0) * (0.436) +
     697                          (abs(eta) > 3.0  && abs(eta) <= 4.0) * (pt > 10.0 && pt <= 20.0) * (0.679) +
     698                          (abs(eta) > 3.0  && abs(eta) <= 4.0) * (pt > 20.0 && pt <= 35.0) * (0.778) +
     699                          (abs(eta) > 3.0  && abs(eta) <= 4.0) * (pt > 35.0 && pt <= 50.0) * (0.830) +
     700                          (abs(eta) > 3.0  && abs(eta) <= 4.0) * (pt > 50.0 && pt <= 14000.0) * (0.919)
     701                          }
     702
    695703}
    696704
    … …  
    921929
    922930  # scale formula for jets
    923   set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
     931  set ScaleFormula {1.0}
    924932}
    925933
    … …  
    11541162}
    11551163
     1164###############################################################################################################
     1165# StatusPidFilter: this module removes all generated particles except electrons, muons, taus, and status == 3 #
     1166###############################################################################################################
     1167
     1168module StatusPidFilter GenParticleFilter {
     1169
     1170    set InputArray Delphes/allParticles
     1171    set OutputArray filteredParticles
     1172    set PTMin 0.0
     1173
     1174}
     1175
     1176
    11561177##################
    11571178# ROOT tree writer
    … …  
    11641185module TreeWriter TreeWriter {
    11651186# add Branch InputArray BranchName BranchClass
    1166   add Branch Delphes/allParticles Particle GenParticle
    1167 
    1168   add Branch TrackMerger/tracks Track Track
    1169   add Branch Calorimeter/towers Tower Tower
    1170 
    1171   add Branch HCal/eflowTracks EFlowTrack Track
    1172   add Branch PhotonEnergySmearing/eflowPhotons EFlowPhoton Tower
    1173   add Branch HCal/eflowNeutralHadrons EFlowNeutralHadron Tower
     1187#  add Branch Delphes/allParticles Particle GenParticle
     1188  add Branch GenParticleFilter/filteredParticles Particle GenParticle
     1189
     1190#  add Branch TrackMerger/tracks Track Track
     1191#  add Branch Calorimeter/towers Tower Tower
     1192
     1193#  add Branch HCal/eflowTracks EFlowTrack Track
     1194#  add Branch PhotonEnergySmearing/eflowPhotons EFlowPhoton Tower
     1195#  add Branch HCal/eflowNeutralHadrons EFlowNeutralHadron Tower
    11741196
    11751197  add Branch GenJetFinder/jets GenJet Jet

  • modules/ModulesLinkDef.h

    r4d3fb73 r414db83  
    4141#include "modules/DenseTrackFilter.h"
    4242#include "modules/Calorimeter.h"
     43#include "modules/DualReadoutCalorimeter.h"
    4344#include "modules/OldCalorimeter.h"
    4445#include "modules/Isolation.h"
    … …  
    9596#pragma link C++ class DenseTrackFilter+;
    9697#pragma link C++ class Calorimeter+;
     98#pragma link C++ class DualReadoutCalorimeter+;
    9799#pragma link C++ class OldCalorimeter+;
    98100#pragma link C++ class Isolation+;
Note: See TracChangeset for help on using the changeset viewer.