Fork me on GitHub

Changes in / [bd0a1aa:4a0d9d5] in git


Ignore:
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rbd0a1aa r4a0d9d5  
    271271        modules/Pythia8LinkDef.h \
    272272        modules/PileUpMergerPythia8.h
    273 tmp/modules/Pythia8Dict$(PcmSuf): \
     273Pythia8Dict$(PcmSuf): \
     274        tmp/modules/Pythia8Dict$(PcmSuf) \
    274275        tmp/modules/Pythia8Dict.$(SrcSuf)
    275 Pythia8Dict$(PcmSuf): \
    276         tmp/modules/Pythia8Dict$(PcmSuf)
    277276DELPHES_DICT_OBJ +=  \
    278277        tmp/modules/Pythia8Dict.$(ObjSuf)
    … …  
    289288        classes/SortableObject.h \
    290289        classes/DelphesClasses.h
    291 tmp/classes/ClassesDict$(PcmSuf): \
     290ClassesDict$(PcmSuf): \
     291        tmp/classes/ClassesDict$(PcmSuf) \
    292292        tmp/classes/ClassesDict.$(SrcSuf)
    293 ClassesDict$(PcmSuf): \
    294         tmp/classes/ClassesDict$(PcmSuf)
    295293tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
    296294        external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
    … …  
    305303        external/ExRootAnalysis/ExRootConfReader.h \
    306304        external/ExRootAnalysis/ExRootTask.h
    307 tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf): \
     305ExRootAnalysisDict$(PcmSuf): \
     306        tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf) \
    308307        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
    309 ExRootAnalysisDict$(PcmSuf): \
    310         tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf)
    311308tmp/modules/ModulesDict.$(SrcSuf): \
    312309        modules/ModulesLinkDef.h \
    … …  
    351348        modules/VertexFinder.h \
    352349        modules/ExampleModule.h
    353 tmp/modules/ModulesDict$(PcmSuf): \
     350ModulesDict$(PcmSuf): \
     351        tmp/modules/ModulesDict$(PcmSuf) \
    354352        tmp/modules/ModulesDict.$(SrcSuf)
    355 ModulesDict$(PcmSuf): \
    356         tmp/modules/ModulesDict$(PcmSuf)
    357353DELPHES_DICT_OBJ +=  \
    358354        tmp/classes/ClassesDict.$(ObjSuf) \
    … …  
    370366        modules/FastJetGridMedianEstimator.h \
    371367        modules/RunPUPPI.h
    372 tmp/modules/FastJetDict$(PcmSuf): \
     368FastJetDict$(PcmSuf): \
     369        tmp/modules/FastJetDict$(PcmSuf) \
    373370        tmp/modules/FastJetDict.$(SrcSuf)
    374 FastJetDict$(PcmSuf): \
    375         tmp/modules/FastJetDict$(PcmSuf)
    376371FASTJET_DICT_OBJ +=  \
    377372        tmp/modules/FastJetDict.$(ObjSuf)
    … …  
    389384        display/DelphesHtmlSummary.h \
    390385        display/DelphesPlotSummary.h
    391 tmp/display/DisplayDict$(PcmSuf): \
     386DisplayDict$(PcmSuf): \
     387        tmp/display/DisplayDict$(PcmSuf) \
    392388        tmp/display/DisplayDict.$(SrcSuf)
    393 DisplayDict$(PcmSuf): \
    394         tmp/display/DisplayDict$(PcmSuf)
    395389DISPLAY_DICT_OBJ +=  \
    396390        tmp/display/DisplayDict.$(ObjSuf)
    … …  
    21722166        @rm $@.arch $@.base
    21732167
    2174 $(DELPHES_DICT_PCM): %Dict$(PcmSuf):
    2175         @echo ">> Copying $@"
    2176         @cp $< $@
    2177 
    2178 $(FASTJET_DICT_PCM): %Dict$(PcmSuf):
    2179         @echo ">> Copying $@"
    2180         @cp $< $@
    2181 
    2182 $(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
     2168%Dict$(PcmSuf):
    21832169        @echo ">> Copying $@"
    21842170        @cp $< $@

  • cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl

    rbd0a1aa r4a0d9d5  
    184184  set ResolutionFormula { 
    185185 
    186                         (abs(eta) <= 1.5)  * (energy*0.028) +
     186                        (abs(eta) <= 1.5)  * (1+0.64*abs(eta)^2)*(energy*0.028) +
    187187    (abs(eta) > 1.5  && abs(eta) <= 1.75)  * (energy*0.037) +
    188188    (abs(eta) > 1.75  && abs(eta) <= 2.15) * (energy*0.038) +
    … …  
    313313  # for the endcaps (1.5 < |eta| < 3.0), we take HGCAL  see LHCC-P-008, Fig. 3.39, p.117
    314314
    315   set ResolutionFormula {  (abs(eta) <= 1.50)                    * sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
     315  set ResolutionFormula {  (abs(eta) <= 1.50)                    * (1+0.64*abs(eta)^2)*sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
    316316                           (abs(eta) > 1.50 && abs(eta) <= 1.75) * sqrt(energy^2*0.006^2 + energy*0.20^2) + \
    317317                           (abs(eta) > 1.75 && abs(eta) <= 2.15) * sqrt(energy^2*0.007^2 + energy*0.21^2) + \

  • cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl

    rbd0a1aa r4a0d9d5  
     1set MaxEvents 10
     2
    13#
    24#  Phase II - Pile-Up
    … …  
    232234  set ResolutionFormula {
    233235
    234                         (abs(eta) <= 1.5)  * (energy*0.028) +
     236                        (abs(eta) <= 1.5)  * (1+0.64*abs(eta)^2)*(energy*0.028) +
    235237    (abs(eta) > 1.5  && abs(eta) <= 1.75)  * (energy*0.037) +
    236238    (abs(eta) > 1.75  && abs(eta) <= 2.15) * (energy*0.038) +
    … …  
    363365  # for the endcaps (1.5 < |eta| < 3.0), we take HGCAL  see LHCC-P-008, Fig. 3.39, p.117
    364366
    365   set ResolutionFormula {  (abs(eta) <= 1.50)                    * sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
     367  set ResolutionFormula {  (abs(eta) <= 1.50)                    * (1+0.64*abs(eta)^2)*sqrt(energy^2*0.009^2 + energy*0.12^2 + 0.45^2) +
    366368                           (abs(eta) > 1.50 && abs(eta) <= 1.75) * sqrt(energy^2*0.006^2 + energy*0.20^2) + \
    367369                           (abs(eta) > 1.75 && abs(eta) <= 2.15) * sqrt(energy^2*0.007^2 + energy*0.21^2) + \

  • cards/delphes_card_ATLAS_PileUp.tcl

    rbd0a1aa r4a0d9d5  
    7373  set MeanPileUp 50
    7474
    75    # maximum spread in the beam direction in m
    76   set ZVertexSpread 0.25
     75  # maximum spread in the beam direction in m
     76  set ZVertexSpread 0.10
    7777
    7878  # maximum spread in time in s
    79   set TVertexSpread 800E-12
     79  set TVertexSpread 1.5E-09
    8080
    8181  # vertex smearing formula f(z,t) (z,t need to be respectively given in m,s)
    82   set VertexDistributionFormula {exp(-(t^2/160e-12^2/2))*exp(-(z^2/0.053^2/2))}
     82
     83  set VertexDistributionFormula {exp(-(t^2/(2*(0.05/2.99792458E8*exp(-(z^2/(2*(0.05)^2))))^2)))}
     84
     85  #set VertexDistributionFormula { (abs(t) <= 1.0e-09) * (abs(z) <= 0.15) * (1.00) +
     86  #                                (abs(t) >  1.0e-09) * (abs(z) <= 0.15) * (0.00) +
     87  #                               (abs(t) <= 1.0e-09) * (abs(z) > 0.15)  * (0.00) +
     88  #                               (abs(t) >  1.0e-09) * (abs(z) > 0.15)  * (0.00)}
    8389
    8490

  • cards/delphes_card_CMS_PileUp.tcl

    rbd0a1aa r4a0d9d5  
    7474  set MeanPileUp 50
    7575
    76    # maximum spread in the beam direction in m
    77   set ZVertexSpread 0.25
     76  # maximum spread in the beam direction in m
     77  set ZVertexSpread 0.10
    7878
    7979  # maximum spread in time in s
    80   set TVertexSpread 800E-12
     80  set TVertexSpread 1.5E-09
    8181
    8282  # vertex smearing formula f(z,t) (z,t need to be respectively given in m,s)
    83   set VertexDistributionFormula {exp(-(t^2/160e-12^2/2))*exp(-(z^2/0.053^2/2))}
    84  
     83
     84  set VertexDistributionFormula {exp(-(t^2/(2*(0.05/2.99792458E8*exp(-(z^2/(2*(0.05)^2))))^2)))}
     85
     86  #set VertexDistributionFormula { (abs(t) <= 1.0e-09) * (abs(z) <= 0.15) * (1.00) +
     87  #                                (abs(t) >  1.0e-09) * (abs(z) <= 0.15) * (0.00) +
     88  #                               (abs(t) <= 1.0e-09) * (abs(z) > 0.15)  * (0.00) +
     89  #                               (abs(t) >  1.0e-09) * (abs(z) > 0.15)  * (0.00)}
     90
    8591
    8692}
    … …  
    307313  # Eta shape from arXiv:1306.2016, Energy shape from arXiv:1502.02701
    308314  set ECalResolutionFormula {                  (abs(eta) <= 1.5) * (1+0.64*eta^2) * sqrt(energy^2*0.008^2 + energy*0.11^2 + 0.40^2) +
    309                              (abs(eta) > 1.5 && abs(eta) <= 2.5) * (2.16 + 5.6*(abs(eta)-2)^2) * sqrt(energy^2*0.008^2 + energy*0.11^2 + 0.40^2) +
     315                             (abs(eta) > 1.5 && abs(eta) <= 2.5) * (2.16 + 5.6*(eta-2)^2) * sqrt(energy^2*0.008^2 + energy*0.11^2 + 0.40^2) +
    310316                             (abs(eta) > 2.5 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
    311317

  • doc/genMakefile.tcl

    rbd0a1aa r4a0d9d5  
    7272    dependencies $fileName "$dictName$srcSuf:$suffix$fileName"
    7373
    74     puts -nonewline $dictName$pcmSuf:$suffix
     74    puts -nonewline [file tail $dictName$pcmSuf]:$suffix
     75    puts -nonewline $dictName$pcmSuf$suffix
    7576    puts -nonewline $dictName$srcSuf
    76     puts {}
    77 
    78     puts -nonewline [file tail $dictName$pcmSuf]:$suffix
    79     puts -nonewline $dictName$pcmSuf
    8077    puts {}
    8178  }
    … …  
    419416        @rm $@.arch $@.base
    420417
    421 $(DELPHES_DICT_PCM): %Dict$(PcmSuf):
    422         @echo ">> Copying $@"
    423         @cp $< $@
    424 
    425 $(FASTJET_DICT_PCM): %Dict$(PcmSuf):
    426         @echo ">> Copying $@"
    427         @cp $< $@
    428 
    429 $(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
     418%Dict$(PcmSuf):
    430419        @echo ">> Copying $@"
    431420        @cp $< $@
Note: See TracChangeset for help on using the changeset viewer.