Fork me on GitHub

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


Ignore:
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    r414db83 r4d3fb73  
    113.4.2:
    22- added DenseTrackFilter for modelling tracking inefficiencies in boosted, dense environments
    3 - added detector cards for CLIC, HL-LHC and IDEA detectors
     3- added detector cards for CLIC and HL-LHC 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

    r414db83 r4d3fb73  
    413413        modules/DenseTrackFilter.h \
    414414        modules/Calorimeter.h \
    415         modules/DualReadoutCalorimeter.h \
    416415        modules/OldCalorimeter.h \
    417416        modules/Isolation.h \
    … …  
    715714        external/ExRootAnalysis/ExRootFilter.h \
    716715        external/ExRootAnalysis/ExRootResult.h
    717 tmp/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
    726716tmp/modules/Efficiency.$(ObjSuf): \
    727717        modules/Efficiency.$(SrcSuf) \
    … …  
    11291119        tmp/modules/Delphes.$(ObjSuf) \
    11301120        tmp/modules/DenseTrackFilter.$(ObjSuf) \
    1131         tmp/modules/DualReadoutCalorimeter.$(ObjSuf) \
    11321121        tmp/modules/Efficiency.$(ObjSuf) \
    11331122        tmp/modules/EnergyScale.$(ObjSuf) \
    … …  
    22712260        @touch $@
    22722261
    2273 modules/DualReadoutCalorimeter.h: \
    2274         classes/DelphesModule.h
    2275         @touch $@
    2276 
    22772262
    22782263

  • README

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

  • README.md

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

  • cards/CMS_PhaseII/CMS_PhaseII_noPU_HFnose_v0.tcl

    r414db83 r4d3fb73  
    6969
    7070  UniqueObjectFinder
    71   GenParticleFilter
    7271
    7372  ScalarHT
    … …  
    929928
    930929  # scale formula for jets
    931   set ScaleFormula {1.0}
     930  set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
    932931}
    933932
    … …  
    11611160}
    11621161
    1163 ###############################################################################################################
    1164 # StatusPidFilter: this module removes all generated particles except electrons, muons, taus, and status == 3 #
    1165 ###############################################################################################################
    1166 
    1167 module StatusPidFilter GenParticleFilter {
    1168 
    1169     set InputArray Delphes/allParticles
    1170     set OutputArray filteredParticles
    1171     set PTMin 0.0
    1172 
    1173 }
    1174 
    1175 
    11761162##################
    11771163# ROOT tree writer
    … …  
    11841170module TreeWriter TreeWriter {
    11851171# add Branch InputArray BranchName BranchClass
    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
     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
    11961180
    11971181  add Branch GenJetFinder/jets GenJet Jet

  • cards/CMS_PhaseII/CMS_PhaseII_noPU_v0.tcl

    r414db83 r4d3fb73  
    6969
    7070  UniqueObjectFinder
    71   GenParticleFilter
    7271
    7372  ScalarHT
    … …  
    692691                          (abs(eta) > 2.5 && abs(eta) <= 3.0) * (pt > 35.0 && pt <= 50.0) * (0.830) +
    693692                          (abs(eta) > 2.5 && abs(eta) <= 3.0) * (pt > 50.0 && pt <= 14000.0) * (0.919) +
    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 
     693                          (abs(eta) > 3.0) * (0.00)
     694      }
    703695}
    704696
    … …  
    929921
    930922  # scale formula for jets
    931   set ScaleFormula {1.0}
     923  set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
    932924}
    933925
    … …  
    11621154}
    11631155
    1164 ###############################################################################################################
    1165 # StatusPidFilter: this module removes all generated particles except electrons, muons, taus, and status == 3 #
    1166 ###############################################################################################################
    1167 
    1168 module StatusPidFilter GenParticleFilter {
    1169 
    1170     set InputArray Delphes/allParticles
    1171     set OutputArray filteredParticles
    1172     set PTMin 0.0
    1173 
    1174 }
    1175 
    1176 
    11771156##################
    11781157# ROOT tree writer
    … …  
    11851164module TreeWriter TreeWriter {
    11861165# add Branch InputArray BranchName BranchClass
    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
     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
    11961174
    11971175  add Branch GenJetFinder/jets GenJet Jet

  • modules/ModulesLinkDef.h

    r414db83 r4d3fb73  
    4141#include "modules/DenseTrackFilter.h"
    4242#include "modules/Calorimeter.h"
    43 #include "modules/DualReadoutCalorimeter.h"
    4443#include "modules/OldCalorimeter.h"
    4544#include "modules/Isolation.h"
    … …  
    9695#pragma link C++ class DenseTrackFilter+;
    9796#pragma link C++ class Calorimeter+;
    98 #pragma link C++ class DualReadoutCalorimeter+;
    9997#pragma link C++ class OldCalorimeter+;
    10098#pragma link C++ class Isolation+;
Note: See TracChangeset for help on using the changeset viewer.